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.

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

Incorporate human meat and fat into existing recipes, remove dedicated recipes #35630

Merged
merged 21 commits into from
Dec 9, 2019
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Refactor meat requirements part 2
Reorganize meat- and fat-related component lists for reduced redundancy.
Davi-DeGanne committed Dec 6, 2019

Verified

This commit was signed with the committer’s verified signature.
Eliulm Elias Wahl
commit 0b06416a63003c3b37f9d0d96ed98ab57b04ae8c
3 changes: 1 addition & 2 deletions data/json/recipes/other/other.json
Original file line number Diff line number Diff line change
@@ -10,8 +10,7 @@
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [
[
[ "meat", 1 ],
[ "mutant_meat", 1 ],
[ "meat_red_raw", 1, "LIST" ],
[ "fish", 1 ],
[ "corn", 1 ],
[ "irradiated_corn", 1 ],
2 changes: 1 addition & 1 deletion data/json/recipes/recipe_food.json
Original file line number Diff line number Diff line change
@@ -2763,7 +2763,7 @@
[ "honey_bottled", 2 ],
[ "honey_glassed", 2 ]
],
[ [ "meat", 1 ], [ "mutant_meat", 1 ] ],
[ [ "meat_raw_steak", 1, "LIST" ] ],
[ [ "cooking_oil", 8 ], [ "cooking_oil2", 8 ], [ "edible_tallow_lard", 1, "LIST" ] ],
[ [ "veggy_any", 1, "LIST" ] ],
[ [ "salt", 1 ], [ "soysauce", 1 ], [ "seasoning_salt", 1 ], [ "pepper", 1 ] ]
2 changes: 1 addition & 1 deletion data/json/recipes/weapon/bashing.json
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@
"autolearn": true,
"qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 1 } ],
"tools": [ [ [ "char_smoker", 100 ] ] ],
"components": [ [ [ "log", 1 ] ], [ [ "butter", 30 ], [ "lard", 4 ], [ "mutant_lard", 4 ] ] ]
"components": [ [ [ "log", 1 ] ], [ [ "butter", 30 ], [ "edible_lard", 4, "LIST" ] ] ]
},
{
"type": "recipe",
37 changes: 23 additions & 14 deletions data/json/requirements/cooking_components.json
Original file line number Diff line number Diff line change
@@ -104,26 +104,23 @@
"//": "Anything you might consider offal or intestines.",
"components": [ [ [ "lung", 4 ], [ "liver", 4 ], [ "kidney", 4 ], [ "sweetbread", 4 ], [ "offal", 1 ] ] ]
},
{
"id": "meat_raw_steak",
"type": "requirement",
"//": "An unbroken slab of raw meat. For when scraps just aren't good enough.",
"components": [ [ [ "meat", 1 ], [ "mutant_meat", 1 ] ] ]
},
{
"id": "meat_red_raw",
"type": "requirement",
"//": "Anything you might consider raw, unpreserved 'red' meat. About 250mL of meat.",
"components": [ [ [ "meat", 1 ], [ "mutant_meat", 1 ], [ "meat_scrap", 10 ], [ "mutant_meat_scrap", 10 ] ] ]
"components": [ [ [ "meat_raw_steak", 1, "LIST" ], [ "meat_scrap", 10 ], [ "mutant_meat_scrap", 10 ] ] ]
},
{
"id": "meat_red",
"type": "requirement",
"//": "Anything you might consider raw 'red' meat. About 250mL of meat.",
"components": [
[
[ "meat", 1 ],
[ "mutant_meat", 1 ],
[ "meat_scrap", 10 ],
[ "mutant_meat_scrap", 10 ],
[ "rehydrated_meat", 1 ],
[ "meat_canned", 1 ]
]
]
"components": [ [ [ "meat_red_raw", 1, "LIST" ], [ "rehydrated_meat", 1 ], [ "meat_canned", 1 ] ] ]
},
{
"id": "meat_nofish",
@@ -374,19 +371,31 @@
"id": "any_fat",
"type": "requirement",
"//": "Any type of raw fat.",
"components": [ [ [ "fat", 1 ], [ "mutant_fat", 1 ], [ "fat_tainted", 1 ] ] ]
"components": [ [ [ "edible_fat", 1, "LIST" ], [ "fat_tainted", 1 ] ] ]
},
{
"id": "edible_tallow",
"type": "requirement",
"//": "Any type of edible tallow.",
"components": [ [ [ "tallow", 1 ], [ "mutant_tallow", 1 ] ] ]
},
{
"id": "any_tallow",
"type": "requirement",
"//": "Any type of tallow.",
"components": [ [ [ "tallow", 1 ], [ "mutant_tallow", 1 ], [ "tallow_tainted", 1 ] ] ]
"components": [ [ [ "edible_tallow", 1, "LIST" ], [ "tallow_tainted", 1 ] ] ]
},
{
"id": "edible_lard",
"type": "requirement",
"//": "Lard that is safe for consumption.",
"components": [ [ [ "lard", 1 ], [ "mutant_lard", 1 ] ] ]
},
{
"id": "edible_tallow_lard",
"type": "requirement",
"//": "Any type of edible rendered fat.",
"components": [ [ [ "tallow", 1 ], [ "lard", 1 ], [ "mutant_tallow", 1 ], [ "mutant_lard", 1 ] ] ]
"components": [ [ [ "edible_tallow", 1, "LIST" ], [ "edible_lard", 1, "LIST" ] ] ]
},
{
"id": "seasoning_mild",
3 changes: 1 addition & 2 deletions data/json/requirements/materials.json
Original file line number Diff line number Diff line change
@@ -89,8 +89,7 @@
"//": "Materials for glazing pottery",
"components": [
[
[ "tallow", 1 ],
[ "mutant_tallow", 1 ],
[ "edible_tallow", 1, "LIST" ],
[ "cooking_oil", 8 ],
[ "cooking_oil2", 8 ],
[ "wax", 1 ],