diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index aaa94dda5ead1..09ce4a409d392 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -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 ], @@ -289,6 +290,7 @@ [ "manual_launcher", 1 ], [ "recipe_bullets", 2 ], [ "howto_traps", 10 ], + [ "preserving_juice", 10 ], [ "manual_traps", 12 ] ] }, @@ -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 ], diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index c0c826d6ece6a..20b0692ab3d8e 100644 --- a/data/json/items/book/cooking.json +++ b/data/json/items/book/cooking.json @@ -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", diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index 883067dc81793..5b5618af62bc6 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -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", diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 4489ec7fd7407..2316f5df7ca58 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -366,7 +366,7 @@ "components": [ [ [ "water", 11 ], [ "water_clean", 11 ] ], [ [ "jar_glass", 1 ] ], - [ [ "sweet_fruit", 4, "LIST" ] ], + [ [ "sweet_fruit", 3, "LIST" ] ], [ [ "sugar", 20 ] ] ] }, @@ -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 ] ] ] }, @@ -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", @@ -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 ] ] ] } ] diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 5f6469ae8b576..74bd52ad2a37f 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -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",