Fix fertilizer spawning (CleverRaven#67915)

* Fix commercial spawning * Fix back again and add stuff * Update agriculture.json * use first method * Clean up stuff
Froffy025 · Aug 27, 2023 · d0fe58a · d0fe58a
1 parent fcb1367
commit d0fe58a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json b/data/json/itemgroups/Agriculture_Forage_Excavation/agriculture.json
@@ -52,7 +52,7 @@
       [ "bucket", 40 ],
       [ "gloves_rubber", 60 ],
       [ "fertilizer_liquid", 20 ],
-      [ "fertilizer_commercial", 30 ],
+      { "group": "fertilizer_commercial_bag_canvas_60", "prob": 30 },
       [ "fungicide", 20 ],
       { "group": "insecticide_bag_plastic", "prob": 30 },
       { "item": "chem_saltpetre", "prob": 15, "charges-min": 10, "charges-max": 50 },
@@ -85,7 +85,7 @@
   {
     "type": "item_group",
     "id": "fertilizers",
-    "items": [ [ "fertilizer_liquid", 90 ], [ "fertilizer_commercial", 60 ] ]
+    "items": [ [ "fertilizer_liquid", 90 ], { "group": "fertilizer_commercial_bag_canvas_60", "prob": 60 } ]
   },
   {
     "type": "item_group",
@@ -159,7 +159,7 @@
     "subtype": "distribution",
     "items": [
       [ "fertilizer_liquid", 10 ],
-      [ "fertilizer_commercial", 10 ],
+      { "group": "fertilizer_commercial_bag_canvas_60", "prob": 10 },
       { "group": "insecticide_bag_plastic", "prob": 10 },
       [ "pot_canning", 5 ],
       { "item": "jar_3l_glass_sealed", "prob": 25, "count": [ 2, 10 ] },

diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -61,7 +61,7 @@
       { "item": "trimmer_off", "prob": 30, "charges": [ 50, 100 ] },
       [ "fertilizer_liquid", 50 ],
       [ "dahlia_root", 30 ],
-      [ "fertilizer_commercial", 25 ]
+      { "group": "fertilizer_commercial_bag_canvas_60", "prob": 25 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1628,7 +1628,7 @@
       [ "shovel", 40 ],
       [ "clay_pot_flower", 40 ],
       [ "plastic_pot_flower", 60 ],
-      [ "fertilizer_commercial", 30 ],
+      { "group": "fertilizer_commercial_bag_canvas_60", "prob": 30 },
       [ "material_quicklime", 30 ],
       [ "seed_sunflower", 30 ],
       [ "straw_basket", 30 ],

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
@@ -104,7 +104,7 @@
       { "item": "material_sand", "prob": 100, "charges": 500, "container-item": "bag_canvas" },
       { "item": "material_gravel", "prob": 100, "charges": 500, "container-item": "bag_canvas" },
       [ "material_shrd_limestone", 70 ],
-      [ "fertilizer_commercial", 100 ],
+      { "group": "fertilizer_commercial_bag_canvas_60", "prob": 100 },
       [ "material_quicklime", 70 ],
       [ "concrete", 70 ],
       { "item": "nuts_bolts", "prob": 60, "charges": [ 250, 500 ], "container-item": "box_small" },
@@ -336,7 +336,7 @@
       { "item": "charcoal", "prob": 5, "charges": [ 200, 400 ] },
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "solar_cell", 5 ],
-      [ "fertilizer_commercial", 30 ],
+      { "group": "fertilizer_commercial_bag_canvas_60", "prob": 30 },
       [ "chem_sulphuric_acid", 30 ],
       [ "chem_muriatic_acid", 35 ],
       [ "peephole", 25 ],
@@ -481,7 +481,7 @@
     "type": "item_group",
     "//": "Consumable supplies excluding seeds used for farming or other agriculture",
     "items": [
-      [ "fertilizer_commercial", 100 ],
+      { "group": "fertilizer_commercial_bag_canvas_60", "prob": 100 },
       [ "fertilizer_liquid", 60 ],
       [ "material_quicklime", 80 ],
       { "item": "chem_saltpetre", "prob": 15, "charges-min": 10, "charges-max": 50 }