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

Tweaked canning ratios for fruit, tomatoes, and liver #38226

Merged
merged 3 commits into from
Feb 22, 2020
Merged

Tweaked canning ratios for fruit, tomatoes, and liver #38226

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
12fd768
#38201, #37504 tweaked canning ratios
jkraybill Feb 22, 2020
9df131e
linted
jkraybill Feb 22, 2020
9c05bbe
reduced calories of canned fruit
jkraybill Feb 22, 2020
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
2 changes: 1 addition & 1 deletion data/json/items/comestibles/fruit_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
"symbol": "%",
"quench": 3,
"healthy": 1,
"calories": 367,
"calories": 275,
"description": "This sodden mass of preserved fruit was boiled and canned in an earlier life. Bland, mushy and losing color.",
"price": 220,
"material": "fruit",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/containers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@
"id": "can_food_big_unsealed",
"copy-from": "can_food_big",
"type": "CONTAINER",
"name": "opened large tin can",
"name": "large opened tin can",
"description": "A large tin can, like what beans come in. This one is opened and can't be easily sealed.",
"symbol": ")",
"color": "blue",
Expand Down
36 changes: 21 additions & 15 deletions data/json/recipes/food/canned.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,16 +358,16 @@
"skill_used": "cooking",
"difficulty": 4,
"time": "30 m",
"result_mult": 2,
"result_mult": 4,
"autolearn": true,
"batch_time_factors": [ 83, 5 ],
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
"components": [
[ [ "water", 11 ], [ "water_clean", 11 ] ],
[ [ "water", 12 ], [ "water_clean", 12 ] ],
[ [ "jar_glass", 1 ] ],
[ [ "sweet_fruit", 3, "LIST" ] ],
[ [ "sugar", 20 ] ]
[ [ "sweet_fruit", 4, "LIST" ] ],
[ [ "sugar_standard", 2, "LIST" ] ]
]
},
{
Expand Down Expand Up @@ -570,12 +570,12 @@
"skill_used": "cooking",
"difficulty": 4,
"time": "30 m",
"result_mult": 2,
"result_mult": 4,
"autolearn": true,
"batch_time_factors": [ 83, 5 ],
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
"components": [ [ [ "water", 11 ], [ "water_clean", 11 ] ], [ [ "jar_glass", 1 ] ], [ [ "tomato", 2 ], [ "irradiated_tomato", 2 ] ] ]
"components": [ [ [ "water", 12 ], [ "water_clean", 12 ] ], [ [ "jar_glass", 1 ] ], [ [ "tomato", 4 ], [ "irradiated_tomato", 4 ] ] ]
},
{
"type": "recipe",
Expand Down Expand Up @@ -682,7 +682,7 @@
"skill_used": "cooking",
"difficulty": 4,
"time": "24 m",
"charges": 1,
"charges": 2,
"autolearn": true,
"contained": true,
"batch_time_factors": [ 83, 5 ],
Expand All @@ -697,8 +697,8 @@
[ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
[ [ "scrap", 1 ] ],
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "sweet_fruit", 1, "LIST" ] ],
[ [ "sugar", 15 ] ]
[ [ "sweet_fruit", 2, "LIST" ] ],
[ [ "sugar_standard", 1, "LIST" ] ]
]
},
{
Expand All @@ -712,6 +712,7 @@
"autolearn": true,
"contained": true,
"batch_time_factors": [ 83, 5 ],
"charges": 2,
"qualities": [
{ "id": "SAW_M", "level": 1 },
{ "id": "HAMMER", "level": 1 },
Expand All @@ -723,7 +724,7 @@
[ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
[ [ "scrap", 1 ] ],
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "tomato", 1 ] ]
[ [ "tomato", 2 ], [ "irradiated_tomato", 2 ] ]
]
},
{
Expand Down Expand Up @@ -890,12 +891,17 @@
"skill_used": "cooking",
"difficulty": 4,
"time": "40 m",
"result_mult": 12,
"result_mult": 24,
"autolearn": true,
"batch_time_factors": [ 83, 5 ],
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
"components": [ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 36, "LIST" ] ] ]
"components": [
[ [ "water", 22 ], [ "water_clean", 22 ] ],
[ [ "jar_3l_glass", 1 ] ],
[ [ "sweet_fruit", 24, "LIST" ] ],
[ [ "sugar_standard", 12, "LIST" ] ]
]
},
{
"type": "recipe",
Expand Down Expand Up @@ -950,13 +956,13 @@
"time": "40 m",
"autolearn": true,
"batch_time_factors": [ 83, 5 ],
"charges": 12,
"charges": 24,
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ] ],
"components": [
[ [ "water", 16 ], [ "water_clean", 16 ] ],
[ [ "water", 22 ], [ "water_clean", 22 ] ],
[ [ "jar_3l_glass", 1 ] ],
[ [ "tomato", 12 ], [ "irradiated_tomato", 12 ] ]
[ [ "tomato", 24 ], [ "irradiated_tomato", 24 ] ]
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/food/offal_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,9 @@
[ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
[ [ "scrap", 1 ] ],
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "liver", 8 ] ]
[ [ "liver", 4 ] ]
],
"charges": 8,
"charges": 4,
"autolearn": true
},
{
Expand Down