Update sheet metal acquisition/usage (cataclysmbnteam#2848)

mythosmod · May 26, 2023 · 4bdbc0d · 4bdbc0d
1 parent 4120937
commit 4bdbc0d
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 41 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-fireplaces.json b/data/json/furniture_and_terrain/furniture-fireplaces.json
@@ -137,7 +137,11 @@
       "str_max": 30,
       "sound": "metal screeching!",
       "sound_fail": "clang!",
-      "items": [ { "item": "scrap", "count": [ 5, 15 ] }, { "item": "sheet_metal_small", "count": [ 1, 9 ] } ]
+      "items": [
+        { "item": "scrap", "count": [ 4, 10 ] },
+        { "item": "sheet_metal_small", "count": [ 2, 5 ] },
+        { "item": "sheet_metal", "count": [ 0, 1 ] }
+      ]
     }
   },
   {

diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
@@ -386,23 +386,17 @@
     "coverage": 90,
     "required_str": 9,
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR" ],
-    "deconstruct": {
-      "items": [
-        { "item": "sheet_metal", "count": [ 1, 2 ] },
-        { "item": "sheet_metal_small", "count": [ 0, 4 ] },
-        { "item": "lock", "count": [ 0, 1 ] },
-        { "item": "pipe", "count": [ 4, 8 ] }
-      ]
-    },
+    "deconstruct": { "items": [ { "item": "sheet_metal", "count": 2 }, { "item": "lock", "count": 1 }, { "item": "pipe", "count": 8 } ] },
     "max_volume": "500 L",
     "bash": {
       "str_min": 12,
       "str_max": 40,
       "sound": "metal screeching!",
       "sound_fail": "clang!",
       "items": [
-        { "item": "scrap", "count": [ 4, 10 ] },
-        { "item": "sheet_metal_small", "count": [ 6, 10 ] },
+        { "item": "sheet_metal", "count": 1 },
+        { "item": "scrap", "count": [ 4, 8 ] },
+        { "item": "sheet_metal_small", "count": [ 4, 8 ] },
         { "item": "pipe", "count": [ 0, 1 ] }
       ]
     }
@@ -480,23 +474,18 @@
     "coverage": 70,
     "required_str": 8,
     "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "PLACE_ITEM", "BLOCKSDOOR", "MOUNTABLE" ],
-    "deconstruct": {
-      "items": [
-        { "item": "pipe", "count": [ 6, 12 ] },
-        { "item": "sheet_metal", "count": [ 1, 2 ] },
-        { "item": "sheet_metal_small", "count": [ 0, 4 ] }
-      ]
-    },
+    "deconstruct": { "items": [ { "item": "pipe", "count": 12 }, { "item": "sheet_metal", "count": 2 } ] },
     "max_volume": "1750 L",
     "bash": {
       "str_min": 6,
       "str_max": 30,
       "sound": "metal screeching!",
       "sound_fail": "clang!",
       "items": [
+        { "item": "sheet_metal_small", "count": 1 },
         { "item": "scrap", "count": [ 2, 8 ] },
         { "item": "steel_chunk", "count": [ 2, 4 ] },
-        { "item": "sheet_metal_small", "count": [ 6, 10 ] },
+        { "item": "sheet_metal_small", "count": [ 4, 8 ] },
         { "item": "pipe", "count": 1 }
       ]
     }
@@ -785,9 +774,10 @@
       "sound": "metal screeching!",
       "sound_fail": "clang!",
       "items": [
-        { "item": "scrap", "count": [ 3, 12 ] },
+        { "item": "sheet_metal", "count": [ 1, 3 ] },
+        { "item": "scrap", "count": [ 3, 10 ] },
         { "item": "steel_chunk", "count": [ 3, 6 ] },
-        { "item": "sheet_metal_small", "count": [ 6, 10 ] },
+        { "item": "sheet_metal_small", "count": [ 4, 8 ] },
         { "item": "pipe", "count": 4 }
       ]
     }

diff --git a/data/json/furniture_and_terrain/terrain-fences-gates.json b/data/json/furniture_and_terrain/terrain-fences-gates.json
@@ -917,6 +917,7 @@
       "ter_set": "t_rock_floor",
       "items": [
         { "item": "pipe", "count": [ 1, 2 ] },
+        { "item": "sheet_metal", "charges": 1 },
         { "item": "sheet_metal_small", "charges": [ 1, 4 ] },
         { "item": "scrap", "count": [ 1, 3 ] }
       ]

diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json
@@ -125,7 +125,7 @@
     "book_learn": [ [ "recipe_melee", 2 ] ],
     "using": [ [ "cordage", 1 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
-    "components": [ [ [ "scrap", 60 ] ] ]
+    "components": [ [ [ "scrap", 60 ], [ "sheet_metal_small", 12 ] ] ]
   },
   {
     "result": "armguard_soft",

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
@@ -204,7 +204,7 @@
     "book_learn": [ [ "recipe_melee", 2 ] ],
     "using": [ [ "cordage", 4 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
-    "components": [ [ [ "scrap", 50 ] ] ]
+    "components": [ [ [ "scrap", 50 ], [ "sheet_metal_small", 10 ] ] ]
   },
   {
     "result": "boots_survivor",

diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -84,7 +84,7 @@
     "autolearn": true,
     "using": [ [ "sewing_standard", 10 ] ],
     "qualities": [ { "id": "HAMMER", "level": 2 } ],
-    "components": [ [ [ "gloves_fingerless", 1 ] ], [ [ "scrap", 2 ] ] ]
+    "components": [ [ [ "gloves_fingerless", 1 ] ], [ [ "scrap", 2 ], [ "sheet_metal_small", 1 ] ] ]
   },
   {
     "result": "gloves_fsurvivor",

diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json
@@ -662,7 +662,7 @@
     "book_learn": [ [ "recipe_melee", 2 ] ],
     "using": [ [ "cordage", 1 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
-    "components": [ [ [ "scrap", 30 ] ] ]
+    "components": [ [ [ "scrap", 30 ], [ "sheet_metal_small", 6 ] ] ]
   },
   {
     "result": "hood_fsurvivor",

diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json
@@ -275,9 +275,9 @@
     "time": "45 m",
     "autolearn": true,
     "book_learn": [ [ "textbook_armwest", 4 ], [ "recipe_melee", 4 ] ],
-    "using": [ [ "cordage", 4 ], [ "steel_tiny", 4 ] ],
+    "using": [ [ "cordage", 4 ] ],
     "qualities": [ { "id": "HAMMER", "level": 2 } ],
-    "components": [ [ [ "fur", 6 ], [ "leather", 6 ] ] ]
+    "components": [ [ [ "fur", 6 ], [ "leather", 6 ] ], [ [ "steel_tiny", 4, "LIST" ], [ "sheet_metal_small", 4 ] ] ]
   },
   {
     "result": "legguard_paper",
@@ -302,7 +302,7 @@
     "book_learn": [ [ "recipe_melee", 2 ] ],
     "using": [ [ "cordage", 1 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
-    "components": [ [ [ "scrap", 60 ] ] ]
+    "components": [ [ [ "scrap", 60 ], [ "sheet_metal_small", 12 ] ] ]
   },
   {
     "result": "loincloth",

diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json
@@ -10,7 +10,7 @@
     "time": "15 m",
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "leather", 9 ] ], [ [ "scrap", 3 ] ], [ [ "filament", 20, "LIST" ] ] ]
+    "components": [ [ [ "leather", 9 ] ], [ [ "scrap", 3 ], [ "sheet_metal_small", 1 ] ], [ [ "filament", 20, "LIST" ] ] ]
   },
   {
     "result": "ammo_satchel",
@@ -62,7 +62,7 @@
     "autolearn": true,
     "using": [ [ "adhesive", 1 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
-    "components": [ [ [ "leather", 5 ] ], [ [ "scrap", 3 ] ], [ [ "nail", 4 ] ] ]
+    "components": [ [ [ "leather", 5 ] ], [ [ "scrap", 3 ], [ "sheet_metal_small", 1 ] ], [ [ "nail", 4 ] ] ]
   },
   {
     "result": "back_holster",
@@ -100,7 +100,7 @@
     "time": "50 m",
     "autolearn": true,
     "using": [ [ "sewing_standard", 20 ] ],
-    "components": [ [ [ "leather", 20 ] ], [ [ "scrap", 6 ] ] ]
+    "components": [ [ [ "leather", 20 ] ], [ [ "scrap", 6 ], [ "sheet_metal_small", 2 ] ] ]
   },
   {
     "result": "baldric",
@@ -249,7 +249,7 @@
     "qualities": [ { "id": "SEW", "level": 1 } ],
     "components": [
       [ [ "rag", 10 ], [ "leather", 10 ] ],
-      [ [ "plastic_chunk", 2 ], [ "scrap", 1 ] ],
+      [ [ "plastic_chunk", 2 ], [ "scrap", 1 ], [ "sheet_metal_small", 1 ] ],
       [ [ "rope_natural_short", 1, "LIST" ] ]
     ]
   },
@@ -571,9 +571,9 @@
     "decomp_learn": 3,
     "autolearn": true,
     "book_learn": [ [ "recipe_arrows", 2 ] ],
-    "using": [ [ "sewing_standard", 8 ], [ "steel_tiny", 1 ] ],
+    "using": [ [ "sewing_standard", 8 ] ],
     "qualities": [ { "id": "HAMMER", "level": 2 } ],
-    "components": [ [ [ "leather", 8 ] ] ]
+    "components": [ [ [ "leather", 8 ] ], [ [ "steel_tiny", 1, "LIST" ], [ "sheet_metal_small", 1 ] ] ]
   },
   {
     "result": "quiver_large_birchbark",

diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json
@@ -195,7 +195,11 @@
     "time": "28 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ], [ "textbook_armwest", 4 ], [ "textbook_armschina", 4 ] ],
     "using": [ [ "sewing_standard", 26 ] ],
-    "components": [ [ [ "steel_chunk", 6 ], [ "scrap", 18 ] ], [ [ "armor_larmor", 1 ] ], [ [ "armguard_larmor", 1 ] ] ]
+    "components": [
+      [ [ "steel_chunk", 6 ], [ "scrap", 18 ], [ "sheet_metal_small", 6 ] ],
+      [ [ "armor_larmor", 1 ] ],
+      [ [ "armguard_larmor", 1 ] ]
+    ]
   },
   {
     "result": "armor_plate",
@@ -258,7 +262,7 @@
     "book_learn": [ [ "recipe_melee", 2 ] ],
     "using": [ [ "cordage", 4 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
-    "components": [ [ [ "scrap", 170 ] ] ]
+    "components": [ [ [ "scrap", 170 ], [ "sheet_metal_small", 34 ] ] ]
   },
   {
     "result": "armor_scrapsuit",

diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
@@ -236,7 +236,7 @@
     "book_learn": [ [ "recipe_melee", 2 ] ],
     "using": [ [ "cordage", 1 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
-    "components": [ [ [ "scrap", 80 ] ] ]
+    "components": [ [ [ "scrap", 80 ], [ "sheet_metal_small", 16 ] ] ]
   },
   {
     "result": "duster",
@@ -404,7 +404,7 @@
     "autolearn": true,
     "using": [ [ "sewing_standard", 30 ] ],
     "qualities": [ { "id": "HAMMER", "level": 2 } ],
-    "components": [ [ [ "jacket_leather", 1 ], [ "jacket_leather_red", 1 ] ], [ [ "scrap", 9 ] ] ]
+    "components": [ [ [ "jacket_leather", 1 ], [ "jacket_leather_red", 1 ] ], [ [ "scrap", 9 ], [ "sheet_metal_small", 2 ] ] ]
   },
   {
     "result": "kevlar",
@@ -1228,7 +1228,7 @@
     "autolearn": true,
     "using": [ [ "sewing_standard", 20 ] ],
     "qualities": [ { "id": "HAMMER", "level": 2 } ],
-    "components": [ [ [ "vest_leather", 1 ] ], [ [ "scrap", 5 ] ] ]
+    "components": [ [ [ "vest_leather", 1 ] ], [ [ "scrap", 5 ], [ "sheet_metal_small", 1 ] ] ]
   },
   {
     "result": "wool_hoodie",

diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json
@@ -26,7 +26,7 @@
     "skill_used": "fabrication",
     "difficulty": 1,
     "time": "150 s",
-    "qualities": [ { "id": "SAW_M", "level": 2 } ],
+    "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "sheet_metal_small", 24 ] ] ]
   },
   {
@@ -35,7 +35,7 @@
     "skill_used": "fabrication",
     "difficulty": 1,
     "time": "12 s",
-    "qualities": [ { "id": "SAW_M", "level": 2 } ],
+    "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "scrap", 5 ] ] ]
   },
   {