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

Canning apple cider and other juices #36747

Merged
merged 23 commits into from
Jan 30, 2020
Merged

Canning apple cider and other juices #36747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6ab2e88
Merge pull request #9 from CleverRaven/master
Maleclypse Jan 2, 2020
13ffb8f
Merge pull request #10 from CleverRaven/master
Maleclypse Jan 6, 2020
ce11876
Added Juice canning recipes
Maleclypse Jan 6, 2020
c76e108
linting
Maleclypse Jan 6, 2020
a363c17
Update canned.json
Maleclypse Jan 6, 2020
ab523d2
Update canned.json
Maleclypse Jan 6, 2020
4aa2c95
Apple Cider reduce ingredients to pass test
Maleclypse Jan 19, 2020
382e3e8
cider ingredients reduction
Maleclypse Jan 19, 2020
142a17b
Update canned.json
Maleclypse Jan 19, 2020
d53c4e8
Update canned.json
Maleclypse Jan 19, 2020
0b9b189
Breaking canning and making into two steps
Maleclypse Jan 19, 2020
489cbc2
Revert "Breaking canning and making into two steps"
Maleclypse Jan 19, 2020
35aa4c5
corrected recipe component #s
Maleclypse Jan 19, 2020
de60941
Update canned.json
Maleclypse Jan 22, 2020
06b328c
Update data/json/recipes/food/canned.json
Maleclypse Jan 22, 2020
5c873ca
Update drink.json
Maleclypse Jan 22, 2020
8c71987
Book and learned levels
Maleclypse Jan 22, 2020
87e2066
Merge branch 'master' into Canning-Apple-Cider-and-other-juices
Maleclypse Jan 22, 2020
4a9c289
Update cooking.json
Maleclypse Jan 22, 2020
a9b2061
Merge branch 'Canning-Apple-Cider-and-other-juices' of https://github…
Maleclypse Jan 22, 2020
8b23bda
fixes and an itemgroup
Maleclypse Jan 22, 2020
468ff52
extraneous comma
Maleclypse Jan 22, 2020
d807a8a
Merge branch 'master' into Canning-Apple-Cider-and-other-juices
Maleclypse Jan 30, 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
3 changes: 3 additions & 0 deletions data/json/itemgroups/books.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@
[ "brewing_cookbook", 4 ],
[ "computer_science", 8 ],
[ "book_icef", 8 ],
[ "preserving_juice", 10 ],
{ "group": "magazines", "prob": 580 },
[ "atomic_survival", 1 ],
[ "recipe_augs", 4 ],
Expand Down Expand Up @@ -289,6 +290,7 @@
[ "manual_launcher", 1 ],
[ "recipe_bullets", 2 ],
[ "howto_traps", 10 ],
[ "preserving_juice", 10 ],
[ "manual_traps", 12 ]
]
},
Expand Down Expand Up @@ -428,6 +430,7 @@
"//": "Those rich mansion people have all sorts of weird books.",
"items": [
[ "offalcooking", 22 ],
[ "preserving_juice", 16 ],
{ "group": "novels", "prob": 370 },
{ "group": "literature", "prob": 100 },
[ "photo_album", 30 ],
Expand Down
8 changes: 8 additions & 0 deletions data/json/items/book/cooking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,14 @@
"time": "35 m",
"fun": -1
},
{
"id": "preserving_juice",
"type": "BOOK",
"name": { "str": "Drink the Harvest", "str_pl": "copies of Drink the Harvest" },
"description": "Canning foods doesn't have to stop with jam and pickles. This books provides a plethora of juices that can be preserved.",
"copy-from": "brewing_cookbook",
"//": "Later on add mead transforms that don't require distilling to this book that match the source book. Possibly wait til beekeeping is added."
},
{
"id": "offalcooking",
"type": "BOOK",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/drink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@
"symbol": "~",
"quench": 35,
"healthy": 2,
"calories": 123,
"calories": 108,
"description": "Freshly-squeezed from real oranges! Tasty and nutritious.",
"price": 90,
"material": "fruit",
Expand Down
246 changes: 238 additions & 8 deletions data/json/recipes/food/canned.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
"components": [
[ [ "water", 11 ], [ "water_clean", 11 ] ],
[ [ "jar_glass", 1 ] ],
[ [ "sweet_fruit", 4, "LIST" ] ],
[ [ "sweet_fruit", 3, "LIST" ] ],
[ [ "sugar", 20 ] ]
]
},
Expand Down Expand Up @@ -697,7 +697,7 @@
[ [ "canister_empty", 1 ], [ "can_food_unsealed", 1 ] ],
[ [ "scrap", 1 ] ],
[ [ "water", 1 ], [ "water_clean", 1 ] ],
[ [ "sweet_fruit", 2, "LIST" ] ],
[ [ "sweet_fruit", 1, "LIST" ] ],
[ [ "sugar", 15 ] ]
]
},
Expand Down Expand Up @@ -895,12 +895,7 @@
"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", 24, "LIST" ] ],
[ [ "sugar", 180 ] ]
]
"components": [ [ [ "water", 16 ], [ "water_clean", 16 ] ], [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 36, "LIST" ] ] ]
},
{
"type": "recipe",
Expand Down Expand Up @@ -1313,5 +1308,240 @@
],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ],
"components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "bone", 20 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
},
{
"type": "recipe",
"result": "apple_cider",
"id_suffix": "jarred",
"byproducts": [ [ "water", 10 ], [ "juice_pulp", 4 ] ],
"container": "jar_glass_sealed",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"skills_required": [ "mechanics", 1 ],
"difficulty": 4,
"time": "30 m",
"book_learn": [ [ "preserving_juice", 2 ] ],
"batch_time_factors": [ 80, 4 ],
"qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [ [ [ "jar_glass", 1 ] ], [ [ "irradiated_apple", 4 ], [ "apple", 4 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
},
{
"type": "recipe",
"result": "apple_cider",
"id_suffix": "canned",
"byproducts": [ [ "juice_pulp", 4 ] ],
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"difficulty": 4,
"time": "24 m",
"book_learn": [ [ "preserving_juice", 2 ] ],
"contained": true,
"batch_time_factors": [ 83, 5 ],
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_apple", 4 ], [ "apple", 4 ] ] ]
},
{
"type": "recipe",
"result": "apple_cider",
"id_suffix": "jarred_3l",
"byproducts": [ [ "water", 10 ], [ "juice_pulp", 24 ] ],
"container": "jar_3l_glass_sealed",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"skills_required": [ "mechanics", 1 ],
"difficulty": 4,
"time": "40 m",
"charges": 12,
"book_learn": [ [ "preserving_juice", 2 ] ],
"batch_time_factors": [ 80, 4 ],
"qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [
[ [ "jar_3l_glass", 1 ] ],
[ [ "irradiated_apple", 24 ], [ "apple", 24 ] ],
[ [ "water", 10 ], [ "water_clean", 10 ] ]
]
},
{
"type": "recipe",
"result": "oj",
"id_suffix": "jarred",
"byproducts": [ [ "water", 10 ], [ "juice_pulp", 4 ] ],
"container": "jar_glass_sealed",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"skills_required": [ "mechanics", 1 ],
"difficulty": 4,
"time": "30 m",
"charges": 2,
"book_learn": [ [ "preserving_juice", 2 ] ],
"batch_time_factors": [ 80, 4 ],
"qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [ [ [ "jar_glass", 1 ] ], [ [ "irradiated_orange", 4 ], [ "orange", 4 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
},
{
"type": "recipe",
"result": "oj",
"id_suffix": "canned",
"byproducts": [ [ "juice_pulp", 4 ] ],
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"difficulty": 4,
"time": "24 m",
"book_learn": [ [ "preserving_juice", 2 ] ],
"contained": true,
"batch_time_factors": [ 83, 5 ],
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_orange", 4 ], [ "orange", 4 ] ] ]
},
{
"type": "recipe",
"result": "oj",
"id_suffix": "jarred_3l",
"byproducts": [ [ "water", 10 ], [ "juice_pulp", 24 ] ],
"container": "jar_3l_glass_sealed",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"skills_required": [ "mechanics", 1 ],
"difficulty": 4,
"time": "40 m",
"charges": 12,
"book_learn": [ [ "preserving_juice", 2 ] ],
"batch_time_factors": [ 80, 4 ],
"qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [
[ [ "jar_3l_glass", 1 ] ],
[ [ "irradiated_orange", 24 ], [ "orange", 24 ] ],
[ [ "water", 10 ], [ "water_clean", 10 ] ]
]
},
{
"type": "recipe",
"result": "cranberry_juice",
"id_suffix": "jarred",
"byproducts": [ [ "water", 10 ], [ "juice_pulp", 4 ] ],
"container": "jar_glass_sealed",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"skills_required": [ "mechanics", 1 ],
"difficulty": 4,
"time": "30 m",
"charges": 2,
"book_learn": [ [ "preserving_juice", 2 ] ],
"batch_time_factors": [ 80, 4 ],
"qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [
[ [ "jar_glass", 1 ] ],
[ [ "irradiated_cranberries", 6 ], [ "cranberries", 6 ] ],
[ [ "water", 10 ], [ "water_clean", 10 ] ]
]
},
{
"type": "recipe",
"result": "cranberry_juice",
"id_suffix": "canned",
"byproducts": [ [ "juice_pulp", 4 ] ],
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"difficulty": 4,
"time": "24 m",
"book_learn": [ [ "preserving_juice", 2 ] ],
"contained": true,
"batch_time_factors": [ 83, 5 ],
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "irradiated_cranberries", 6 ], [ "cranberries", 6 ] ] ]
},
{
"type": "recipe",
"result": "cranberry_juice",
"id_suffix": "jarred_3l",
"byproducts": [ [ "water", 10 ], [ "juice_pulp", 24 ] ],
"container": "jar_3l_glass_sealed",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"skills_required": [ "mechanics", 1 ],
"difficulty": 4,
"time": "40 m",
"charges": 12,
"book_learn": [ [ "preserving_juice", 2 ] ],
"batch_time_factors": [ 80, 4 ],
"qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [
[ [ "jar_3l_glass", 1 ] ],
[ [ "irradiated_cranberries", 36 ], [ "cranberries", 36 ] ],
[ [ "water", 10 ], [ "water_clean", 10 ] ]
]
},
{
"type": "recipe",
"result": "juice",
"id_suffix": "jarred",
"byproducts": [ [ "water", 10 ], [ "juice_pulp", 2 ] ],
"container": "jar_glass_sealed",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"skills_required": [ "mechanics", 1 ],
"difficulty": 4,
"time": "30 m",
"charges": 2,
"book_learn": [ [ "preserving_juice", 2 ] ],
"batch_time_factors": [ 80, 4 ],
"qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [ [ [ "jar_glass", 1 ] ], [ [ "sweet_fruit", 2, "LIST" ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
},
{
"type": "recipe",
"result": "juice",
"id_suffix": "canned",
"byproducts": [ [ "juice_pulp", 2 ] ],
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"difficulty": 4,
"time": "24 m",
"book_learn": [ [ "preserving_juice", 2 ] ],
"contained": true,
"batch_time_factors": [ 83, 5 ],
"qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [ [ [ "can_medium_unsealed", 1 ] ], [ [ "scrap", 1 ] ], [ [ "sweet_fruit", 2, "LIST" ] ] ]
},
{
"type": "recipe",
"result": "juice",
"id_suffix": "jarred_3l",
"byproducts": [ [ "water", 10 ], [ "juice_pulp", 12 ] ],
"container": "jar_3l_glass_sealed",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"skills_required": [ "mechanics", 1 ],
"difficulty": 4,
"time": "40 m",
"charges": 12,
"book_learn": [ [ "preserving_juice", 2 ] ],
"batch_time_factors": [ 80, 4 ],
"qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
"tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ],
"components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "sweet_fruit", 12, "LIST" ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
}
]
2 changes: 1 addition & 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 @@ -1566,7 +1566,7 @@
{
"type": "recipe",
"result": "oj",
"byproducts": [ [ "juice_pulp" ] ],
"byproducts": [ [ "juice_pulp", 2 ] ],
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_DRINKS",
"skill_used": "cooking",
Expand Down