[Experimental] routine updates 6 (#166)

GMC-Modding-Team · Apr 6, 2022 · d2fddeb · d2fddeb
1 parent 66dd068
commit d2fddeb
Show file tree

Hide file tree

Showing 516 changed files with 6,168 additions and 10,537 deletions.
diff --git a/...e_and_Terrain/Furniture_construction.json → ...val/Furniture/Furniture_construction.json b/...e_and_Terrain/Furniture_construction.json → ...val/Furniture/Furniture_construction.json
@@ -32,13 +32,13 @@
     "coverage": 50,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "NOITEM", "FLAMMABLE_ASH", "THIN_OBSTACLE", "MOUNTABLE", "EASY_DECONSTRUCT", "WALL" ],
-    "deconstruct": { "items": [ { "item": "2x4", "amount": 8, "minamount": 8 } ] },
+    "deconstruct": { "items": [ { "item": "2x4", "count": 8 } ] },
     "bash": {
       "str_min": 4,
       "str_max": 20,
       "sound": "crack.",
       "sound_fail": "wham.",
-      "items": [ { "item": "2x4", "amount": 6, "minamount": 2 } ]
+      "items": [ { "item": "2x4", "count": [ 2, 6 ] } ]
     }
   },
   {
@@ -52,13 +52,13 @@
     "coverage": 50,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "NOITEM", "FLAMMABLE_ASH", "THIN_OBSTACLE", "EASY_DECONSTRUCT", "DOOR", "CONNECT_TO_WALL" ],
-    "deconstruct": { "items": [ { "item": "2x4", "amount": 8, "minamount": 8 } ] },
+    "deconstruct": { "items": [ { "item": "2x4", "count": 8 } ] },
     "bash": {
       "str_min": 4,
       "str_max": 20,
       "sound": "crack.",
       "sound_fail": "wham.",
-      "items": [ { "item": "2x4", "amount": 6, "minamount": 2 } ]
+      "items": [ { "item": "2x4", "count": [ 2, 6 ] } ]
     }
   },
   {
@@ -71,16 +71,15 @@
     "symbol": "LINE_OXOX",
     "description": "A fence made from simple fence posts and branches woven between the posts.",
     "color": "brown",
-    "move_cost": 3,
     "flags": [ "TRANSPARENT", "DIGGABLE", "FLAMMABLE_ASH", "NOITEM", "PERMEABLE", "MOUNTABLE", "AUTO_WALL_SYMBOL" ],
     "connects_to": "WOODFENCE",
-    "deconstruct": { "items": [ { "item": "stick", "amount": 8, "minamount": 8 } ] },
+    "deconstruct": { "items": [ { "item": "stick", "count": 8 } ] },
     "bash": {
       "str_min": 4,
       "str_max": 20,
       "sound": "crack.",
       "sound_fail": "wham.",
-      "items": [ { "item": "stick", "amount": 6, "minamount": 2 } ]
+      "items": [ { "item": "stick", "count": [ 2, 6 ] } ]
     }
   },
   {
@@ -101,7 +100,7 @@
       "str_max": 10,
       "sound": "smash!",
       "sound_fail": "whump.",
-      "items": [ { "item": "wooden_rollmat", "count": [ 1, 1 ] } ]
+      "items": [ { "item": "wooden_rollmat", "count": 1 } ]
     }
   },
   {
@@ -114,8 +113,8 @@
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "CONTAINER", "FIRE_CONTAINER", "PLACE_ITEM" ],
-    "deconstruct": { "items": [ { "item": "rock", "amount": 8 } ] },
-    "bash": { "str_min": 1, "str_max": 1, "sound": "crash!", "sound_fail": "whump!", "items": [ { "item": "rock", "amount": 8 } ] }
+    "deconstruct": { "items": [ { "item": "rock", "count": 8 } ] },
+    "bash": { "str_min": 1, "str_max": 1, "sound": "crash!", "sound_fail": "whump!", "items": [ { "item": "rock", "count": 8 } ] }
   },
   {
     "id": "f_cookfirepit",
@@ -128,13 +127,13 @@
     "required_str": -1,
     "flags": [ "TRANSPARENT", "CONTAINER", "FIRE_CONTAINER", "SUPPRESS_SMOKE", "PLACE_ITEM" ],
     "crafting_pseudo_item": "rock_pot",
-    "deconstruct": { "items": [ { "item": "rock", "amount": 8 }, { "item": "stick", "amount": 4 }, { "item": "rock_pot", "amount": 1 } ] },
+    "deconstruct": { "items": [ { "item": "rock", "count": 8 }, { "item": "stick", "count": 4 }, { "item": "rock_pot", "count": 1 } ] },
     "bash": {
       "str_min": 1,
       "str_max": 1,
       "sound": "crash!",
       "sound_fail": "whump!",
-      "items": [ { "item": "rock", "amount": 8 }, { "item": "stick", "amount": 4 }, { "item": "rock_pot", "amount": 1 } ]
+      "items": [ { "item": "rock", "count": 8 }, { "item": "stick", "count": 4 }, { "item": "rock_pot", "count": 1 } ]
     }
   }
 ]
diff --git a/...l/Furniture_and_Terrain/construction.json → ...tive_Survival/Furniture/construction.json b/...l/Furniture_and_Terrain/construction.json → ...tive_Survival/Furniture/construction.json
diff --git a/data/Goats_mods/Primitive_Survival/Furniture_and_Terrain/Furniture_terrains_override.json b/data/Goats_mods/Primitive_Survival/Furniture_and_Terrain/Furniture_terrains_override.json