From f666ed1166c5a71023eee5a3ac1b4c0dc033c785 Mon Sep 17 00:00:00 2001 From: grawprog Date: Tue, 26 Jan 2021 21:04:10 -0800 Subject: [PATCH 01/20] added gelatin items and recipes to craft them, added 4 flavors of gelatin dessert and gelatin dessert powder items and the recipe to craft them, modified bone broth and aspic recipes, added new items to relevant item groups. --- data/json/itemgroups/Food/food.json | 13 +- data/json/itemgroups/SUS/fridges.json | 12 ++ .../json/itemgroups/collections_domestic.json | 8 + data/json/items/comestibles/brewing.json | 41 +++++ data/json/items/comestibles/junkfood.json | 147 ++++++++++++++++++ data/json/items/comestibles/other.json | 45 ++++++ data/json/recipes/food/brewing.json | 20 +++ data/json/recipes/food/dry.json | 14 ++ data/json/recipes/food/other.json | 142 +++++++++++++++++ data/json/recipes/recipe_food.json | 7 +- 10 files changed, 445 insertions(+), 4 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 3e4fde1b0a849..93416ea60416a 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -46,7 +46,11 @@ { "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_dessert_powder_cherry", "prob": 40 }, + { "item": "gelatin_dessert_powder_lime", "prob": 40 }, + { "item": "gelatin_dessert_powder_grape", "prob": 40 }, + { "item": "gelatin_dessert_powder_raspberry", "prob": 40 } ] }, { @@ -426,6 +430,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 +558,11 @@ { "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_cherry", "prob": 40 }, + { "item": "gelatin_dessert_lime", "prob": 40 }, + { "item": "gelatin_dessert_grape", "prob": 40 }, + { "item": "gelatin_dessert_raspberry", "prob": 40 } ] }, { diff --git a/data/json/itemgroups/SUS/fridges.json b/data/json/itemgroups/SUS/fridges.json index 21f6f7e79d02a..15a6320e38520 100644 --- a/data/json/itemgroups/SUS/fridges.json +++ b/data/json/itemgroups/SUS/fridges.json @@ -39,6 +39,10 @@ { "item": "yoghurt", "prob": 80 }, { "item": "butter", "prob": 80 }, { "item": "pudding", "prob": 30 }, + { "item": "gelatin_dessert_cherry", "prob": 20 }, + { "item": "gelatin_dessert_lime", "prob": 20 }, + { "item": "gelatin_dessert_grape", "prob": 20 }, + { "item": "gelatin_dessert_raspberry", "prob": 20 }, { "item": "egg_bird_unfert", "prob": 85, "count-min": 1, "count-max": 12 }, { "item": "bacon", "prob": 25 }, { @@ -623,6 +627,10 @@ { "item": "yoghurt", "prob": 20 }, { "item": "butter", "prob": 20 }, { "item": "pudding", "prob": 20 }, + { "item": "gelatin_dessert_cherry", "prob": 10 }, + { "item": "gelatin_dessert_lime", "prob": 10 }, + { "item": "gelatin_dessert_grape", "prob": 10 }, + { "item": "gelatin_dessert_raspberry", "prob": 10 }, { "item": "egg_bird_unfert", "prob": 20, "count-min": 1, "count-max": 12 }, { "item": "bacon", "prob": 25 }, { @@ -880,6 +888,10 @@ { "item": "yoghurt", "count": [ 1, 3 ], "prob": 75 }, { "item": "butter", "prob": 50 }, { "item": "pudding", "prob": 30 }, + { "item": "gelatin_dessert_cherry", "prob": 10 }, + { "item": "gelatin_dessert_lime", "prob": 10 }, + { "item": "gelatin_dessert_grape", "prob": 10 }, + { "item": "gelatin_dessert_raspberry", "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 c299139caf80e..554566b0a3e50 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -564,6 +564,10 @@ { "item": "noodles_fast", "prob": 30 }, { "item": "ravioli", "prob": 25 }, { "item": "sauce_red", "prob": 20 }, + { "item": "gelatin_dessert_powder_cherry", "prob": 20 }, + { "item": "gelatin_dessert_powder_lime", "prob": 20 }, + { "item": "gelatin_dessert_powder_grape", "prob": 20 }, + { "item": "gelatin_dessert_powder_raspberry", "prob": 20 }, { "item": "sauce_pesto", "prob": 15 }, { "item": "bread", "prob": 14 }, { "item": "cornbread", "prob": 7 }, @@ -579,6 +583,10 @@ { "item": "can_cheese", "prob": 8 }, { "item": "yoghurt", "prob": 8 }, { "item": "pudding", "prob": 10 }, + { "item": "gelatin_dessert_cherry", "prob": 10 }, + { "item": "gelatin_dessert_lime", "prob": 10 }, + { "item": "gelatin_dessert_grape", "prob": 10 }, + { "item": "gelatin_dessert_raspberry", "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/brewing.json b/data/json/items/comestibles/brewing.json index 9eefe55378a3f..d1e166ddf17d7 100644 --- a/data/json/items/comestibles/brewing.json +++ b/data/json/items/comestibles/brewing.json @@ -450,5 +450,46 @@ "comestible_type": "DRINK", "flags": [ "NUTRIENT_OVERRIDE" ], "brewable": { "time": "3 days", "results": [ "yeast" ] } + }, + { + "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", + "container": "bucket", + "sealed": false, + "symbol": "~", + "calories": 9, + "quench": 6, + "fun": -10, + "price": 0, + "volume": "3L", + "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", + "container": "bucket", + "sealed": false, + "symbol": "~", + "calories": 9, + "quench": 6, + "fun": -10, + "price": 0, + "volume": "3L", + "price_postapoc": 10, + "phase": "liquid", + "comestible_type": "DRINK", + "flags": [ "NUTRIENT_OVERRIDE" ] } ] diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index ff6f1167254be..c4108a53b261a 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -316,6 +316,27 @@ "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-flavored gummy candies.", + "price": 180, + "price_postapoc": 200, + "material": [ "junk" ], + "volume": "90 ml", + "flags": [ "EDIBLE_FROZEN" ], + "charges": 3, + "fun": 5 + }, { "type": "COMESTIBLE", "id": "candy3gator", @@ -1288,5 +1309,131 @@ "flags": [ "EATEN_HOT" ], "vitamins": [ [ "vitA", 3 ], [ "iron", 10 ] ], "fun": 4 + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_powder_base", + "name": "gelatin dessert powder", + "weight": "175 g", + "color": "white", + "spoils_in": "1461 days", + "container": "box_small", + "comestible_type": "FOOD", + "symbol": "%", + "quench": -8, + "calories": 20, + "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_powder_cherry", + "name": "cherry gelatin dessert powder", + "color": "red", + "description": "A small box of cherry gelatin dessert powder. Just add water and set.", + "copy-from": "gelatin_dessert_powder_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_powder_lime", + "name": "lime gelatin dessert powder", + "color": "light_green", + "description": "A small box of lime gelatin dessert powder. Just add water and set.", + "copy-from": "gelatin_dessert_powder_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_powder_grape", + "name": "grape gelatin dessert powder", + "color": "magenta", + "description": "A small box of grape gelatin dessert powder. Just add water and set.", + "copy-from": "gelatin_dessert_powder_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_powder_raspberry", + "name": "blue raspberry gelatin dessert powder", + "color": "cyan", + "description": "A small box of blue raspberry gelatin dessert powder. Just add water and set.", + "copy-from": "gelatin_dessert_powder_base" + }, + { + "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, + "volume": "250 ml", + "phase": "solid", + "fun": 5 + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_cherry", + "name": "cherry gelatin dessert", + "color": "red", + "description": "A cherry flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.", + "fun": 20, + "copy-from": "gelatin_dessert_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_lime", + "name": "lime gelatin dessert", + "color": "light_green", + "description": "A lime flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.", + "fun": 20, + "copy-from": "gelatin_dessert_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_grape", + "name": "grape gelatin dessert", + "color": "magenta", + "description": "A grape flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.", + "fun": 20, + "copy-from": "gelatin_dessert_base" + }, + { + "type": "COMESTIBLE", + "id": "gelatin_dessert_raspberry", + "name": "blue raspberry gelatin dessert", + "color": "cyan", + "description": "A blue raspberry flavored jiggly, sugary treat made from gelatin and sugar. 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_powder_base" } + ] diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 2be0be56898b6..bbe7946fb44b7 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -171,6 +171,7 @@ "charges": 25, "fun": -10 }, + { "type": "COMESTIBLE", "id": "meal_bone", @@ -188,6 +189,50 @@ "charges": 4, "fun": -10 }, + { + "type": "COMESTIBLE", + "id": "gelatin_powder", + "name": { "str": "powdered gelatin", "str_pl": "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": "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", diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index 72b89bd2c0754..2797747813786 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -308,5 +308,25 @@ [ "wild_herbs", 40 ] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "acid_soaked_hide", + "result_mult": 1, + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_BREW", + "skill_used": "cooking", + "difficulty": 3, + "time": "8 m", + "batch_time_factors": [ 50, 4 ], + "book_learn": [ [ "vinegar_maker", 1 ], [ "winemaking_beginner", 3 ] ], + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ + [ [ "chem_acetic_acid", 2 ]], + [ + [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ], [ "raw_hleather", 1 ], [ "raw_demihumanleather", 1 ] + ] + ] } ] diff --git a/data/json/recipes/food/dry.json b/data/json/recipes/food/dry.json index 9f3aaeda112b1..d5b040db38322 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..6cedd18ac1d25 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -42,5 +42,147 @@ "time": "15 m", "charges": 2, "components": [ [ [ "water_clean", 1 ] ], [ [ "freeze_dried_meal", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "gelatin_fresh", + "byproducts": [ [ "chem_acetic_acid" ],["ruined_chunks"] ], + "result_mult": 12, + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 2, + "time": "2 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_cherry", + "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 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ],[ ["gelatin_dessert_powder_cherry", 1] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_dessert_lime", + "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 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ],[ ["gelatin_dessert_powder_lime", 1] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_dessert_grape", + "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 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ],[ ["gelatin_dessert_powder_grape", 1] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "gelatin_dessert_raspberry", + "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 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ],[ ["gelatin_dessert_powder_raspberry", 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 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ ["gelatin_powder", 25], ["gelatin_fresh", 1] ], [ ["sugar", 100] ] ] + }, + { + "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, + "autolearn": true, + "qualities": [ { "id": "BOIL", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": + [ + [ [ "water", 1 ], [ "water_clean", 1 ] ], + [ ["gelatin_powder", 25], ["gelatin_fresh", 1] ], + [ ["sugar", 100]] , + [ [ "oj", 1 ], [ "lemonade", 1 ], [ "apple_cider", 1 ], [ "cranberry_juice", 1 ], [ "juice", 1 ] ] + ] + }, + { + "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, + "autolearn": true, + "qualities": [ { "id": "BOIL", "level": 1 } ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], + "components": + [ + [ [ "water", 1 ], [ "water_clean", 1 ] ], + [ ["gelatin_powder", 25], ["gelatin_fresh", 1] ], + [ ["sugar", 100] ], + [ [ "oj", 1 ], [ "lemonade", 1 ], [ "apple_cider", 1 ], [ "cranberry_juice", 1 ], [ "juice", 1 ] ], + [ ["sweet_fruit", 1, "LIST" ] ] + ] } ] diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 68114d8bfc143..f775f68dcab45 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -2269,7 +2269,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "broth_bone", 1 ] ], + [ ["gelatin_fresh", 1], ["gelatin_powder", 25] ], [ [ "meat_red", 1, "LIST" ], [ "meat_cooked", 1 ], @@ -2300,7 +2300,9 @@ "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] ], + [ [ "veggy_any", 4, "LIST" ] ], [ [ "water_clean", 1 ], [ "water", 1 ] ] + ] }, { "type": "recipe", @@ -2461,6 +2463,7 @@ "type": "recipe", "activity_level": "NO_EXERCISE", "result": "broth_bone", + "byproducts": [ [ "gelatin_fresh" ] ], "charges": 1, "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", From 76e01956df7f9ce0c6d134daeea4a8e2f6f896e5 Mon Sep 17 00:00:00 2001 From: grawprog Date: Wed, 27 Jan 2021 20:50:49 -0800 Subject: [PATCH 02/20] Finished recipes for gelatin and gummy candies. Added Vegan variants using agar. Added agar to dry foods itemgroupc added vegan gelatin dessert to SUS vegan fridge. Tweaked recipes to make them better. --- data/json/itemgroups/Food/food.json | 2 + data/json/itemgroups/SUS/fridges.json | 8 +- data/json/items/comestibles/brewing.json | 41 ----- data/json/items/comestibles/junkfood.json | 54 +++++- data/json/items/comestibles/other.json | 40 ++++- data/json/recipes/food/brewing.json | 20 --- data/json/recipes/food/other.json | 163 ++++++++++++++---- data/json/recipes/recipe_food.json | 8 +- .../json/requirements/cooking_components.json | 34 ++++ 9 files changed, 263 insertions(+), 107 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index e908bd8b8c395..7712112969ebb 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -47,6 +47,8 @@ { "item": "dry_lentils", "prob": 30 }, { "item": "dry_rice", "prob": 40 }, { "item": "freeze_dried_meal", "prob": 10 }, + { "item": "gelatin_powder", "prob": 40 }, + { "item": "chem_agar", "prob": 15 }, { "item": "gelatin_dessert_powder_cherry", "prob": 40 }, { "item": "gelatin_dessert_powder_lime", "prob": 40 }, { "item": "gelatin_dessert_powder_grape", "prob": 40 }, diff --git a/data/json/itemgroups/SUS/fridges.json b/data/json/itemgroups/SUS/fridges.json index 9dbabea2740ee..f34c87a0f5752 100644 --- a/data/json/itemgroups/SUS/fridges.json +++ b/data/json/itemgroups/SUS/fridges.json @@ -39,15 +39,12 @@ { "item": "yoghurt", "prob": 80 }, { "item": "butter", "prob": 80 }, { "item": "pudding", "prob": 30 }, -<<<<<<< HEAD { "item": "gelatin_dessert_cherry", "prob": 20 }, { "item": "gelatin_dessert_lime", "prob": 20 }, { "item": "gelatin_dessert_grape", "prob": 20 }, { "item": "gelatin_dessert_raspberry", "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" }, ->>>>>>> 854f10d0c1df776ffc58bc81914675643511374c { "item": "bacon", "prob": 25 }, { "distribution": [ { "item": "lunchmeat", "prob": 60 }, { "item": "bologna", "prob": 40 }, { "item": "tofu", "prob": 30 } ], @@ -528,6 +525,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": [ { @@ -631,15 +630,12 @@ { "item": "yoghurt", "prob": 20 }, { "item": "butter", "prob": 20 }, { "item": "pudding", "prob": 20 }, -<<<<<<< HEAD { "item": "gelatin_dessert_cherry", "prob": 10 }, { "item": "gelatin_dessert_lime", "prob": 10 }, { "item": "gelatin_dessert_grape", "prob": 10 }, { "item": "gelatin_dessert_raspberry", "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" }, ->>>>>>> 854f10d0c1df776ffc58bc81914675643511374c { "item": "bacon", "prob": 25 }, { "distribution": [ { "item": "lunchmeat", "prob": 60 }, { "item": "bologna", "prob": 40 }, { "item": "tofu", "prob": 30 } ], diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json index 40d5b1d17ac98..5ed9904171f38 100644 --- a/data/json/items/comestibles/brewing.json +++ b/data/json/items/comestibles/brewing.json @@ -450,46 +450,5 @@ "comestible_type": "DRINK", "flags": [ "NUTRIENT_OVERRIDE" ], "brewable": { "time": "3 days", "results": [ "yeast" ] } - }, - { - "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", - "container": "bucket", - "sealed": false, - "symbol": "~", - "calories": 9, - "quench": 6, - "fun": -10, - "price": 0, - "volume": "3L", - "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", - "container": "bucket", - "sealed": false, - "symbol": "~", - "calories": 9, - "quench": 6, - "fun": -10, - "price": 0, - "volume": "3L", - "price_postapoc": 10, - "phase": "liquid", - "comestible_type": "DRINK", - "flags": [ "NUTRIENT_OVERRIDE" ] } ] diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 61ec46fdc4921..58efc0674cbe3 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -328,15 +328,36 @@ "symbol": "%", "healthy": -1, "calories": 85, - "description": "A handful of colorful fruit-flavored gummy candies.", + "description": "A handful of colorful fruit and soda pop flavored gummy candies.", "price": 180, "price_postapoc": 200, - "material": [ "junk" ], + "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", @@ -1376,9 +1397,10 @@ "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 + "fun": 5 }, { "type": "COMESTIBLE", @@ -1386,7 +1408,7 @@ "name": "cherry gelatin dessert", "color": "red", "description": "A cherry flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.", - "fun": 20, + "fun": 20, "copy-from": "gelatin_dessert_base" }, { @@ -1433,7 +1455,27 @@ "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_powder_base" + "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 5656f37e159ae..0e29d78d22f2b 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -171,7 +171,6 @@ "charges": 25, "fun": -10 }, - { "type": "COMESTIBLE", "id": "meal_bone", @@ -911,5 +910,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/brewing.json b/data/json/recipes/food/brewing.json index 2797747813786..72b89bd2c0754 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -308,25 +308,5 @@ [ "wild_herbs", 40 ] ] ] - }, - { - "type": "recipe", - "activity_level": "NO_EXERCISE", - "result": "acid_soaked_hide", - "result_mult": 1, - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREW", - "skill_used": "cooking", - "difficulty": 3, - "time": "8 m", - "batch_time_factors": [ 50, 4 ], - "book_learn": [ [ "vinegar_maker", 1 ], [ "winemaking_beginner", 3 ] ], - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ - [ [ "chem_acetic_acid", 2 ]], - [ - [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ], [ "raw_hleather", 1 ], [ "raw_demihumanleather", 1 ] - ] - ] } ] diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 6cedd18ac1d25..f0d8caa3bdb55 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -43,21 +43,39 @@ "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": [ [ "chem_acetic_acid" ],["ruined_chunks"] ], + "byproducts": [ [ "formic_acid" ], [ "ruined_chunks" ] ], "result_mult": 12, "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "time": "2 m", + "time": "120 m", "batch_time_factors": [ 90, 1 ], "charges": 1, "autolearn": true, - "tools": [ [ "colander_steel" ] ], + "tools": [ [ "colander_steel" ] ], "components": [ [ [ "gelatin_extracted", 1 ] ] ] }, { @@ -72,9 +90,9 @@ "batch_time_factors": [ 20, 1 ], "charges": 5, "autolearn": true, - "qualities": [ { "id": "BOIL", "level": 1 } ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], - "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ],[ ["gelatin_dessert_powder_cherry", 1] ] ] + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "gelatin_dessert_powder_cherry", 1 ] ] ] }, { "type": "recipe", @@ -88,9 +106,9 @@ "batch_time_factors": [ 20, 1 ], "charges": 5, "autolearn": true, - "qualities": [ { "id": "BOIL", "level": 1 } ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], - "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ],[ ["gelatin_dessert_powder_lime", 1] ] ] + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "gelatin_dessert_powder_lime", 1 ] ] ] }, { "type": "recipe", @@ -104,9 +122,9 @@ "batch_time_factors": [ 20, 1 ], "charges": 5, "autolearn": true, - "qualities": [ { "id": "BOIL", "level": 1 } ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], - "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ],[ ["gelatin_dessert_powder_grape", 1] ] ] + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "gelatin_dessert_powder_grape", 1 ] ] ] }, { "type": "recipe", @@ -120,9 +138,9 @@ "batch_time_factors": [ 20, 1 ], "charges": 5, "autolearn": true, - "qualities": [ { "id": "BOIL", "level": 1 } ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], - "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ],[ ["gelatin_dessert_powder_raspberry", 1] ] ] + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "gelatin_dessert_powder_raspberry", 1 ] ] ] }, { "type": "recipe", @@ -136,9 +154,9 @@ "batch_time_factors": [ 20, 1 ], "charges": 5, "autolearn": true, - "qualities": [ { "id": "BOIL", "level": 1 } ], + "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], - "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ ["gelatin_powder", 25], ["gelatin_fresh", 1] ], [ ["sugar", 100] ] ] + "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "gelatin_powder", 25 ], [ "gelatin_fresh", 1 ] ], [ [ "sugar", 100 ] ] ] }, { "type": "recipe", @@ -151,15 +169,14 @@ "time": "60 m", "batch_time_factors": [ 20, 1 ], "charges": 5, - "autolearn": true, - "qualities": [ { "id": "BOIL", "level": 1 } ], + "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 ] ], - [ ["gelatin_powder", 25], ["gelatin_fresh", 1] ], - [ ["sugar", 100]] , - [ [ "oj", 1 ], [ "lemonade", 1 ], [ "apple_cider", 1 ], [ "cranberry_juice", 1 ], [ "juice", 1 ] ] + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ], ["sweet_water", 1] ], + [ [ "gelatin_powder", 25 ], [ "gelatin_fresh", 1 ] ], + [ [ "sugar", 100 ] ], + [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] }, { @@ -173,16 +190,102 @@ "time": "60 m", "batch_time_factors": [ 20, 1 ], "charges": 5, - "autolearn": true, - "qualities": [ { "id": "BOIL", "level": 1 } ], + "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", 25 ], [ "gelatin_fresh", 1 ] ], + [ [ "sugar", 100 ] ], + [ [ "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", 25 ] ], + [ [ "sugar", 100 ] ], + [ [ "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 ] ], - [ ["gelatin_powder", 25], ["gelatin_fresh", 1] ], - [ ["sugar", 100] ], - [ [ "oj", 1 ], [ "lemonade", 1 ], [ "apple_cider", 1 ], [ "cranberry_juice", 1 ], [ "juice", 1 ] ], - [ ["sweet_fruit", 1, "LIST" ] ] + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ], ["sweet_water", 1] ], + [ [ "chem_agar", 25 ]], + [ [ "sugar", 100 ] ], + [ [ "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", 50 ], [ "gelatin_fresh", 2 ] ], + [ [ "sugar", 200 ] ], + [ [ "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", 50 ] ], + [ [ "sugar", 200 ] ], + [ [ "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 358d30de4dcb5..bc0d6846c7f2e 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -2283,7 +2283,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ ["gelatin_fresh", 1], ["gelatin_powder", 25] ], + [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ] ], [ [ "meat_red", 1, "LIST" ], [ "meat_cooked", 1 ], @@ -2314,8 +2314,10 @@ "batch_time_factors": [ 50, 5 ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], - "components": [ [ ["gelatin_fresh", 1], ["gelatin_powder", 25] ], - [ [ "veggy_any", 4, "LIST" ] ], [ [ "water_clean", 1 ], [ "water", 1 ] ] + "components": [ + [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ] ], + [ [ "veggy_any", 4, "LIST" ] ], + [ [ "water_clean", 1 ], [ "water", 1 ] ] ] }, { diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 78662f26e3eb4..45bf55f2e011a 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -813,5 +813,39 @@ [ "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 ] + ] + ] } + ] From 4c45d8b85e64911532949d22243c9d3179f67e3c Mon Sep 17 00:00:00 2001 From: grawprog Date: Wed, 27 Jan 2021 21:05:36 -0800 Subject: [PATCH 03/20] added agar as alternative in aspic recipe --- data/json/recipes/recipe_food.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index bc0d6846c7f2e..c4cb36a029bb3 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -2283,7 +2283,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ] ], + [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ], [ "chem_agar", 25 ] ], [ [ "meat_red", 1, "LIST" ], [ "meat_cooked", 1 ], @@ -2315,7 +2315,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ] ], + [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ], [ "agar", 25 ] ], [ [ "veggy_any", 4, "LIST" ] ], [ [ "water_clean", 1 ], [ "water", 1 ] ] ] From d1151086dacfd7829c27b899dfbccdbf1a3b7ea8 Mon Sep 17 00:00:00 2001 From: grawprog Date: Wed, 27 Jan 2021 21:26:16 -0800 Subject: [PATCH 04/20] fixed mistake --- data/json/recipes/recipe_food.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index c4cb36a029bb3..d9ddb72b86607 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -2315,7 +2315,7 @@ "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ - [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ], [ "agar", 25 ] ], + [ [ "gelatin_fresh", 1 ], [ "gelatin_powder", 25 ], [ "chem_agar", 25 ] ], [ [ "veggy_any", 4, "LIST" ] ], [ [ "water_clean", 1 ], [ "water", 1 ] ] ] From fc57134733f0610b3b9b447a6a5c6711d8d051bc Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:41:27 -0800 Subject: [PATCH 05/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index f0d8caa3bdb55..846e3f0d2e8db 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -173,7 +173,7 @@ "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ - [ [ "water", 1 ], [ "water_clean", 1 ], ["sweet_water", 1] ], + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "gelatin_powder", 25 ], [ "gelatin_fresh", 1 ] ], [ [ "sugar", 100 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] From 8da8420e24854385852b1d973c1680efa03aa654 Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:41:37 -0800 Subject: [PATCH 06/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 846e3f0d2e8db..e3bc3d07d91e2 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -237,7 +237,7 @@ "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ - [ [ "water", 1 ], [ "water_clean", 1 ], ["sweet_water", 1] ], + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "chem_agar", 25 ]], [ [ "sugar", 100 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ], From 122526995f27144fb482135673d86318665e105a Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:41:50 -0800 Subject: [PATCH 07/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index e3bc3d07d91e2..f08844afc892b 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -281,7 +281,7 @@ "qualities": [ { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ], [ [ "mold_plastic", 1] ] ], "components": [ - [ [ "water", 1 ], [ "water_clean", 1 ], ["sweet_water", 1] ], + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "beet_syrup", 1 ] ], [ [ "chem_agar", 50 ] ], [ [ "sugar", 200 ] ], From f2391d27ad34add051226510ba23c9fa364539f0 Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:43:16 -0800 Subject: [PATCH 08/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index f08844afc892b..62395eab98747 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -238,7 +238,7 @@ "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], - [ [ "chem_agar", 25 ]], + [ [ "chem_agar", 25 ] ], [ [ "sugar", 100 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ], [ [ "sweet_fruit", 1, "LIST" ] ] From f1a7fa1bb3ab76ded4451afecfb4d10c8f350c9f Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:43:31 -0800 Subject: [PATCH 09/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 62395eab98747..a48918345428e 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -257,7 +257,7 @@ "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] ] ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ], [ [ "mold_plastic", 1 ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], ["sweet_water", 1] ], [ [ "beet_syrup", 1 ]], From 1b26b421db86aa076750f178df314edc2500bdaa Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:43:52 -0800 Subject: [PATCH 10/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index a48918345428e..bf239e90fd242 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -279,7 +279,7 @@ "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] ] ], + "tools": [ [ [ "surface_heat", 16, "LIST" ] ], [ [ "mold_plastic", 1 ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "beet_syrup", 1 ] ], From db471be405f4da62dfbd3f84bf2eaf96fa623ec0 Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:44:05 -0800 Subject: [PATCH 11/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index bf239e90fd242..a109203a5592b 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -194,7 +194,7 @@ "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ - [ [ "water", 1 ], [ "water_clean", 1 ], ["sweet_water", 1] ], + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "gelatin_powder", 25 ], [ "gelatin_fresh", 1 ] ], [ [ "sugar", 100 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ], From 0929bb8ca3e467efb60e9be3b59970085be9681f Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:44:23 -0800 Subject: [PATCH 12/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index a109203a5592b..579a8faf3b1da 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -285,7 +285,7 @@ [ [ "beet_syrup", 1 ] ], [ [ "chem_agar", 50 ] ], [ [ "sugar", 200 ] ], - [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] + [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] } ] From 984dc6bbffb88bea5ceea511505c0d7b1fb3e339 Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:44:38 -0800 Subject: [PATCH 13/20] Update data/json/requirements/cooking_components.json Co-authored-by: Binrui Dong --- data/json/requirements/cooking_components.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 45bf55f2e011a..47fe0e6b1fa01 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -847,5 +847,4 @@ ] ] } - ] From 55376e9b65edff6ff08ea79afbccc11a3bcf8f0b Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:44:50 -0800 Subject: [PATCH 14/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 579a8faf3b1da..7554ea87f16a5 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -216,7 +216,7 @@ "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ - [ [ "water", 1 ], [ "water_clean", 1 ], ["sweet_water", 1] ], + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "chem_agar", 25 ] ], [ [ "sugar", 100 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] From 152be2aa0099881fbf34cb65b2617a0a5392f8c1 Mon Sep 17 00:00:00 2001 From: grawprog <77870049+grawprog@users.noreply.github.com> Date: Thu, 28 Jan 2021 09:45:04 -0800 Subject: [PATCH 15/20] Update data/json/recipes/food/other.json Co-authored-by: Binrui Dong --- data/json/recipes/food/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 7554ea87f16a5..156d5a9f1b2b4 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -263,7 +263,7 @@ [ [ "beet_syrup", 1 ]], [ [ "gelatin_powder", 50 ], [ "gelatin_fresh", 2 ] ], [ [ "sugar", 200 ] ], - [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] + [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] }, { From 33334a028437f1fd1c190fdffe67c204577bfc3d Mon Sep 17 00:00:00 2001 From: Binrui Dong Date: Thu, 28 Jan 2021 12:47:27 -0500 Subject: [PATCH 16/20] Update data/json/recipes/food/other.json --- data/json/recipes/food/other.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 156d5a9f1b2b4..5e698bd1fc8f6 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -259,8 +259,8 @@ "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 ]], + [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], + [ [ "beet_syrup", 1 ] ], [ [ "gelatin_powder", 50 ], [ "gelatin_fresh", 2 ] ], [ [ "sugar", 200 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] From c0a9e9516f0a8cd50ea930a1c0d8f79f6c38ca8f Mon Sep 17 00:00:00 2001 From: grawprog Date: Thu, 28 Jan 2021 21:23:53 -0800 Subject: [PATCH 17/20] Tried using snippets to condense the flavours. This ended up leading to the description changing to a random flavour each time the recipe was scrolled over in the crafting menu which just seemed weird and unreasonable. Ended up just removing the four flavours and changing the items to gelatin dessert powder and processed gelatin dessert with just one variant and description. I left the descriptions as is for the remaining gelatin dessert recipes as they're all unique items crafted with different recipes. --- data/json/itemgroups/Food/food.json | 10 +-- data/json/itemgroups/SUS/fridges.json | 15 +--- .../json/itemgroups/collections_domestic.json | 10 +-- data/json/items/comestibles/junkfood.json | 80 +++---------------- data/json/recipes/food/other.json | 52 +----------- 5 files changed, 19 insertions(+), 148 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 7712112969ebb..a3b1cfab1acbc 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -49,10 +49,7 @@ { "item": "freeze_dried_meal", "prob": 10 }, { "item": "gelatin_powder", "prob": 40 }, { "item": "chem_agar", "prob": 15 }, - { "item": "gelatin_dessert_powder_cherry", "prob": 40 }, - { "item": "gelatin_dessert_powder_lime", "prob": 40 }, - { "item": "gelatin_dessert_powder_grape", "prob": 40 }, - { "item": "gelatin_dessert_powder_raspberry", "prob": 40 } + { "item": "gelatin_dessert_powder", "prob": 40 } ] }, { @@ -561,10 +558,7 @@ { "item": "pie_veggy", "prob": 18 }, { "item": "pie_meat", "prob": 18 }, { "item": "pie_maple", "prob": 9 }, - { "item": "gelatin_dessert_cherry", "prob": 40 }, - { "item": "gelatin_dessert_lime", "prob": 40 }, - { "item": "gelatin_dessert_grape", "prob": 40 }, - { "item": "gelatin_dessert_raspberry", "prob": 40 } + { "item": "gelatin_dessert_processed", "prob": 40 } ] }, { diff --git a/data/json/itemgroups/SUS/fridges.json b/data/json/itemgroups/SUS/fridges.json index f34c87a0f5752..75a7f9e8b6fe8 100644 --- a/data/json/itemgroups/SUS/fridges.json +++ b/data/json/itemgroups/SUS/fridges.json @@ -39,10 +39,7 @@ { "item": "yoghurt", "prob": 80 }, { "item": "butter", "prob": 80 }, { "item": "pudding", "prob": 30 }, - { "item": "gelatin_dessert_cherry", "prob": 20 }, - { "item": "gelatin_dessert_lime", "prob": 20 }, - { "item": "gelatin_dessert_grape", "prob": 20 }, - { "item": "gelatin_dessert_raspberry", "prob": 20 }, + { "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 }, @@ -630,10 +627,7 @@ { "item": "yoghurt", "prob": 20 }, { "item": "butter", "prob": 20 }, { "item": "pudding", "prob": 20 }, - { "item": "gelatin_dessert_cherry", "prob": 10 }, - { "item": "gelatin_dessert_lime", "prob": 10 }, - { "item": "gelatin_dessert_grape", "prob": 10 }, - { "item": "gelatin_dessert_raspberry", "prob": 10 }, + { "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 }, @@ -892,10 +886,7 @@ { "item": "yoghurt", "count": [ 1, 3 ], "prob": 75 }, { "item": "butter", "prob": 50 }, { "item": "pudding", "prob": 30 }, - { "item": "gelatin_dessert_cherry", "prob": 10 }, - { "item": "gelatin_dessert_lime", "prob": 10 }, - { "item": "gelatin_dessert_grape", "prob": 10 }, - { "item": "gelatin_dessert_raspberry", "prob": 10 }, + { "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 de752434e757e..c385cfd6ecbc7 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -564,10 +564,7 @@ { "item": "noodles_fast", "prob": 30 }, { "item": "ravioli", "prob": 25 }, { "item": "sauce_red", "prob": 20 }, - { "item": "gelatin_dessert_powder_cherry", "prob": 20 }, - { "item": "gelatin_dessert_powder_lime", "prob": 20 }, - { "item": "gelatin_dessert_powder_grape", "prob": 20 }, - { "item": "gelatin_dessert_powder_raspberry", "prob": 20 }, + { "item": "gelatin_dessert_powder", "prob": 20 }, { "item": "sauce_pesto", "prob": 15 }, { "item": "bread", "prob": 14 }, { "item": "cornbread", "prob": 7 }, @@ -583,10 +580,7 @@ { "item": "can_cheese", "prob": 8 }, { "item": "yoghurt", "prob": 8 }, { "item": "pudding", "prob": 10 }, - { "item": "gelatin_dessert_cherry", "prob": 10 }, - { "item": "gelatin_dessert_lime", "prob": 10 }, - { "item": "gelatin_dessert_grape", "prob": 10 }, - { "item": "gelatin_dessert_raspberry", "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 58efc0674cbe3..be8ef52adf200 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -1333,7 +1333,7 @@ }, { "type": "COMESTIBLE", - "id": "gelatin_dessert_powder_base", + "id": "gelatin_dessert_powder", "name": "gelatin dessert powder", "weight": "175 g", "color": "white", @@ -1343,7 +1343,7 @@ "symbol": "%", "quench": -8, "calories": 20, - "description": "A small box of gelatin dessert powder. Just add water and set. Comes in a variety of flavors.", + "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" ], @@ -1351,38 +1351,6 @@ "flags": [ "EATEN_COLD" ], "fun": -2 }, - { - "type": "COMESTIBLE", - "id": "gelatin_dessert_powder_cherry", - "name": "cherry gelatin dessert powder", - "color": "red", - "description": "A small box of cherry gelatin dessert powder. Just add water and set.", - "copy-from": "gelatin_dessert_powder_base" - }, - { - "type": "COMESTIBLE", - "id": "gelatin_dessert_powder_lime", - "name": "lime gelatin dessert powder", - "color": "light_green", - "description": "A small box of lime gelatin dessert powder. Just add water and set.", - "copy-from": "gelatin_dessert_powder_base" - }, - { - "type": "COMESTIBLE", - "id": "gelatin_dessert_powder_grape", - "name": "grape gelatin dessert powder", - "color": "magenta", - "description": "A small box of grape gelatin dessert powder. Just add water and set.", - "copy-from": "gelatin_dessert_powder_base" - }, - { - "type": "COMESTIBLE", - "id": "gelatin_dessert_powder_raspberry", - "name": "blue raspberry gelatin dessert powder", - "color": "cyan", - "description": "A small box of blue raspberry gelatin dessert powder. Just add water and set.", - "copy-from": "gelatin_dessert_powder_base" - }, { "type": "COMESTIBLE", "id": "gelatin_dessert_base", @@ -1394,7 +1362,7 @@ "comestible_type": "FOOD", "symbol": "%", "calories": 100, - "description": "An unflavored jiggly, sugary treat made from gelatin and sugar. This would taste better with some flavor.", + "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" ], @@ -1404,37 +1372,9 @@ }, { "type": "COMESTIBLE", - "id": "gelatin_dessert_cherry", - "name": "cherry gelatin dessert", - "color": "red", - "description": "A cherry flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.", - "fun": 20, - "copy-from": "gelatin_dessert_base" - }, - { - "type": "COMESTIBLE", - "id": "gelatin_dessert_lime", - "name": "lime gelatin dessert", - "color": "light_green", - "description": "A lime flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.", - "fun": 20, - "copy-from": "gelatin_dessert_base" - }, - { - "type": "COMESTIBLE", - "id": "gelatin_dessert_grape", - "name": "grape gelatin dessert", - "color": "magenta", - "description": "A grape flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.", - "fun": 20, - "copy-from": "gelatin_dessert_base" - }, - { - "type": "COMESTIBLE", - "id": "gelatin_dessert_raspberry", - "name": "blue raspberry gelatin dessert", - "color": "cyan", - "description": "A blue raspberry flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.", + "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" }, @@ -1443,7 +1383,7 @@ "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.", + "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" }, @@ -1452,7 +1392,7 @@ "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", + "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" @@ -1462,7 +1402,7 @@ "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.", + "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" @@ -1472,7 +1412,7 @@ "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", + "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, diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 5e698bd1fc8f6..437553862f099 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -81,7 +81,7 @@ { "type": "recipe", "activity_level": "NO_EXERCISE", - "result": "gelatin_dessert_cherry", + "result": "gelatin_dessert_processed", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", @@ -92,55 +92,7 @@ "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_cherry", 1 ] ] ] - }, - { - "type": "recipe", - "activity_level": "NO_EXERCISE", - "result": "gelatin_dessert_lime", - "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_lime", 1 ] ] ] - }, - { - "type": "recipe", - "activity_level": "NO_EXERCISE", - "result": "gelatin_dessert_grape", - "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_grape", 1 ] ] ] - }, - { - "type": "recipe", - "activity_level": "NO_EXERCISE", - "result": "gelatin_dessert_raspberry", - "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_raspberry", 1 ] ] ] + "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "gelatin_dessert_powder", 1 ] ] ] }, { "type": "recipe", From add5285f39f10b1e5bd3a94f9b8b6797fdbe5728 Mon Sep 17 00:00:00 2001 From: grawprog Date: Thu, 28 Jan 2021 21:49:09 -0800 Subject: [PATCH 18/20] Fixed grammar errors in descriptions. --- data/json/items/comestibles/junkfood.json | 4 ++-- data/json/items/comestibles/other.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index be8ef52adf200..c6250c48ee9d3 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -349,7 +349,7 @@ "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.", + "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" ], @@ -1402,7 +1402,7 @@ "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.", + "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" diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 0e29d78d22f2b..0e769bab9b902 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -191,7 +191,7 @@ { "type": "COMESTIBLE", "id": "gelatin_powder", - "name": { "str": "powdered gelatin", "str_pl": "powdered gelatin" }, + "name": { "str_sp": "powdered gelatin" }, "weight": "11 g", "color": "yellow", "container": "bag_plastic", @@ -211,7 +211,7 @@ { "type": "COMESTIBLE", "id": "gelatin_fresh", - "name": { "str": "fresh gelatin" }, + "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" } }, @@ -915,7 +915,7 @@ "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.", + "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, @@ -935,7 +935,7 @@ "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.", + "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, From ba4fb323bed8f6b944b4410084134c0cc8e06e1e Mon Sep 17 00:00:00 2001 From: grawprog Date: Fri, 29 Jan 2021 18:03:16 -0800 Subject: [PATCH 19/20] adjusted recipes to not use thousands of calories worth of ingredients. --- data/json/recipes/food/other.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 437553862f099..35b30943b4a69 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -126,8 +126,8 @@ "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], - [ [ "gelatin_powder", 25 ], [ "gelatin_fresh", 1 ] ], - [ [ "sugar", 100 ] ], + [ [ "gelatin_powder", 5 ], [ "gelatin_fresh", 1 ] ], + [ [ "sugar", 10 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] }, @@ -147,8 +147,8 @@ "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], - [ [ "gelatin_powder", 25 ], [ "gelatin_fresh", 1 ] ], - [ [ "sugar", 100 ] ], + [ [ "gelatin_powder", 5 ], [ "gelatin_fresh", 1 ] ], + [ [ "sugar", 10 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ], [ [ "sweet_fruit", 1, "LIST" ] ] ] @@ -169,8 +169,8 @@ "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], - [ [ "chem_agar", 25 ] ], - [ [ "sugar", 100 ] ], + [ [ "chem_agar", 5 ] ], + [ [ "sugar", 10 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] }, @@ -190,8 +190,8 @@ "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], - [ [ "chem_agar", 25 ] ], - [ [ "sugar", 100 ] ], + [ [ "chem_agar", 5 ] ], + [ [ "sugar", 10 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ], [ [ "sweet_fruit", 1, "LIST" ] ] ] @@ -213,8 +213,8 @@ "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "beet_syrup", 1 ] ], - [ [ "gelatin_powder", 50 ], [ "gelatin_fresh", 2 ] ], - [ [ "sugar", 200 ] ], + [ [ "gelatin_powder", 5 ], [ "gelatin_fresh", 2 ] ], + [ [ "sugar", 20 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] }, @@ -235,8 +235,8 @@ "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "beet_syrup", 1 ] ], - [ [ "chem_agar", 50 ] ], - [ [ "sugar", 200 ] ], + [ [ "chem_agar", 5 ] ], + [ [ "sugar", 20 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] } From 5a8b406618a4ca39f7f68e62011192379fbf64b6 Mon Sep 17 00:00:00 2001 From: grawprog Date: Sat, 30 Jan 2021 00:43:48 -0800 Subject: [PATCH 20/20] fixed errors with calories in recipes. --- data/json/items/comestibles/junkfood.json | 2 +- data/json/recipes/food/other.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index c6250c48ee9d3..2313ca823a44c 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -1342,7 +1342,7 @@ "comestible_type": "FOOD", "symbol": "%", "quench": -8, - "calories": 20, + "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, diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index 35b30943b4a69..11602abce0cf8 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -108,7 +108,7 @@ "autolearn": true, "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], - "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "gelatin_powder", 25 ], [ "gelatin_fresh", 1 ] ], [ [ "sugar", 100 ] ] ] + "components": [ [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "gelatin_powder", 10 ], [ "gelatin_fresh", 1 ] ], [ [ "sugar", 20 ] ] ] }, { "type": "recipe", @@ -127,7 +127,7 @@ "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "gelatin_powder", 5 ], [ "gelatin_fresh", 1 ] ], - [ [ "sugar", 10 ] ], + [ [ "sugar", 20 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] }, @@ -170,7 +170,7 @@ "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "chem_agar", 5 ] ], - [ [ "sugar", 10 ] ], + [ [ "sugar", 20 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] }, @@ -191,7 +191,7 @@ "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "chem_agar", 5 ] ], - [ [ "sugar", 10 ] ], + [ [ "sugar", 20 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ], [ [ "sweet_fruit", 1, "LIST" ] ] ] @@ -213,8 +213,8 @@ "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "beet_syrup", 1 ] ], - [ [ "gelatin_powder", 5 ], [ "gelatin_fresh", 2 ] ], - [ [ "sugar", 20 ] ], + [ [ "gelatin_powder", 25 ], [ "gelatin_fresh", 2 ] ], + [ [ "sugar", 50 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] }, @@ -235,8 +235,8 @@ "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "sweet_water", 1 ] ], [ [ "beet_syrup", 1 ] ], - [ [ "chem_agar", 5 ] ], - [ [ "sugar", 20 ] ], + [ [ "chem_agar", 25 ] ], + [ [ "sugar", 50 ] ], [ [ "sweet_juice", 1, "LIST" ], [ "soda_pop", 1, "LIST" ] ] ] }