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

Recipe consistency for tallow and stomaches. Recipes for small and large tin cans. #70690

Merged
merged 9 commits into from
Jan 8, 2024
Merged

Recipe consistency for tallow and stomaches. Recipes for small and large tin cans. #70690

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
addf766
Recipe consistency
kasanryukin Jan 6, 2024
84c109f
Added craftable small and large tin cans
kasanryukin Jan 7, 2024
f7acfee
Added deconstruction for can_food
kasanryukin Jan 7, 2024
a1eb619
can_food_big consistency between craft an uncraft
kasanryukin Jan 7, 2024
3dfd23c
Style fix
kasanryukin Jan 7, 2024
974f5be
Style fix (round 2?)
kasanryukin Jan 7, 2024
a687e56
Resolve mass issues
kasanryukin Jan 7, 2024
debc994
Phantom space
kasanryukin Jan 7, 2024
2e72b46
Fixed component issue
kasanryukin Jan 7, 2024
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
8 changes: 8 additions & 0 deletions data/json/recipes/recipe_deconstruction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5861,6 +5861,14 @@
"activity_level": "MODERATE_EXERCISE",
"time": "12 s",
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "scrap", 2 ] ] ]
},
{
"result": "can_food",
"type": "uncraft",
"activity_level": "MODERATE_EXERCISE",
"time": "12 s",
"qualities": [ { "id": "HAMMER", "level": 1 } ],
kasanryukin marked this conversation as resolved.
Show resolved Hide resolved
"components": [ [ [ "scrap", 1 ] ] ]
},
{
Expand Down
3 changes: 2 additions & 1 deletion data/json/recipes/recipe_food.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@
"charges": 12,
"autolearn": true,
"batch_time_factors": [ 75, 2 ],
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ],
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "BOIL", "level": 2 } ],
"tools": [ [ [ "water_boiling_heat", 20, "LIST" ] ] ],
"//": "total is 660g of fat, 5960 calories. https://heygrillhey.com/beef-tallow/ shows 4 hours of low boil to make 11610 calories of tallow, so halve that, 2 hours boiling ish",
"proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_knife_skills" } ],
Expand Down Expand Up @@ -10033,6 +10033,7 @@
"skill_used": "cooking",
"time": "10 m",
"autolearn": true,
"qualities": [ { "id": "BOIL", "level": 1 } ],
"batch_time_factors": [ 67, 5 ],
"tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ],
"//": "small stomach is half weight of large stomach (72g) plus doesn't boil for full 15 extra minutes, so 2u boiling",
Expand Down
36 changes: 36 additions & 0 deletions data/json/recipes/tools/containers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,24 @@
"difficulty": 6,
"time": "30 m",
"autolearn": true,
"using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 2 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_toolsmithing" }
],
"qualities": [ { "id": "CHISEL", "level": 3 } ]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "can_food",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_CONTAINERS",
"skill_used": "fabrication",
"difficulty": 6,
"time": "20 m",
"autolearn": true,
"using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 1 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
Expand All @@ -258,6 +276,24 @@
],
"qualities": [ { "id": "CHISEL", "level": 3 } ]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "can_food_big",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_CONTAINERS",
"skill_used": "fabrication",
"difficulty": 6,
"time": "30 m",
"autolearn": true,
"using": [ [ "blacksmithing_standard", 1 ], [ "steel_tiny", 3 ], [ "sheet_metal_small", 3 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_toolsmithing" }
],
"qualities": [ { "id": "CHISEL", "level": 3 } ]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
Expand Down
Loading