Allow sticks/long sticks in more recipes (#1551)

* Allow sticks/long sticks in more recipes * Remove washboard change per feedback * Suggestions per feedback * Fix a whoops
cataclysmbnteam · May 28, 2022 · de64c76 · de64c76
1 parent 9d88e63
commit de64c76
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 14 deletions.
diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json
@@ -113,7 +113,7 @@
     "autolearn": true,
     "using": [ [ "adhesive", 1 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "leather", 12 ] ], [ [ "2x4", 2 ] ], [ [ "nail", 8 ] ] ]
+    "components": [ [ [ "leather", 12 ], [ "fur", 12 ] ], [ [ "wood_structural", 1, "LIST" ] ], [ [ "nail", 8 ] ] ]
   },
   {
     "result": "bandolier_pistol",
@@ -264,7 +264,7 @@
     "autolearn": true,
     "using": [ [ "adhesive", 1 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "leather", 15 ] ], [ [ "2x4", 2 ] ], [ [ "nail", 10 ] ] ]
+    "components": [ [ [ "leather", 15 ], [ "fur", 15 ] ], [ [ "wood_structural", 1, "LIST" ] ], [ [ "nail", 10 ] ] ]
   },
   {
     "result": "chestpouch",
@@ -612,7 +612,7 @@
     "autolearn": true,
     "using": [ [ "adhesive", 1 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "leather", 10 ] ], [ [ "2x4", 2 ] ], [ [ "nail", 5 ] ] ]
+    "components": [ [ [ "leather", 10 ], [ "fur", 10 ] ], [ [ "wood_structural", 1, "LIST" ] ], [ [ "nail", 5 ] ] ]
   },
   {
     "result": "sheath",

diff --git a/data/json/recipes/chem/chemicals.json b/data/json/recipes/chem/chemicals.json
@@ -616,7 +616,7 @@
     "autolearn": true,
     "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
-    "components": [ [ [ "splinter", 40 ], [ "2x4", 12 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ] ]
+    "components": [ [ [ "splinter", 40 ], [ "wood_structural", 6, "LIST" ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json
@@ -920,7 +920,7 @@
     "qualities": [ { "id": "CHEM", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ],
     "components": [
-      [ [ "pine_bough", 6 ], [ "2x4", 8 ], [ "stick", 8 ], [ "splinter", 16 ] ],
+      [ [ "pine_bough", 6 ], [ "wood_structural", 4, "LIST" ], [ "splinter", 16 ] ],
       [ [ "water_acid_weak", 3 ], [ "water_acid", 2 ], [ "acid", 1 ] ]
     ]
   },

diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json
@@ -414,8 +414,7 @@
     "components": [
       [
         [ "splinter", 40 ],
-        [ "2x4", 6 ],
-        [ "stick", 8 ],
+        [ "wood_structural", 4, "LIST" ],
         [ "bone", 40 ],
         [ "bone_human", 40 ],
         [ "bone_tainted", 40 ],

diff --git a/data/json/recipes/other/tools.json b/data/json/recipes/other/tools.json
@@ -1085,7 +1085,7 @@
     "book_learn": [ [ "manual_fabrication", 2 ], [ "textbook_fabrication", 3 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [ [ [ "2x4", 2 ] ] ]
+    "components": [ [ [ "wood_structural", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -1144,7 +1144,7 @@
     "using": [ [ "blacksmithing_standard", 8 ], [ "steel_standard", 2 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [ [ [ "2x4", 2 ] ] ]
+    "components": [ [ [ "wood_structural", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -1159,7 +1159,7 @@
     "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 8 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [ [ [ "2x4", 1 ] ] ]
+    "components": [ [ [ "wood_structural_small", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -1175,7 +1175,7 @@
     "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 8 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [ [ [ "2x4", 1 ] ] ]
+    "components": [ [ [ "wood_structural_small", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -1204,7 +1204,7 @@
     "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 20 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [ [ [ "2x4", 1 ] ] ]
+    "components": [ [ [ "wood_structural_small", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -1219,7 +1219,7 @@
     "using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 4 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ],
-    "components": [ [ [ "2x4", 1 ] ] ]
+    "components": [ [ [ "wood_structural_small", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/recipes/other/vehicles.json b/data/json/recipes/other/vehicles.json
@@ -119,7 +119,7 @@
     "book_learn": [ [ "textbook_fabrication", 5 ], [ "textbook_carpentry", 5 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
     "using": [ [ "sewing_standard", 100 ] ],
-    "components": [ [ [ "leather", 6 ], [ "fur", 6 ] ], [ [ "2x4", 4 ] ], [ [ "rope_natural_short", 4, "LIST" ] ] ]
+    "components": [ [ [ "leather", 6 ], [ "fur", 6 ] ], [ [ "wood_structural", 4, "LIST" ] ], [ [ "rope_natural_short", 4, "LIST" ] ] ]
   },
   {
     "result": "hd_tow_cable",

diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json
@@ -202,5 +202,17 @@
     "type": "requirement",
     "//": "Materials used for repairing tires",
     "components": [ [ [ "chunk_rubber", 1 ] ] ]
+  },
+  {
+    "id": "wood_structural",
+    "type": "requirement",
+    "//": "Planks, sticks, and long sticks used in recipes, roughly 1:1 by weight.",
+    "components": [ [ [ "stick_long", 1 ], [ "wood_structural_small", 2, "LIST" ] ] ]
+  },
+  {
+    "id": "wood_structural_small",
+    "type": "requirement",
+    "//": "Planks or sticks used in recipes, roughly 1:1 basis by weight.",
+    "components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ] ]
   }
 ]