f_metal_trashcan construct/bash/disassy

CleverRaven · Jan 18, 2023 · 49233f1 · 49233f1
1 parent 677f2be
commit 49233f1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2626,11 +2626,13 @@
     "type": "construction",
     "id": "constr_metal_trashcan",
     "group": "build_metal_trashcan",
-    "category": "CONSTRUCT",
+    "category": "FURN",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_M", "level": 2 } ] ],
-    "components": [ [ [ "sheet_metal", 2 ] ] ],
+    "//": "wastebasket, no lid, 20 qt capacity, truncated rectangular pyramid base 10in×7.5in, top 11in×8.5in, height 13.5in",
+    "components": [ [ [ "sheet_metal", 1 ] ] ],
+    "byproducts": [ { "item": "sheet_metal_small", "count": 4 }, { "item": "scrap", "count": [ 4, 6 ] } ],
     "pre_special": "check_empty",
     "post_terrain": "f_metal_trashcan"
   },

diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
@@ -799,13 +799,23 @@
     "required_str": 5,
     "max_volume": "20 L",
     "flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "SHORT" ],
-    "deconstruct": { "items": [ { "item": "sheet_metal", "count": 2 } ] },
+    "deconstruct": {
+      "items": [
+        { "item": "sheet_metal_small", "count": [ 10, 14 ] },
+        { "item": "steel_chunk", "count": [ 1, 2 ] },
+        { "item": "scrap", "count": [ 6, 12 ] }
+      ]
+    },
     "bash": {
       "str_min": 9,
       "str_max": 30,
       "sound": "metal screeching!",
       "sound_fail": "clang!",
-      "items": [ { "item": "sheet_metal", "count": [ 1, 2 ] } ]
+      "items": [
+        { "item": "sheet_metal_small", "count": [ 3, 6 ] },
+        { "item": "steel_chunk", "count": [ 6, 8 ] },
+        { "item": "scrap", "count": [ 8, 16 ] }
+      ]
     }
   },
   {