Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow cured hides/pelts for clay containers #2974

Merged
merged 3 commits into from
Jun 20, 2023
Merged

Allow cured hides/pelts for clay containers #2974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7e27cd
Allow cured hides/pelts for clay containers
chaosvolt Jun 19, 2023
4963c7e
Merge remote-tracking branch 'upstream/upload' into keep-a-lid-on-it
chaosvolt Jun 20, 2023
68d00df
Do the thing
chaosvolt Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions data/json/recipes/other/containers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions data/json/requirements/materials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down