From 9ad02d9eff200586e76b9409cb07adf0a67d9c89 Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Wed, 17 Feb 2021 23:47:51 -0800 Subject: [PATCH] Added Gelatin and Several Gelatin Based Recipes (#47080) --- data/json/itemgroups/Food/food.json | 9 +- data/json/itemgroups/SUS/fridges.json | 7 + .../json/itemgroups/collections_domestic.json | 2 + data/json/items/comestibles/junkfood.json | 129 ++++++++++++ data/json/items/comestibles/other.json | 83 ++++++++ data/json/recipes/food/dry.json | 14 ++ data/json/recipes/food/other.json | 197 ++++++++++++++++++ data/json/recipes/recipe_food.json | 9 +- .../json/requirements/cooking_components.json | 33 +++ 9 files changed, 479 insertions(+), 4 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 99d9cf752b614..a3b1cfab1acbc 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -46,7 +46,10 @@ { "item": "dry_beans", "prob": 40 }, { "item": "dry_lentils", "prob": 30 }, { "item": "dry_rice", "prob": 40 }, - { "item": "freeze_dried_meal", "prob": 10 } + { "item": "freeze_dried_meal", "prob": 10 }, + { "item": "gelatin_powder", "prob": 40 }, + { "item": "chem_agar", "prob": 15 }, + { "item": "gelatin_dessert_powder", "prob": 40 } ] }, { @@ -426,6 +429,7 @@ { "item": "candy", "prob": 70 }, { "item": "candy2", "prob": 70 }, { "item": "candy3", "prob": 70 }, + { "item": "candy4", "prob": 70 }, { "item": "cow_candy", "prob": 20 }, { "item": "maltballs", "prob": 60 }, { "item": "mintpatties", "prob": 60 }, @@ -553,7 +557,8 @@ { "item": "pie", "prob": 20 }, { "item": "pie_veggy", "prob": 18 }, { "item": "pie_meat", "prob": 18 }, - { "item": "pie_maple", "prob": 9 } + { "item": "pie_maple", "prob": 9 }, + { "item": "gelatin_dessert_processed", "prob": 40 } ] }, { diff --git a/data/json/itemgroups/SUS/fridges.json b/data/json/itemgroups/SUS/fridges.json index d99955ed69801..75a7f9e8b6fe8 100644 --- a/data/json/itemgroups/SUS/fridges.json +++ b/data/json/itemgroups/SUS/fridges.json @@ -39,6 +39,8 @@ { "item": "yoghurt", "prob": 80 }, { "item": "butter", "prob": 80 }, { "item": "pudding", "prob": 30 }, + { "item": "gelatin_dessert_processed", "prob": 20 }, + { "item": "egg_bird_unfert", "prob": 85, "count-min": 1, "count-max": 12 }, { "item": "egg_bird_unfert", "prob": 85, "charges-min": 1, "charges-max": 12, "container-item": "carton_egg" }, { "item": "bacon", "prob": 25 }, { @@ -520,6 +522,8 @@ { "item": "onion_rings", "charges-min": 1, "prob": 10 }, { "item": "pizza_veggy", "charges-min": 1, "prob": 20 }, { "item": "nachosv", "charges-min": 1, "prob": 20 }, + { "item": "gelatin_dessert_vegan", "prob": 30 }, + { "item": "gelatin_dessert_vegan_fruit", "prob": 30 }, { "distribution": [ { @@ -623,6 +627,8 @@ { "item": "yoghurt", "prob": 20 }, { "item": "butter", "prob": 20 }, { "item": "pudding", "prob": 20 }, + { "item": "gelatin_dessert_processed", "prob": 10 }, + { "item": "egg_bird_unfert", "prob": 20, "count-min": 1, "count-max": 12 }, { "item": "egg_bird_unfert", "prob": 20, "charges-min": 1, "charges-max": 12, "container-item": "carton_egg" }, { "item": "bacon", "prob": 25 }, { @@ -880,6 +886,7 @@ { "item": "yoghurt", "count": [ 1, 3 ], "prob": 75 }, { "item": "butter", "prob": 50 }, { "item": "pudding", "prob": 30 }, + { "item": "gelatin_dessert_processed", "prob": 10 }, { "item": "veggy_salad", "charges-min": 1, "prob": 19 }, { "item": "blt", "charges-min": 1, "prob": 13 }, { "item": "protein_shake", "charges-min": 1, "prob": 6 }, diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index 428fa249a7c5e..cf4dc12db2eeb 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -564,6 +564,7 @@ { "item": "noodles_fast", "prob": 30 }, { "item": "ravioli", "prob": 25 }, { "item": "sauce_red", "prob": 20 }, + { "item": "gelatin_dessert_powder", "prob": 20 }, { "item": "sauce_pesto", "prob": 15 }, { "item": "bread", "prob": 14 }, { "item": "cornbread", "prob": 7 }, @@ -579,6 +580,7 @@ { "item": "can_cheese", "prob": 8 }, { "item": "yoghurt", "prob": 8 }, { "item": "pudding", "prob": 10 }, + { "item": "gelatin_dessert_processed", "prob": 10 }, { "item": "veggy_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" }, { "item": "sauerkraut", "prob": 5, "charges": 4, "container-item": "jar_glass_sealed" }, { "item": "meat_pickled", "prob": 4, "charges": 2, "container-item": "jar_glass_sealed" }, diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index ba0922582c693..4831417945a6c 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -317,6 +317,48 @@ "charges": 3, "fun": 3 }, + { + "type": "COMESTIBLE", + "id": "candy4", + "name": { "str_sp": "gummy candy" }, + "weight": "46 g", + "color": "yellow", + "spoils_in": "360 days", + "container": "bag_plastic", + "comestible_type": "FOOD", + "symbol": "%", + "healthy": -1, + "calories": 85, + "description": "A handful of colorful fruit and soda pop flavored gummy candies.", + "price": 180, + "price_postapoc": 200, + "material": [ "junk", "flesh" ], + "volume": "90 ml", + "flags": [ "EDIBLE_FROZEN" ], + "charges": 3, + "fun": 5 + }, + { + "type": "COMESTIBLE", + "id": "candy5", + "name": { "str_sp": "gummy candy" }, + "weight": "46 g", + "color": "light_green", + "spoils_in": "360 days", + "container": "bag_plastic", + "comestible_type": "FOOD", + "symbol": "%", + "healthy": -1, + "calories": 85, + "description": "A handful of colorful fruit and soda pop flavored vegan gummy candies made from agar. They have kind of a strange texture, but they're still tasty.", + "price": 180, + "price_postapoc": 200, + "material": [ "junk", "veggy" ], + "volume": "90 ml", + "flags": [ "EDIBLE_FROZEN" ], + "charges": 3, + "fun": 4 + }, { "type": "COMESTIBLE", "id": "candy3gator", @@ -1290,5 +1332,92 @@ "flags": [ "EATEN_HOT" ], "vitamins": [ [ "vitA", 3 ], [ "iron", 10 ] ], "fun": 4 + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_powder", + "name": "gelatin dessert powder", + "weight": "175 g", + "color": "white", + "spoils_in": "1461 days", + "container": "box_small", + "comestible_type": "FOOD", + "symbol": "%", + "quench": -8, + "calories": 400, + "description": "A small box of gelatin dessert powder. Just add water and set. Comes in a variety of flavors.", + "price": 5, + "price_postapoc": 10, + "material": [ "flesh", "junk" ], + "volume": "250ml", + "flags": [ "EATEN_COLD" ], + "fun": -2 + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_base", + "name": "unflavored gelatin dessert", + "weight": "232 g", + "color": "white", + "spoils_in": "7 days 12 hours", + "container": "cup_plastic", + "comestible_type": "FOOD", + "symbol": "%", + "calories": 100, + "description": "An unflavored jiggly, sugary treat made from gelatin and sugar. This would taste better with some flavor.", + "price": 210, + "price_postapoc": 250, + "material": [ "flesh", "junk" ], + "volume": "250 ml", + "phase": "solid", + "fun": 5 + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_processed", + "name": "processed gelatin dessert", + "description": "A jiggly, sugary treat made from gelatin and sugar. Comes in a variety of flavors. A kid favorite pre-Cataclysm.", + "fun": 20, + "copy-from": "gelatin_dessert_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_homemade", + "name": "homemade gelatin dessert", + "color": "light_red", + "description": "A homemade jiggly, sugary treat made from gelatin and sugar flavored with fruit juice. A kid favorite pre-Cataclysm.", + "fun": 25, + "copy-from": "gelatin_dessert_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_fruit", + "name": "fruit filled gelatin dessert", + "color": "light_red", + "description": "A jiggly, sugary treat made from gelatin and sugar flavored with fruit juice and set with fruit. A kid favorite pre-Cataclysm and a healthy treat", + "fun": 20, + "healthy": 1, + "copy-from": "gelatin_dessert_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_vegan", + "name": "vegan gelatin dessert", + "color": "light_green", + "description": "A vegan friendly homemade jiggly, sugary treat made from agar and sugar flavored with fruit juice. A kid favorite pre-Cataclysm. They'll never know the difference.", + "fun": 20, + "material": [ "veggy", "junk" ], + "copy-from": "gelatin_dessert_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_vegan_fruit", + "name": "fruit filled vegan gelatin dessert", + "color": "light_green", + "description": "A vegan friendly jiggly, sugary treat made from agar and sugar flavored with fruit juice and set with fruit. A kid favorite pre-Cataclysm and a healthy treat", + "fun": 15, + "material": [ "veggy", "junk" ], + "healthy": 1, + "copy-from": "gelatin_dessert_base" } ] diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index e17fdd5481181..7fff34d328366 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -188,6 +188,50 @@ "charges": 4, "fun": -10 }, + { + "type": "COMESTIBLE", + "id": "gelatin_powder", + "name": { "str_sp": "powdered gelatin" }, + "weight": "11 g", + "color": "yellow", + "container": "bag_plastic", + "comestible_type": "FOOD", + "symbol": "%", + "quench": -1, + "calories": 6, + "description": "Dried and powdered gelatin, used as a gelling agent when mixed with water.", + "price": 150, + "price_postapoc": 50, + "material": "powder", + "volume": "250 ml", + "flags": [ "EDIBLE_FROZEN" ], + "charges": 25, + "fun": -10 + }, + { + "type": "COMESTIBLE", + "id": "gelatin_fresh", + "name": { "str_sp": "fresh gelatin" }, + "conditional_names": [ + { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "abomination %s" } }, + { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "amoral %s" } }, + { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "Orwell's %s" } } + ], + "weight": "25 g", + "color": "yellow", + "spoils_in": "7 days", + "comestible_type": "FOOD", + "symbol": "%", + "calories": 6, + "//": "Same as the meat it's been made from. It's additional ingredient compared to smoking, jerking, and dehydrating, so there's no incentive otherwise.", + "description": "Fresh ", + "price": 150, + "price_postapoc": 50, + "material": [ "flesh" ], + "volume": "250 ml", + "vitamins": [ [ "vitA", 10 ], [ "vitC", 15 ], [ "calcium", 2 ], [ "iron", 8 ] ], + "flags": [ "EATEN_COLD", "FREEZERBURN" ] + }, { "type": "COMESTIBLE", "id": "meal_bone_tainted", @@ -868,5 +912,44 @@ "price_postapoc": 200, "freezing_point": -459, "description": "A small packet of commercial instant coffee powder. No creamer or sweetener added." + }, + { + "type": "COMESTIBLE", + "id": "acid_soaked_hide", + "name": "acid soaked hide", + "description": "Raw hide soaking in a dilute acid solution to extract collagen. After 24 hours the solution can be strained to extract fresh gelatin.", + "weight": "500 g", + "color": "yellow", + "sealed": false, + "symbol": "~", + "calories": 9, + "quench": 6, + "fun": -10, + "price": 0, + "volume": "10L", + "price_postapoc": 10, + "phase": "liquid", + "comestible_type": "DRINK", + "flags": [ "NUTRIENT_OVERRIDE" ], + "brewable": { "time": "24 hours", "results": [ "gelatin_extracted" ] } + }, + { + "type": "COMESTIBLE", + "id": "gelatin_extracted", + "name": "extracted gelatin", + "description": "Freshly extracted gelatin in a dilute acid solution. It needs to be strained to separate the gelatin from the acid.", + "weight": "500 g", + "color": "yellow", + "sealed": false, + "symbol": "~", + "calories": 9, + "quench": 6, + "fun": -10, + "price": 0, + "volume": "10L", + "price_postapoc": 10, + "phase": "liquid", + "comestible_type": "DRINK", + "flags": [ "NUTRIENT_OVERRIDE" ] } ] diff --git a/data/json/recipes/food/dry.json b/data/json/recipes/food/dry.json index 0fedb62d4ee58..91593ee23709f 100644 --- a/data/json/recipes/food/dry.json +++ b/data/json/recipes/food/dry.json @@ -396,5 +396,19 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ], [ [ "surface_heat", 5, "LIST" ] ] ], "components": [ [ [ "raw_lentils", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_powder", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_DRY", + "skill_used": "cooking", + "difficulty": 2, + "time": "18 m", + "autolearn": true, + "batch_time_factors": [ 67, 5 ], + "tools": [ [ [ "dehydrator", 25 ], [ "char_smoker", 25 ] ] ], + "components": [ [ [ "gelatin_fresh", 1 ] ] ] } ] diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index f7f915c4fd061..11602abce0cf8 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -42,5 +42,202 @@ "time": "15 m", "charges": 2, "components": [ [ [ "water_clean", 1 ] ], [ [ "freeze_dried_meal", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "acid_soaked_hide", + "result_mult": 1, + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 3, + "time": "8 m", + "batch_time_factors": [ 50, 4 ], + "book_learn": [ [ "textbook_chemistry", 3 ], [ "adv_chemistry", 3 ] ], + "components": [ + [ [ "formic_acid", 10 ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ], + [ [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ], [ "raw_hleather", 1 ], [ "raw_demihumanleather", 1 ] ] + ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "gelatin_fresh", + "byproducts": [ [ "formic_acid" ], [ "ruined_chunks" ] ], + "result_mult": 12, + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 2, + "time": "120 m", + "batch_time_factors": [ 90, 1 ], + "charges": 1, + "autolearn": true, + "tools": [ [ "colander_steel" ] ], + "components": [ [ [ "gelatin_extracted", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_dessert_processed", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "60 m", + "batch_time_factors": [ 20, 1 ], + "charges": 5, + "autolearn": true, + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "gelatin_dessert_powder", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_dessert_base", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "60 m", + "batch_time_factors": [ 20, 1 ], + "charges": 5, + "autolearn": true, + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "gelatin_powder", 10 ], [ "gelatin_fresh", 1 ] ], [ [ "sugar", 20 ] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_dessert_homemade", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "60 m", + "batch_time_factors": [ 20, 1 ], + "charges": 5, + "book_learn": [ [ "sweets_book", 1 ], [ "baking_book", 1 ], [ "mag_cooking", 3 ], [ "family_cookbook", 3 ] ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], + [ [ "gelatin_powder", 5 ], [ "gelatin_fresh", 1 ] ], + [ [ "sugar", 20 ] ], + [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] + ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_dessert_fruit", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "60 m", + "batch_time_factors": [ 20, 1 ], + "charges": 5, + "book_learn": [ [ "sweets_book", 1 ], [ "baking_book", 1 ], [ "mag_cooking", 3 ], [ "family_cookbook", 3 ] ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], + [ [ "gelatin_powder", 5 ], [ "gelatin_fresh", 1 ] ], + [ [ "sugar", 10 ] ], + [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ], + [ [ "sweet_fruit", 1, "LIST" ] ] + ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_dessert_vegan", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "60 m", + "batch_time_factors": [ 20, 1 ], + "charges": 5, + "book_learn": [ [ "sweets_book", 1 ], [ "baking_book", 1 ], [ "mag_cooking", 1 ], [ "family_cookbook", 1 ] ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], + [ [ "chem_agar", 5 ] ], + [ [ "sugar", 20 ] ], + [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] + ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_dessert_vegan_fruit", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "60 m", + "batch_time_factors": [ 20, 1 ], + "charges": 5, + "book_learn": [ [ "sweets_book", 1 ], [ "baking_book", 1 ], [ "mag_cooking", 1 ], [ "family_cookbook", 1 ] ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], + [ [ "chem_agar", 5 ] ], + [ [ "sugar", 20 ] ], + [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ], + [ [ "sweet_fruit", 1, "LIST" ] ] + ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "candy4", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 2, + "time": "60 m", + "batch_time_factors": [ 20, 1 ], + "charges": 12, + "book_learn": [ [ "sweets_book", 2 ], [ "baking_book", 2 ], [ "family_cookbook", 2 ] ], + "qualities": [ { "id": "BOIL", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ], [ [ "mold_plastic", 1 ] ] ], + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], + [ [ "beet_syrup", 1 ] ], + [ [ "gelatin_powder", 25 ], [ "gelatin_fresh", 2 ] ], + [ [ "sugar", 50 ] ], + [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] + ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "candy5", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 2, + "time": "60 m", + "batch_time_factors": [ 20, 1 ], + "charges": 12, + "book_learn": [ [ "sweets_book", 2 ], [ "baking_book", 2 ], [ "family_cookbook", 2 ] ], + "qualities": [ { "id": "BOIL", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ], [ [ "mold_plastic", 1 ] ] ], + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], + [ [ "beet_syrup", 1 ] ], + [ [ "chem_agar", 25 ] ], + [ [ "sugar", 50 ] ], + [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] + ] } ] diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 7a36e0ed04bfc..607b12345d3d4 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -2284,7 +2284,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "broth_bone", 1 ] ], + [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ], [ "chem_agar", 25 ] ], [ [ "meat_red", 1, "LIST" ], [ "meat_cooked", 1 ], @@ -2315,7 +2315,11 @@ "batch_time_factors": [ 50, 5 ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], - "components": [ [ [ "broth_bone", 1 ] ], [ [ "veggy_any", 4, "LIST" ] ], [ [ "water_clean", 2 ], [ "water", 2 ] ] ] + "components": [ + [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ], [ "chem_agar", 25 ] ], + [ [ "veggy_any", 4, "LIST" ] ], + [ [ "water_clean", 1 ], [ "water", 1 ] ] + ] }, { "type": "recipe", @@ -2470,6 +2474,7 @@ "type": "recipe", "activity_level": "NO_EXERCISE", "result": "broth_bone", + "byproducts": [ [ "gelatin_fresh" ] ], "charges": 1, "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 296049cfb5ae5..3068d9ff991ba 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -831,5 +831,38 @@ [ "mixed_alcohol_weak", 1 ] ] ] + }, + { + "id": "soda_pop", + "type": "requirement", + "//": "Soda's and such. Anything carbonated that isn't alcholic or an energy drink.", + "components": [ + [ + [ "cola", 1 ], + [ "creamsoda", 1 ], + [ "crispycran", 1 ], + [ "lemonlime", 1 ], + [ "orangesoda", 1 ], + [ "purple_drink", 1 ], + [ "rootbeer", 1 ], + [ "spezi", 1 ] + ] + ] + }, + { + "id": "sweet_juice", + "type": "requirement", + "//": "Non-carbonated, sweet fruit based drinks.", + "components": [ + [ + [ "oj", 1 ], + [ "lemonade", 1 ], + [ "apple_cider", 1 ], + [ "cranberry_juice", 1 ], + [ "juice", 1 ], + [ "juice_pasteurized", 1 ], + [ "kompot", 1 ] + ] + ] } ]