From bd3a8581c4e47258060051dcba506b7eb7a07b1c Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 3 May 2023 13:00:31 -0700 Subject: Sandwiches, fish soup, french toast now use bread_sandwich group. Peanut Butter now uses sugar_standard group. Wasteland Sausages, rennet, and sausage casing now use custom edible_stomach group. Upstream bone broth now allows human bones. Various updates to recipes in order to sync with upstream where my fixes had diverged. --- Readme.txt | 19 ++++--- json/recipes/food/bread.json | 14 ++---- json/recipes/food/canned.json | 83 +------------------------------ json/recipes/food/drinks.json | 2 +- json/recipes/food/meat.json | 64 ++++++------------------ json/recipes/food/other.json | 71 +++++++++++++++++++++++++- json/recipes/food/snack.json | 11 +--- json/recipes/food/veggi.json | 4 +- json/requirements/cooking_components.json | 12 +++++ 9 files changed, 116 insertions(+), 164 deletions(-) diff --git a/Readme.txt b/Readme.txt index 2e09f87..2585a48 100644 --- a/Readme.txt +++ b/Readme.txt @@ -1,10 +1,6 @@ -- -BLT, Cheeseburger, Cucumber Sandwich, Fish Soup, and French Toast -can now be made with brioche. -Hamburgers and Fish Sandwiches could be made with brioche yet these -comparable sandwiches could not. Also French Toast and Fish Soup -allowed every other bread. +All sandwiches, as well as Fish Soup and French Toast now use bread_sandwich group for valid bread options. -- @@ -65,6 +61,10 @@ Peanut Butter can now be preserved. -- +Peanut Butter now uses sugar_standard group instead of just sugar/honey. + +-- + Pesto Sauce can now be preserved. -- @@ -89,6 +89,10 @@ If curry is considered a liquid, chili is too. Chitin powder: Now allows biosilicified chitin with mortar and pestle. +-- +Sausages: +Now use the salt_preservation group instead of specific ones. + -- Wasteland sausages: Can now use human stomachs. @@ -103,11 +107,6 @@ All the other sausages did. Sausage casings can be made with clean water: Water, but not clean water? Nope. --- -Bone Broth: -Can now use human bones in preserved versions. -The base one could. - --- Add copper to reloaded and black powder recipes for various ammunitions: 10mm Auto FMJ, .357 Magnum FMJ, .38 Super FMJ, .45 ACP FMJ, 4.6x30mm diff --git a/json/recipes/food/bread.json b/json/recipes/food/bread.json index 5382fc4..3c52867 100644 --- a/json/recipes/food/bread.json +++ b/json/recipes/food/bread.json @@ -9,22 +9,14 @@ "time": "12 m", "charges": 3, "autolearn": true, - "batch_time_factors": [ 80, 1 ], + "batch_time_factors": [ 50, 3 ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "milk_standard_raw", 1, "LIST" ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_small_dry", 1, "LIST" ] ], [ [ "cinnamon", 2 ] ], - [ - [ "flatbread", 2 ], - [ "bread", 2 ], - [ "cornbread", 2 ], - [ "wastebread", 2 ], - [ "sourdough_bread", 2 ], - [ "brioche", 2 ], - [ "hardtack", 2 ] - ] + [ [ "bread_sandwich", 2, "LIST" ] ] ] } ] diff --git a/json/recipes/food/canned.json b/json/recipes/food/canned.json index a2525b7..1a8a400 100644 --- a/json/recipes/food/canned.json +++ b/json/recipes/food/canned.json @@ -1,85 +1,4 @@ [ - { - "type": "recipe", - "result": "broth_bone", - "id_suffix": "canned", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 4, - "time": "24 m", - "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ], - "contained": true, - "batch_time_factors": [ 80, 5 ], - "qualities": [ - { "id": "SAW_M", "level": 1 }, - { "id": "HAMMER", "level": 1 }, - { "id": "CUT", "level": 1 }, - { "id": "COOK", "level": 3 } - ], - "tools": [ - [ [ "surface_heat", 10, "LIST" ] ], - [ [ "can_sealer", -1 ] ] - ], - "components": [ - [ [ "can_medium_unsealed", 1 ] ], - [ [ "scrap", 1 ] ], - [ [ "bone", 20 ], [ "bone_human", 20 ] ], - [ [ "water", 2 ], [ "water_clean", 2 ] ] - ] - }, - { - "type": "recipe", - "result": "broth_bone", - "id_suffix": "jarred", - "byproducts": [ [ "water", 10 ] ], - "container": "jar_glass_sealed", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "skills_required": [ "mechanics", 1 ], - "difficulty": 4, - "time": "1 h", - "charges": 2, - "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ], - "batch_time_factors": [ 80, 5 ], - "qualities": [ { "id": "COOK", "level": 3 } ], - "tools": [ - [ [ "surface_heat", 100, "LIST" ] ], - [ [ "pot_canning", -1 ] ] - ], - "components": [ - [ [ "jar_glass", 1 ] ], - [ [ "bone", 20 ], [ "bone_human", 20 ] ], - [ [ "water", 12 ], [ "water_clean", 12 ] ] - ] - }, - { - "type": "recipe", - "result": "broth_bone", - "id_suffix": "jarred_3l", - "byproducts": [ [ "water", 10 ] ], - "container": "jar_3l_glass_sealed", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "skills_required": [ "mechanics", 1 ], - "difficulty": 4, - "time": "1 h 10 m", - "charges": 12, - "book_learn": [ [ "cookbook_eatyrway", 5 ], [ "manual_canning", 3 ] ], - "batch_time_factors": [ 80, 5 ], - "qualities": [ { "id": "COOK", "level": 3 } ], - "tools": [ - [ [ "surface_heat", 200, "LIST" ] ], - [ [ "pot_canning", -1 ] ] - ], - "components": [ - [ [ "jar_3l_glass", 1 ] ], - [ [ "water", 22 ], [ "water_clean", 22 ] ], - [ [ "bone", 120 ], [ "bone_human", 120 ] ] - ] - }, { "type": "recipe", "result": "peanutbutter", @@ -161,7 +80,7 @@ [ [ "pine_nuts", 4 ] ], [ [ "seasoning_italian", 20 ], [ "wild_herbs", 40 ] ], [ [ "salt", 20 ], [ "seasoning_salt", 20 ] ], - [ [ "any_butter_or_oil", 8, "LIST" ] ], + [ [ "cooking_oil", 8 ], [ "cooking_oil2", 8 ] ], [ [ "jar_glass", 1 ] ] ] }, diff --git a/json/recipes/food/drinks.json b/json/recipes/food/drinks.json index 2c26412..dd01536 100644 --- a/json/recipes/food/drinks.json +++ b/json/recipes/food/drinks.json @@ -123,7 +123,7 @@ [ "milk_evap", 1 ], [ "milk_powder", 1 ] ], - [ [ "water", 6 ], [ "water_clean", 6 ] ], + [ [ "water", 7 ], [ "water_clean", 7 ] ], [ [ "sugar", 5 ] ], [ [ "chilly-p", 1 ] ], [ [ "cinnamon", 1 ] ] diff --git a/json/recipes/food/meat.json b/json/recipes/food/meat.json index ef99936..000a8ee 100644 --- a/json/recipes/food/meat.json +++ b/json/recipes/food/meat.json @@ -236,14 +236,7 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "meat_red", 1, "LIST" ] ], - [ - [ "flatbread", 2 ], - [ "bread", 2 ], - [ "cornbread", 2 ], - [ "wastebread", 2 ], - [ "sourdough_bread", 2 ], - [ "brioche", 2 ] - ], + [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "cheese_any", 1, "LIST" ] ], [ [ "pickle", 1 ], @@ -256,16 +249,7 @@ [ "lettuce", 1 ], [ "irradiated_lettuce", 1 ] ], - [ - [ "ketchup", 1 ], - [ "mustard", 1 ], - [ "horseradish", 1 ], - [ "mayonnaise", 1 ], - [ "bacon", 1 ], - [ "seasoning_salt", 1 ], - [ "soysauce", 1 ], - [ "sauerkraut", 1 ] - ] + [ [ "condiment", 1, "LIST" ], [ "bacon", 1 ], [ "seasoning_salt", 1 ] ] ] }, { @@ -286,14 +270,7 @@ "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "meat_red", 1, "LIST" ] ], - [ - [ "flatbread", 2 ], - [ "bread", 2 ], - [ "cornbread", 2 ], - [ "wastebread", 2 ], - [ "sourdough_bread", 2 ], - [ "brioche", 2 ] - ], + [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "pickle", 1 ], [ "veggy_pickled", 1 ], @@ -305,16 +282,7 @@ [ "lettuce", 1 ], [ "irradiated_lettuce", 1 ] ], - [ - [ "ketchup", 1 ], - [ "mustard", 1 ], - [ "horseradish", 1 ], - [ "mayonnaise", 1 ], - [ "bacon", 1 ], - [ "seasoning_salt", 1 ], - [ "soysauce", 1 ], - [ "sauerkraut", 1 ] - ] + [ [ "condiment", 1, "LIST" ], [ "bacon", 1 ], [ "seasoning_salt", 1 ] ] ] }, { @@ -412,7 +380,7 @@ "tools": [ [ [ "char_smoker", 10 ] ] ], "components": [ [ [ "offal_raw", 4, "LIST" ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ], - [ [ "sausage_casings", 2 ], [ "stomach", 2 ], [ "stomach_large", 1 ], [ "hstomach", 2 ], [ "hstomach_large", 1 ] ], + [ [ "sausage_casings", 2 ], [ "edible_stomach", 1, "LIST" ] ], [ [ "salt_preservation", 4, "LIST" ] ] ] }, @@ -433,7 +401,7 @@ ], "components": [ [ [ "offal_raw", 4, "LIST" ], [ "meat_nofish", 2, "LIST" ], [ "brain", 10 ] ], - [ [ "sausage_casings", 2 ], [ "stomach", 2 ], [ "stomach_large", 1 ], [ "hstomach", 2 ], [ "hstomach_large", 1 ] ], + [ [ "sausage_casings", 2 ], [ "edible_stomach", 1, "LIST" ] ], [ [ "salt_preservation", 4, "LIST" ] ] ] }, @@ -453,14 +421,7 @@ ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ - [ - [ "flatbread", 2 ], - [ "bread", 2 ], - [ "cornbread", 2 ], - [ "wastebread", 2 ], - [ "sourdough_bread", 2 ], - [ "brioche", 2 ] - ], + [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "bacon", 1 ] ], [ [ "lettuce", 1 ], [ "irradiated_lettuce", 1 ] ], [ [ "can_tomato", 1 ], [ "irradiated_tomato", 1 ], [ "tomato", 1 ] ] @@ -499,7 +460,14 @@ [ "cabbage", 2 ] ], [ [ "tomato", 1 ], [ "irradiated_tomato", 1 ], [ "can_tomato", 1 ], [ "onion", 1 ], [ "irradiated_onion", 1 ] ], - [ [ "pepper", 20 ], [ "chilly-p", 20 ], [ "garlic_clove", 6 ], [ "chili_pepper", 2 ] ] + [ + [ "pepper", 20 ], + [ "chilly-p", 20 ], + [ "garlic_clove", 6 ], + [ "garlic_roasted", 1 ], + [ "chili_pepper", 2 ], + [ "chili_pepper_roasted", 2 ] + ] ] }, { @@ -593,7 +561,7 @@ "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT_FINE", "level": 1 } ], "tools": [ [ [ "funnel", -1 ] ] ], "components": [ - [ [ "stomach", 2 ], [ "stomach_large", 1 ] ], + [ [ "edible_stomach", 1, "LIST" ] ], [ [ "salt", 20 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ], [ [ "bag_plastic", 1 ] ] diff --git a/json/recipes/food/other.json b/json/recipes/food/other.json index 53967d8..a383e0c 100644 --- a/json/recipes/food/other.json +++ b/json/recipes/food/other.json @@ -162,8 +162,77 @@ [ "cherries", 1 ], [ "irradiated_cherries", 1 ] ], - [ [ "sugar", 10 ] ], + [ [ "sugar_standard", 1, "LIST" ] ], [ [ "water_clean", 1 ] ] ] + }, + { + "type": "recipe", + "result": "peanutbutter", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 1, + "time": "10 m", + "charges": 4, + "autolearn": true, + "qualities": [ { "id": "COOK", "level": 1 } ], + "tools": [ [ [ "food_processor", 40 ] ] ], + "components": [ + [ [ "peanut", 3 ] ], + [ [ "sugar_standard", 1, "LIST" ] ] + ] + }, + { + "type": "recipe", + "result": "peanutbutter_imitation", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 1, + "charges": 3, + "time": "10 m", + "autolearn": true, + "qualities": [ { "id": "COOK", "level": 1 } ], + "tools": [ [ [ "food_processor", 40 ] ] ], + "components": [ + [ + [ "pine_nuts", 5 ], + [ "pecan", 5 ], + [ "cashews", 5 ], + [ "pistachio", 5 ], + [ "almond", 5 ], + [ "beech_nuts", 5 ], + [ "hickory_nut", 5 ], + [ "chestnut", 5 ], + [ "hazelnut", 5 ], + [ "walnut", 5 ], + [ "acorns", 5 ] + ], + [ [ "sugar_standard", 1, "LIST" ] ] + ] + }, + { + "result": "rennet", + "type": "recipe", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "difficulty": 4, + "time": "40 m", + "book_learn": [ + [ "survival_book", 4 ], + [ "textbook_survival", 4 ], + [ "manual_survival", 4 ], + [ "dairy_book", 3 ], + [ "scots_cookbook", 5 ] + ], + "batch_time_factors": [ 50, 3 ], + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "BOIL", "level": 2 } ], + "tools": [ + [ [ "dehydrator", 20 ], [ "char_smoker", 20 ] ], + [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ], [ "food_processor", 10 ] ] + ], + "components": [ [ [ "edible_stomach", 1, "LIST" ] ] ] } ] diff --git a/json/recipes/food/snack.json b/json/recipes/food/snack.json index 8fd6625..f8a24d8 100644 --- a/json/recipes/food/snack.json +++ b/json/recipes/food/snack.json @@ -35,16 +35,9 @@ "batch_time_factors": [ 50, 3 ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ - [ - [ "flatbread", 2 ], - [ "bread", 2 ], - [ "cornbread", 2 ], - [ "wastebread", 2 ], - [ "sourdough_bread", 2 ], - [ "brioche", 2 ] - ], + [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "cucumber", 1 ], [ "irradiated_cucumber", 1 ] ], - [ [ "mayonnaise", 1 ], [ "mustard", 1 ], [ "horseradish", 1 ], [ "seasoning_salt", 1 ] ] + [ [ "condiment", 1, "LIST" ], [ "seasoning_salt", 1 ] ] ] } ] diff --git a/json/recipes/food/veggi.json b/json/recipes/food/veggi.json index 50fdbbe..b34a123 100644 --- a/json/recipes/food/veggi.json +++ b/json/recipes/food/veggi.json @@ -101,7 +101,7 @@ "components": [ [ [ "tofu", 4 ], [ "dry_tofu", 4 ] ], [ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ], - [ [ "any_butter_or_oil", 2, "LIST" ] ], + [ [ "cooking_oil", 2 ] ], [ [ "sugar_standard", 1, "LIST" ] ], [ [ "irradiated_broccoli", 2 ], [ "broccoli", 2 ], [ "veggy_wild_cooked", 2 ], [ "veggy_cooked", 2 ] ], [ [ "soysauce", 1 ] ] @@ -125,7 +125,7 @@ "components": [ [ [ "veggy_any_uncooked", 4, "LIST" ] ], [ [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ], - [ [ "any_butter_or_oil", 2, "LIST" ] ], + [ [ "cooking_oil", 2 ] ], [ [ "sugar_standard", 1, "LIST" ] ], [ [ "irradiated_broccoli", 2 ], [ "broccoli", 2 ], [ "veggy_wild_cooked", 2 ], [ "veggy_cooked", 2 ] ], [ [ "soysauce", 1 ] ] diff --git a/json/requirements/cooking_components.json b/json/requirements/cooking_components.json index b4ddcc1..edf55c2 100644 --- a/json/requirements/cooking_components.json +++ b/json/requirements/cooking_components.json @@ -54,5 +54,17 @@ [ "can_tuna", 2 ] ] ] + }, + { + "id": "edible_stomach", + "type": "requirement", + "components": [ + [ + [ "stomach_large", 1 ], + [ "stomach", 2 ] + [ "hstomach_large", 1 ], + [ "hstomach", 2 ] + ] + ] } ] -- cgit v1.2.1