Allow cured hides/pelts for clay containers (cataclysmbnteam#2974)

* Allow cured hides/pelts for clay containers * Do the thing
mythosmod · Jun 20, 2023 · e40303a · e40303a
1 parent 8836073
commit e40303a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/data/json/recipes/other/containers.json b/data/json/recipes/other/containers.json
@@ -438,7 +438,11 @@
     "time": "20 m",
     "autolearn": true,
     "using": [ [ "cordage_short", 1 ], [ "glazing", 1 ], [ "earthenware_firing", 40 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 4 ] ], [ [ "leather", 2 ], [ "fur", 2 ] ] ]
+    "components": [
+      [ [ "water", 1 ], [ "water_clean", 1 ] ],
+      [ [ "clay_lump", 4 ] ],
+      [ [ "fabric_hides_proper", 2, "LIST" ], [ "fabric_hides_untanned", 2, "LIST" ] ]
+    ]
   },
   {
     "type": "recipe",
@@ -451,7 +455,11 @@
     "time": "30 m",
     "autolearn": true,
     "using": [ [ "cordage_short", 1 ], [ "glazing", 1 ], [ "earthenware_firing", 60 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 2 ] ], [ [ "leather", 2 ], [ "fur", 2 ] ] ]
+    "components": [
+      [ [ "water", 1 ], [ "water_clean", 1 ] ],
+      [ [ "clay_lump", 2 ] ],
+      [ [ "fabric_hides_proper", 2, "LIST" ], [ "fabric_hides_untanned", 2, "LIST" ] ]
+    ]
   },
   {
     "type": "recipe",
@@ -464,7 +472,11 @@
     "time": "45 m",
     "autolearn": true,
     "using": [ [ "cordage_short", 2 ], [ "glazing", 2 ], [ "earthenware_firing", 120 ] ],
-    "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "clay_lump", 10 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
+    "components": [
+      [ [ "water", 2 ], [ "water_clean", 2 ] ],
+      [ [ "clay_lump", 10 ] ],
+      [ [ "fabric_hides_proper", 3, "LIST" ], [ "fabric_hides_untanned", 3, "LIST" ] ]
+    ]
   },
   {
     "type": "recipe",
@@ -477,7 +489,11 @@
     "time": "80 m",
     "autolearn": true,
     "using": [ [ "cordage_short", 2 ], [ "glazing", 3 ], [ "earthenware_firing", 160 ] ],
-    "components": [ [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "clay_lump", 20 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
+    "components": [
+      [ [ "water", 3 ], [ "water_clean", 3 ] ],
+      [ [ "clay_lump", 20 ] ],
+      [ [ "fabric_hides_proper", 3, "LIST" ], [ "fabric_hides_untanned", 3, "LIST" ] ]
+    ]
   },
   {
     "type": "recipe",
@@ -490,7 +506,11 @@
     "time": "25 m",
     "autolearn": true,
     "using": [ [ "cordage_short", 2 ], [ "glazing", 1 ], [ "earthenware_firing", 50 ] ],
-    "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "clay_lump", 6 ] ], [ [ "leather", 3 ], [ "fur", 3 ] ] ]
+    "components": [
+      [ [ "water", 1 ], [ "water_clean", 1 ] ],
+      [ [ "clay_lump", 6 ] ],
+      [ [ "fabric_hides_proper", 3, "LIST" ], [ "fabric_hides_untanned", 2, "LIST" ] ]
+    ]
   },
   {
     "result": "keg_steel",

diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json
@@ -89,6 +89,12 @@
     "//": "For where proper leather or fur are used, that don't impact the material of the end product, but the real deal is needed for durability.",
     "components": [ [ [ "leather", 1 ], [ "fur", 1 ] ] ]
   },
+  {
+    "id": "fabric_hides_untanned",
+    "type": "requirement",
+    "//": "For where cured hides and pelts can be used, usually for recipes that don't require sewing.",
+    "components": [ [ [ "cured_hide", 1 ], [ "cured_pelt", 1 ] ] ]
+  },
   {
     "id": "fabric_standard_permeable",
     "type": "requirement",