diff --git a/Game1/Content/Bottom.png b/Game1/Content/Bottom.png new file mode 100644 index 0000000..ac618fe Binary files /dev/null and b/Game1/Content/Bottom.png differ diff --git a/Game1/Content/Crop.png b/Game1/Content/Crop.png index 23952fa..8ed79ea 100644 Binary files a/Game1/Content/Crop.png and b/Game1/Content/Crop.png differ diff --git a/Game1/Content/Left.png b/Game1/Content/Left.png new file mode 100644 index 0000000..b8f8697 Binary files /dev/null and b/Game1/Content/Left.png differ diff --git a/Game1/Content/MLmodel b/Game1/Content/MLmodel deleted file mode 100644 index ca18a25..0000000 Binary files a/Game1/Content/MLmodel and /dev/null differ diff --git a/Game1/Content/Markers.png b/Game1/Content/Markers.png index 947c42c..99a6aad 100644 Binary files a/Game1/Content/Markers.png and b/Game1/Content/Markers.png differ diff --git a/Game1/Content/Markers_old.png b/Game1/Content/Markers_old.png new file mode 100644 index 0000000..947c42c Binary files /dev/null and b/Game1/Content/Markers_old.png differ diff --git a/Game1/Content/Mountain.png b/Game1/Content/Mountain.png index 101bd39..a3d5d5b 100644 Binary files a/Game1/Content/Mountain.png and b/Game1/Content/Mountain.png differ diff --git a/Game1/Content/Mountain_1.png b/Game1/Content/Mountain_1.png new file mode 100644 index 0000000..1fb7207 Binary files /dev/null and b/Game1/Content/Mountain_1.png differ diff --git a/Game1/Content/Mountain_big.png b/Game1/Content/Mountain_big.png new file mode 100644 index 0000000..c214c50 Binary files /dev/null and b/Game1/Content/Mountain_big.png differ diff --git a/Game1/Content/Plantable.png b/Game1/Content/Plantable.png index 28e2495..74a981f 100644 Binary files a/Game1/Content/Plantable.png and b/Game1/Content/Plantable.png differ diff --git a/Game1/Content/Planted.png b/Game1/Content/Planted.png deleted file mode 100644 index 58babe6..0000000 Binary files a/Game1/Content/Planted.png and /dev/null differ diff --git a/Game1/Content/ProgressionBar.png b/Game1/Content/ProgressionBar.png index 3fbd568..57e5ae5 100644 Binary files a/Game1/Content/ProgressionBar.png and b/Game1/Content/ProgressionBar.png differ diff --git a/Game1/Content/ProgressionBarStatus.png b/Game1/Content/ProgressionBarStatus.png index d7b9361..37259dd 100644 Binary files a/Game1/Content/ProgressionBarStatus.png and b/Game1/Content/ProgressionBarStatus.png differ diff --git a/Game1/Content/Right.png b/Game1/Content/Right.png new file mode 100644 index 0000000..1933fb2 Binary files /dev/null and b/Game1/Content/Right.png differ diff --git a/Game1/Content/Top.png b/Game1/Content/Top.png new file mode 100644 index 0000000..22eaf5f Binary files /dev/null and b/Game1/Content/Top.png differ diff --git a/Game1/Content/Tractor.png b/Game1/Content/Tractor.png index d0b8c06..a239571 100644 Binary files a/Game1/Content/Tractor.png and b/Game1/Content/Tractor.png differ diff --git a/Game1/Content/house.png b/Game1/Content/house.png index 6fa079f..aa8998b 100644 Binary files a/Game1/Content/house.png and b/Game1/Content/house.png differ diff --git a/Game1/Content/house2.png b/Game1/Content/house2.png new file mode 100644 index 0000000..943e985 Binary files /dev/null and b/Game1/Content/house2.png differ diff --git a/Game1/Content/tileunplantable.png b/Game1/Content/tileunplantable.png index bda109a..d983e4e 100644 Binary files a/Game1/Content/tileunplantable.png and b/Game1/Content/tileunplantable.png differ diff --git a/Game1/Content/tileunplantable_big.png b/Game1/Content/tileunplantable_big.png new file mode 100644 index 0000000..9455292 Binary files /dev/null and b/Game1/Content/tileunplantable_big.png differ diff --git a/Game1/Game1.cs b/Game1/Game1.cs index e1b8e9b..910a8e4 100644 --- a/Game1/Game1.cs +++ b/Game1/Game1.cs @@ -75,7 +75,7 @@ namespace Game1 inventory.initInventorySystem(); string path = directory + "Game1/Content/ML/Fertilizer_Prediction.csv"; - input.init(graphics, new Vector2(16,16), 56, 1); //Generates the starting size + input.init(graphics, new Vector2(16,16), 56, 0); //Generates the starting size houseUnit.init(input.getTileSize(), input.getSpacing()); //Generates the house position tractorUnit.init(houseUnit.GetRectangle(), input); //Generates the Tractor tractorUnit.updateSizing(input, 0, houseUnit.getVector(), Time); //Updates the first Size of the Tractor @@ -168,17 +168,17 @@ namespace Game1 DrawTiles(); - spriteBatch.Draw(markers, new Rectangle((int)tractorUnit.getTargetPosition().X / input.getSpacingTile() * (input.getTileSize() + input.getSpacing()) + input.getTileSize() / 4, (int)tractorUnit.getTargetPosition().Y / input.getSpacingTile() * (input.getTileSize() + input.getSpacing()) + input.getTileSize() / 4, input.getTileSize()/2, input.getTileSize()/2), Color.Green); + spriteBatch.Draw(markers, new Rectangle((int)tractorUnit.getTargetPosition().X / input.getSpacingTile() * (input.getTileSize() + input.getSpacing()) + input.getTileSize() / 4, (int)tractorUnit.getTargetPosition().Y / input.getSpacingTile() * (input.getTileSize() + input.getSpacing()) + input.getTileSize() / 4, input.getTileSize()/2, input.getTileSize()/2), Color.White); for (int i = 0; i < tractorUnit.getPath().getCount() + 1; i++) { - spriteBatch.Draw(markers, new Rectangle((int)tractorUnit.getPath().getByIndex(i).getCords().X * (input.getSpacingTile()) + input.getTileSize() / 4, (int)tractorUnit.getPath().getByIndex(i).getCords().Y * (input.getSpacingTile()) + input.getTileSize() / 4, input.getTileSize()/2, input.getTileSize()/2), Color.Green); + spriteBatch.Draw(markers, new Rectangle((int)tractorUnit.getPath().getByIndex(i).getCords().X * (input.getSpacingTile()) + input.getTileSize() / 4, (int)tractorUnit.getPath().getByIndex(i).getCords().Y * (input.getSpacingTile()) + input.getTileSize() / 4, input.getTileSize()/2, input.getTileSize()/2), Color.White); } spriteBatch.Draw(house, houseUnit.GetRectangle(), Time.GetTimeOfDay()); - spriteBatch.Draw(markers, new Rectangle((int)tractorUnit.getPath().getFinalDest().getCords().X * (input.getSpacingTile()) + Convert.ToInt32(input.getTileSize() / 6), (int)tractorUnit.getPath().getFinalDest().getCords().Y * (input.getSpacingTile()) + Convert.ToInt32(input.getTileSize() / 6), Convert.ToInt32(input.getTileSize() / 1.5), Convert.ToInt32(input.getTileSize() / 1.5)), Color.Red); //Draws the current target of the tractor + spriteBatch.Draw(markers, new Rectangle((int)tractorUnit.getPath().getFinalDest().getCords().X * (input.getSpacingTile()) + Convert.ToInt32(input.getTileSize() / 6), (int)tractorUnit.getPath().getFinalDest().getCords().Y * (input.getSpacingTile()) + Convert.ToInt32(input.getTileSize() / 6), Convert.ToInt32(input.getTileSize() / 1.5), Convert.ToInt32(input.getTileSize() / 1.5)), Color.White); //Draws the current target of the tractor spriteBatch.Draw(tractor, new Vector2((int)tractorUnit.getPos().X + input.getTileSize() / 2, (int)tractorUnit.getPos().Y + input.getTileSize() / 2), new Rectangle(0, 0, input.getTileSize(), input.getTileSize()), Time.GetTimeOfDay(), tractorUnit.getRotation(), new Vector2(input.getTileSize() / 2, input.getTileSize() / 2), 1.0f, SpriteEffects.None, 1); diff --git a/Game1/Sources/Crops/Crops.cs b/Game1/Sources/Crops/Crops.cs index a76b12e..cea19a9 100644 --- a/Game1/Sources/Crops/Crops.cs +++ b/Game1/Sources/Crops/Crops.cs @@ -49,7 +49,7 @@ class Crops { if (getCostOnMovement() == 1) return (1f * tractorSpeed); - return (1f * tractorSpeed) / (getCostOnMovement()/5.0f); + return (1f * tractorSpeed) / (getCostOnMovement() / 5.0f); } public SoilProperties getSoilProperties()