diff --git a/Game1/Content/Crop.png b/Game1/Content/Crop.png index 23952fa..fdd02c5 100644 Binary files a/Game1/Content/Crop.png and b/Game1/Content/Crop.png differ diff --git a/Game1/Content/Crop_old.png b/Game1/Content/Crop_old.png new file mode 100644 index 0000000..23952fa Binary files /dev/null and b/Game1/Content/Crop_old.png differ diff --git a/Game1/Content/Mountain.png b/Game1/Content/Mountain.png index 101bd39..1fb7207 100644 Binary files a/Game1/Content/Mountain.png and b/Game1/Content/Mountain.png differ diff --git a/Game1/Content/Mountain_old.png b/Game1/Content/Mountain_old.png new file mode 100644 index 0000000..101bd39 Binary files /dev/null and b/Game1/Content/Mountain_old.png differ diff --git a/Game1/Content/Plantable.png b/Game1/Content/Plantable.png index 28e2495..bc52a51 100644 Binary files a/Game1/Content/Plantable.png and b/Game1/Content/Plantable.png differ diff --git a/Game1/Content/Plantable2.png b/Game1/Content/Plantable2.png new file mode 100644 index 0000000..44119c9 Binary files /dev/null and b/Game1/Content/Plantable2.png differ diff --git a/Game1/Content/Plantable_new.png b/Game1/Content/Plantable_new.png new file mode 100644 index 0000000..ef39696 Binary files /dev/null and b/Game1/Content/Plantable_new.png differ diff --git a/Game1/Content/Plantable_old.png b/Game1/Content/Plantable_old.png new file mode 100644 index 0000000..28e2495 Binary files /dev/null and b/Game1/Content/Plantable_old.png 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/house.png b/Game1/Content/house.png index 6fa079f..546c5fc 100644 Binary files a/Game1/Content/house.png and b/Game1/Content/house.png differ diff --git a/Game1/Content/house_old.png b/Game1/Content/house_old.png new file mode 100644 index 0000000..6fa079f Binary files /dev/null and b/Game1/Content/house_old.png differ diff --git a/Game1/Content/tileunplantable.png b/Game1/Content/tileunplantable.png index bda109a..9455292 100644 Binary files a/Game1/Content/tileunplantable.png and b/Game1/Content/tileunplantable.png differ diff --git a/Game1/Content/tileunplantable_new1.png b/Game1/Content/tileunplantable_new1.png new file mode 100644 index 0000000..0c3e1ec Binary files /dev/null and b/Game1/Content/tileunplantable_new1.png differ diff --git a/Game1/Content/tileunplantable_old.png b/Game1/Content/tileunplantable_old.png new file mode 100644 index 0000000..bda109a Binary files /dev/null and b/Game1/Content/tileunplantable_old.png differ diff --git a/Game1/Game1.cs b/Game1/Game1.cs index e1b8e9b..1b9d60f 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 diff --git a/Game1/Sources/Crops/Crops.cs b/Game1/Sources/Crops/Crops.cs index ff09de1..cea19a9 100644 --- a/Game1/Sources/Crops/Crops.cs +++ b/Game1/Sources/Crops/Crops.cs @@ -47,7 +47,9 @@ class Crops public float getSpeedFactor(float tractorSpeed) { - return (1f * tractorSpeed) / getCostOnMovement(); + if (getCostOnMovement() == 1) + return (1f * tractorSpeed); + return (1f * tractorSpeed) / (getCostOnMovement() / 5.0f); } public SoilProperties getSoilProperties() diff --git a/Grass_new.png b/Grass_new.png new file mode 100644 index 0000000..0c3e1ec Binary files /dev/null and b/Grass_new.png differ