From 0bdfb8d4e312c2c8e528c4ea4ac33c7106e1989d Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:12:50 -0600 Subject: [PATCH 01/31] added cut produce to recipes Added cut tomato to recipes: chili con carne homemade burrito ketchup cheeseburger deluxe cheeseburger hamburger tomato juice tomato sauce deluxe sandwich valencian paella fish sandwich lobster roll sloppy joe vegetable sandwich vegetable sandwich with cheese salsa Added cut chili pepper to recipes: chili con carne homemade burrito Removed duplicate "can_tomato" from deluxe sandwich, vegetable sandwich, and vegetable sandwich with cheese. --- data/json/recipes/recipe_food.json | 34 ++++++++++++++++++------------ 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 43696049cb644..2dfff5e3798a1 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -6093,10 +6093,10 @@ [ "dry_veggy", 2 ], [ "dry_corn", 2 ] ], - [ [ "tomato", 1 ], [ "can_tomato", 1 ] ], + [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ], [ [ "meat_cooked", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ], [ [ "can_beans", 1 ], [ "raw_beans", 1 ], [ "dry_beans", 1 ] ], - [ [ "chilly-p", 2 ], [ "chili_pepper", 1 ], [ "rehydrated_chili", 1 ] ] + [ [ "chilly-p", 2 ], [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ], [ "rehydrated_chili", 1 ] ] ] }, { @@ -6694,6 +6694,7 @@ [ "onion", 1 ], [ "can_tomato", 1 ], [ "tomato", 1 ], + [ "tomato_cut", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], [ "lettuce", 1 ] @@ -6730,7 +6731,7 @@ [ [ "cheese_standard", 1, "LIST" ] ], [ [ "pickle", 1 ], [ "veggy_pickled", 1 ], [ "sauerkraut", 1 ] ], [ [ "onion", 1 ] ], - [ [ "can_tomato", 1 ], [ "tomato", 1 ] ], + [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ], [ [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], [ "lettuce", 1 ] ], [ [ "ketchup", 1 ], [ "barbecue_sauce", 1 ] ], [ [ "mustard", 1 ], [ "honey_mustard", 1 ] ], @@ -6757,6 +6758,7 @@ [ "onion", 1 ], [ "can_tomato", 1 ], [ "tomato", 1 ], + [ "tomato_cut", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], [ "lettuce", 1 ] @@ -6793,6 +6795,7 @@ [ "lemon", 1 ], [ "can_tomato", 1 ], [ "tomato", 1 ], + [ "tomato_cut", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], [ "lettuce", 1 ] @@ -6872,6 +6875,7 @@ [ "cabbage", 1 ], [ "sauerkraut", 1 ], [ "tomato", 1 ], + [ "tomato_cut", 1 ], [ "can_tomato", 1 ], [ "pumpkin_cut", 1 ], [ "onion", 1 ], @@ -6904,7 +6908,6 @@ [ "cooked_burdock_stalk", 1 ], [ "cooked_pumpkin", 1 ], [ "potato_baked", 1 ], - [ "can_tomato", 1 ], [ "dandelion_cooked", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], @@ -6969,6 +6972,7 @@ [ "onion", 1 ], [ "can_tomato", 1 ], [ "tomato", 1 ], + [ "tomato_cut", 1 ], [ "lettuce", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ] @@ -7249,7 +7253,7 @@ "//": "4u for meat 1u for sauce = 5u", "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], - [ [ "sauce_red", 2 ], [ "can_tomato", 1 ], [ "tomato", 1 ] ], + [ [ "sauce_red", 2 ], [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ], [ [ "meat_red_cooked", 1, "LIST" ] ] ] }, @@ -7454,7 +7458,7 @@ "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], "components": [ - [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "autumn_olive", 1 ] ], + [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "autumn_olive", 1 ] ], [ [ "salt", 2 ], [ "salt_water", 1 ], [ "saline", 2 ], [ "seasoning_salt", 2 ], [ "soysauce", 1 ] ], [ [ "vinegar", 1 ] ] ] @@ -7973,6 +7977,7 @@ [ "cabbage", 1 ], [ "sauerkraut", 1 ], [ "tomato", 1 ], + [ "tomato_cut", 1 ], [ "can_tomato", 1 ], [ "pumpkin_cut", 1 ], [ "onion", 1 ], @@ -8001,7 +8006,6 @@ [ "cooked_burdock_stalk", 1 ], [ "cooked_pumpkin", 1 ], [ "potato_baked", 1 ], - [ "can_tomato", 1 ], [ "dandelion_cooked", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], @@ -8031,6 +8035,7 @@ [ "cabbage", 1 ], [ "sauerkraut", 1 ], [ "tomato", 1 ], + [ "tomato_cut", 1 ], [ "can_tomato", 1 ], [ "pumpkin_cut", 1 ], [ "onion", 1 ], @@ -8061,7 +8066,6 @@ [ "cooked_burdock_stalk", 1 ], [ "cooked_pumpkin", 1 ], [ "potato_baked", 1 ], - [ "can_tomato", 1 ], [ "dandelion_cooked", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], @@ -9045,7 +9049,7 @@ "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 }, { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "water_boiling_heat", 8, "LIST" ] ] ], "//": "1u water + 1u tomato boils and reduces for 45 min = 2u + 6u", - "components": [ [ [ "can_tomato", 1 ], [ "tomato", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] + "components": [ [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] }, { "type": "recipe", @@ -9181,7 +9185,7 @@ [ "grape_leaves", 2 ], [ "cabbage", 2 ] ], - [ [ "tomato", 1 ], [ "can_tomato", 1 ], [ "onion", 1 ], [ "salsa", 1 ] ], + [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ], [ "onion", 1 ], [ "salsa", 1 ] ], [ [ "pepper", 20 ], [ "chilly-p", 20 ], @@ -9189,6 +9193,7 @@ [ "rehydrated_garlic", 1 ], [ "garlic_powder", 20 ], [ "chili_pepper", 2 ], + [ "chili_pepper_cut", 2 ], [ "rehydrated_chili", 2 ] ] ] @@ -9588,7 +9593,7 @@ "qualities": [ { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "water_boiling_heat", 2, "LIST" ], [ "food_processor", 20 ] ] ], "components": [ - [ [ "tomato", 10 ] ], + [ [ "tomato", 10 ], [ "tomato_cut", 10 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "sugar", 1 ], [ "artificial_sweetener", 1 ] ], [ [ "salt", 1 ], [ "seasoning_salt", 1 ] ] @@ -9725,7 +9730,8 @@ [ "rehydrated_garlic", 1 ], [ "wild_garlic", 1 ], [ "garlic_powder", 1 ], - [ "tomato", 1 ] + [ "tomato", 1 ], + [ "tomato_cut", 1 ] ], [ [ "water_clean", 1 ] ] ], @@ -9777,7 +9783,7 @@ "book_learn": [ [ "cookbook_mexican", 1 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 2 } ], "components": [ - [ [ "tomato", 1 ], [ "can_tomato", 1 ] ], + [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ], [ [ "veggy_any_uncooked", 1, "LIST" ], [ "rehydrated_corn_kernels", 1 ], [ "can_beans", 1 ] ], [ [ "salt", 1 ], [ "seasoning_mild", 1, "LIST" ] ] ] @@ -9799,7 +9805,7 @@ "tools": [ [ [ "food_processor", 20 ] ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ - [ [ "tomato", 1 ], [ "can_tomato", 1 ] ], + [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ], [ [ "veggy_any_uncooked", 1, "LIST" ], [ "rehydrated_corn_kernels", 1 ], [ "can_beans", 1 ] ], [ [ "salt", 1 ], [ "seasoning_mild", 1, "LIST" ] ] ] From de4ec94e5bcc51f0d83d65e04fe937bd09a240ef Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:20:28 -0600 Subject: [PATCH 02/31] added cut produce to recipes Added cut tomato and cut bell pepper to recipes: iskender kebab kiymali pide lahmacun --- data/json/recipes/food/meat_dishes.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/recipes/food/meat_dishes.json b/data/json/recipes/food/meat_dishes.json index eadf6f7fd536b..9e56917fe581b 100644 --- a/data/json/recipes/food/meat_dishes.json +++ b/data/json/recipes/food/meat_dishes.json @@ -42,10 +42,10 @@ [ [ "meat_red_raw", 1, "LIST" ] ], [ [ "salt", 1 ] ], [ [ "onion", 1 ] ], - [ [ "tomato", 2 ] ], + [ [ "tomato", 2 ], [ "tomato_cut", 2 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], [ [ "sugar", 1 ] ], - [ [ "bell_pepper", 1 ] ] + [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ] ], "charges": 6 }, @@ -67,9 +67,9 @@ [ [ "meat_red_raw", 1, "LIST" ], [ "poultry_raw_any", 2, "LIST" ] ], [ [ "salt", 1 ] ], [ [ "onion", 1 ] ], - [ [ "tomato", 1 ] ], + [ [ "tomato", 1 ], [ "tomato_cut", 1 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], - [ [ "bell_pepper", 1 ] ], + [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ], [ [ "garlic_clove", 2 ], [ "rehydrated_garlic", 2 ] ], [ [ "seasoning_mild", 2, "LIST" ] ] ], @@ -93,8 +93,8 @@ [ [ "salt", 1 ] ], [ [ "pepper", 1 ] ], [ [ "onion", 2 ] ], - [ [ "tomato", 4 ] ], - [ [ "bell_pepper", 2 ] ], + [ [ "tomato", 4 ], [ "tomato_cut", 4 ] ], + [ [ "bell_pepper", 2 ], [ "bell_pepper_cut", 2 ] ], [ [ "garlic_clove", 2 ], [ "rehydrated_garlic", 2 ] ], [ [ "seasoning_mild", 2, "LIST" ] ], [ [ "yoghurt", 1 ] ] From 369a29050a0bd18e98bd38a85a0df6b8a236f1da Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:25:01 -0600 Subject: [PATCH 03/31] added cut produce to recipes Added cut tomato to recipes: succotash deluxe vegetable salad Added cut chili pepper to recipes: roasted chili pepper --- data/json/recipes/food/vegetable_dishes.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/food/vegetable_dishes.json b/data/json/recipes/food/vegetable_dishes.json index 2a1d0d3a715c6..95edce6077c33 100644 --- a/data/json/recipes/food/vegetable_dishes.json +++ b/data/json/recipes/food/vegetable_dishes.json @@ -31,6 +31,7 @@ [ "cucumber", 1 ], [ "japanese_knotweed_stem", 2 ], [ "tomato", 1 ], + [ "tomato_cut", 1 ], [ "can_tomato", 1 ], [ "carrot", 2 ], [ "pineapple_chunks", 1 ], @@ -174,7 +175,7 @@ "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "//": "2u for roasting a veggy", - "components": [ [ [ "chili_pepper", 1 ], [ "rehydrated_chili", 1 ] ] ] + "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ], [ "rehydrated_chili", 1 ] ] ] }, { "type": "recipe", @@ -440,6 +441,7 @@ [ "onion", 2 ], [ "can_tomato", 1 ], [ "tomato", 1 ], + [ "tomato_cut", 1 ], [ "jerusalem_artichoke", 1 ], [ "jerusalem_artichoke_boiled", 1 ], [ "groundnut_prepared", 1 ], From eea013cde32e8a6fdbc8f17b46a8df6522233336 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:28:44 -0600 Subject: [PATCH 04/31] added cut produce to recipes Added cut eggplant to recipes: eggplant parmigiana --- data/json/recipes/food/casseroles.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/casseroles.json b/data/json/recipes/food/casseroles.json index 5198f14c08398..7c6096a50958d 100644 --- a/data/json/recipes/food/casseroles.json +++ b/data/json/recipes/food/casseroles.json @@ -136,7 +136,7 @@ "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 44, "LIST" ] ], [ [ "casserole", -1 ] ] ], "components": [ - [ [ "eggplant", 3 ] ], + [ [ "eggplant", 3 ], [ "eggplant_cut", 6 ] ], [ [ "salt", 3 ] ], [ [ "seasoning_italian", 5 ], [ "wild_herbs", 5 ], [ "pepper", 5 ] ], [ [ "any_butter_or_oil", 4, "LIST" ] ], From 47243b2be248306104c0ef2e7c1984640daab3f4 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:33:31 -0600 Subject: [PATCH 05/31] added cut produce to recipes Added cut chili pepper to recipes: fermenting yogurt spiced mead must --- data/json/recipes/food/brewing.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index 6a4d975cf1a98..9747b80c129bb 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -394,6 +394,7 @@ [ [ "chilly-p", 50 ], [ "chili_pepper", 1 ], + [ "chili_pepper_cut", 1 ], [ "rehydrated_chili", 1 ], [ "cinnamon", 25 ], [ "pepper", 50 ], @@ -586,6 +587,7 @@ [ [ "cabbage", 1 ], [ "chili_pepper", 1 ], + [ "chili_pepper_cut", 1 ], [ "rehydrated_chili", 1 ], [ "yoghurt", 1 ], [ "yogurt_starter_culture", 1 ] From 27fc30e87dfad4400b66f6a62b2f61c8cc139ef7 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:35:50 -0600 Subject: [PATCH 06/31] added cut produce to recipes Added cut chili pepper to recipes: dehydrated chili pepper --- data/json/recipes/food/dry.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/food/dry.json b/data/json/recipes/food/dry.json index a8ce69adc571d..47e50139f680b 100644 --- a/data/json/recipes/food/dry.json +++ b/data/json/recipes/food/dry.json @@ -440,7 +440,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 12, "LIST" ] ], [ [ "surface_heat", 2, "LIST" ] ] ], "//": "I pretty much made up all the relating numbers, feel free to change them", - "components": [ [ [ "chili_pepper", 1 ] ] ] + "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] }, { "type": "recipe", @@ -455,7 +455,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 12, "LIST" ] ] ], "//": "I pretty much made up all the relating numbers, feel free to change them", - "components": [ [ [ "chili_pepper", 1 ] ] ] + "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] }, { "type": "recipe", From 6c8337566d4a77fb2732cca3028ddfeb6236a39c Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 16:41:46 -0600 Subject: [PATCH 07/31] added cut produce to recipes Added cut chili pepper to recipes: chili powder --- data/json/recipes/food/milling.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/food/milling.json b/data/json/recipes/food/milling.json index a1ec8bd0427eb..3948c098daa14 100644 --- a/data/json/recipes/food/milling.json +++ b/data/json/recipes/food/milling.json @@ -91,7 +91,7 @@ "batch_time_factors": [ 83, 3 ], "charges": 50, "tools": [ [ [ "surface_heat", 3, "LIST" ] ], [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ], - "components": [ [ [ "chili_pepper", 1 ] ] ] + "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] }, { "type": "recipe", @@ -124,7 +124,7 @@ "charges": 50, "batch_time_factors": [ 95, 10 ], "tools": [ [ [ "food_processor", 10 ] ] ], - "components": [ [ [ "chili_pepper", 1 ] ] ] + "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] }, { "//": "For use by mills, so the only entries used are the charges and components.", From b40fb05838144e472a5ce7631cabbb203f0ec4a1 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 17:18:51 -0600 Subject: [PATCH 08/31] added cut produce to recipes Added cut salad cucumber to recipes: vegetable salad --- data/json/recipes/food/vegetable_dishes.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/food/vegetable_dishes.json b/data/json/recipes/food/vegetable_dishes.json index 95edce6077c33..5d7e3b238d6ca 100644 --- a/data/json/recipes/food/vegetable_dishes.json +++ b/data/json/recipes/food/vegetable_dishes.json @@ -29,6 +29,7 @@ ], [ [ "cucumber", 1 ], + [ "cucumber_cut", 1 ], [ "japanese_knotweed_stem", 2 ], [ "tomato", 1 ], [ "tomato_cut", 1 ], From 7efbf48480bcdc5e6efa45a2cd2a8242aae8b429 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:41:39 -0600 Subject: [PATCH 09/31] added requirements for produce Added requirements for tomato, gherkin cucumber, eggplant, zucchini, salad cucumber, bell pepper, and chili pepper. --- .../json/requirements/cooking_components.json | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 7b3982c40ac5b..14f58af28138b 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -1260,6 +1260,62 @@ ] ] }, + { + "id": "any_tomato", + "type": "requirement", + "//": "Any form of tomato used in cooking", + "components": [ + [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ] + ] + }, + { + "id": "any_gherkin_cucumber", + "type": "requirement", + "//": "Any form of gherkin cucumber used in cooking", + "components": [ + [ [ "gherkin", 1 ], [ "gherkin_cut", 1 ] ] + ] + }, + { + "id": "any_eggplant", + "type": "requirement", + "//": "Any form of eggplant used in cooking", + "components": [ + [ [ "eggplant", 1 ], [ "eggplant_cut", 2 ] ] + ] + }, + { + "id": "any_zucchini", + "type": "requirement", + "//": "Any form of zucchini used in cooking", + "components": [ + [ [ "zucchini", 1 ], [ "zucchini_cut", 1 ] ] + ] + }, + { + "id": "any_salad_cucumber", + "type": "requirement", + "//": "Any form of salad cucumber used in cooking", + "components": [ + [ [ "cucumber", 1 ], [ "cucumber_cut", 1 ] ] + ] + }, + { + "id": "any_bell_pepper", + "type": "requirement", + "//": "Any form of bell pepper used in cooking", + "components": [ + [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ] + ] + }, + { + "id": "any_chili_pepper", + "type": "requirement", + "//": "Any form of chili pepper used in cooking", + "components": [ + [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] + ] + }, { "id": "acorns_processed_any", "type": "requirement", From 75bade8da048aed2cb7151a5170dd53e56adeb0b Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:47:27 -0600 Subject: [PATCH 10/31] Update cooking_components.json --- .../json/requirements/cooking_components.json | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 14f58af28138b..98ba984539e56 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -1264,57 +1264,43 @@ "id": "any_tomato", "type": "requirement", "//": "Any form of tomato used in cooking", - "components": [ - [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ] - ] + "components": [ [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ] ] }, { "id": "any_gherkin_cucumber", "type": "requirement", "//": "Any form of gherkin cucumber used in cooking", - "components": [ - [ [ "gherkin", 1 ], [ "gherkin_cut", 1 ] ] - ] + "components": [ [ [ "gherkin", 1 ], [ "gherkin_cut", 1 ] ] ] }, { "id": "any_eggplant", "type": "requirement", "//": "Any form of eggplant used in cooking", - "components": [ - [ [ "eggplant", 1 ], [ "eggplant_cut", 2 ] ] - ] + "components": [ [ [ "eggplant", 1 ], [ "eggplant_cut", 2 ] ] ] }, { "id": "any_zucchini", "type": "requirement", "//": "Any form of zucchini used in cooking", - "components": [ - [ [ "zucchini", 1 ], [ "zucchini_cut", 1 ] ] - ] + "components": [ [ [ "zucchini", 1 ], [ "zucchini_cut", 1 ] ] ] }, { "id": "any_salad_cucumber", "type": "requirement", "//": "Any form of salad cucumber used in cooking", - "components": [ - [ [ "cucumber", 1 ], [ "cucumber_cut", 1 ] ] - ] + "components": [ [ [ "cucumber", 1 ], [ "cucumber_cut", 1 ] ] ] }, { "id": "any_bell_pepper", "type": "requirement", "//": "Any form of bell pepper used in cooking", - "components": [ - [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ] - ] + "components": [ [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ] ] }, { "id": "any_chili_pepper", "type": "requirement", "//": "Any form of chili pepper used in cooking", - "components": [ - [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] - ] + "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] }, { "id": "acorns_processed_any", From 736bbc50bf9968c332487fe3833e15b4e6a7df47 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:52:29 -0600 Subject: [PATCH 11/31] added rehydrated_chili --- data/json/requirements/cooking_components.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index 98ba984539e56..8ea5db2a9d408 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -1300,7 +1300,7 @@ "id": "any_chili_pepper", "type": "requirement", "//": "Any form of chili pepper used in cooking", - "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] + "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ], [ "rehydrated_chili", 1 ] ] ] }, { "id": "acorns_processed_any", From 78f350db98723f74aacdcca56ac3630c0b024762 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:55:29 -0600 Subject: [PATCH 12/31] changed to requirement --- data/json/recipes/food/brewing.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index 9747b80c129bb..1c691f5b76e83 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -393,9 +393,7 @@ [ [ "honey_bottled", 12 ], [ "honeycomb", 2 ], [ "honey_glassed", 4 ] ], [ [ "chilly-p", 50 ], - [ "chili_pepper", 1 ], - [ "chili_pepper_cut", 1 ], - [ "rehydrated_chili", 1 ], + [ "any_chili_pepper", 1, "LIST" ], [ "cinnamon", 25 ], [ "pepper", 50 ], [ "wild_herbs", 10 ] @@ -586,9 +584,7 @@ [ [ "milk_standard_raw", 9, "LIST" ] ], [ [ "cabbage", 1 ], - [ "chili_pepper", 1 ], - [ "chili_pepper_cut", 1 ], - [ "rehydrated_chili", 1 ], + [ "any_chili_pepper", 1, "LIST" ] [ "yoghurt", 1 ], [ "yogurt_starter_culture", 1 ] ] From 5c2f3a9a5d8c6da4cfecac8aa7d52f14de7e2873 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:57:59 -0600 Subject: [PATCH 13/31] changed to requirement --- data/json/recipes/food/casseroles.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/casseroles.json b/data/json/recipes/food/casseroles.json index 7c6096a50958d..2f86175d60a1f 100644 --- a/data/json/recipes/food/casseroles.json +++ b/data/json/recipes/food/casseroles.json @@ -136,7 +136,7 @@ "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 44, "LIST" ] ], [ [ "casserole", -1 ] ] ], "components": [ - [ [ "eggplant", 3 ], [ "eggplant_cut", 6 ] ], + [ [ "any_eggplant", 3, "LIST" ] ], [ [ "salt", 3 ] ], [ [ "seasoning_italian", 5 ], [ "wild_herbs", 5 ], [ "pepper", 5 ] ], [ [ "any_butter_or_oil", 4, "LIST" ] ], From 5ee175340f04fd7cb7ae314ed4c37f6e8b418811 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:59:42 -0600 Subject: [PATCH 14/31] changed to requirement --- data/json/recipes/food/dry.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/food/dry.json b/data/json/recipes/food/dry.json index 47e50139f680b..d4045bd956361 100644 --- a/data/json/recipes/food/dry.json +++ b/data/json/recipes/food/dry.json @@ -440,7 +440,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 12, "LIST" ] ], [ [ "surface_heat", 2, "LIST" ] ] ], "//": "I pretty much made up all the relating numbers, feel free to change them", - "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] + "components": [ [ [ "any_chili_pepper", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -455,7 +455,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 12, "LIST" ] ] ], "//": "I pretty much made up all the relating numbers, feel free to change them", - "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] + "components": [ [ [ "any_chili_pepper", 1, "LIST" ] ] ] }, { "type": "recipe", From d1b978261f1c0fb93312aefe28123aceff8eb568 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:03:04 -0600 Subject: [PATCH 15/31] changed to requirement --- data/json/recipes/food/meat_dishes.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/json/recipes/food/meat_dishes.json b/data/json/recipes/food/meat_dishes.json index 9e56917fe581b..34b3bc6d87f8d 100644 --- a/data/json/recipes/food/meat_dishes.json +++ b/data/json/recipes/food/meat_dishes.json @@ -42,10 +42,10 @@ [ [ "meat_red_raw", 1, "LIST" ] ], [ [ "salt", 1 ] ], [ [ "onion", 1 ] ], - [ [ "tomato", 2 ], [ "tomato_cut", 2 ] ], + [ [ "any_tomato", 2, "LIST" ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], [ [ "sugar", 1 ] ], - [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ] + [ [ "any_bell_pepper", 1, "LIST" ] ] ], "charges": 6 }, @@ -67,9 +67,9 @@ [ [ "meat_red_raw", 1, "LIST" ], [ "poultry_raw_any", 2, "LIST" ] ], [ [ "salt", 1 ] ], [ [ "onion", 1 ] ], - [ [ "tomato", 1 ], [ "tomato_cut", 1 ] ], + [ [ "any_tomato", 1, "LIST" ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], - [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ], + [ [ "any_bell_pepper", 1, "LIST" ] ], [ [ "garlic_clove", 2 ], [ "rehydrated_garlic", 2 ] ], [ [ "seasoning_mild", 2, "LIST" ] ] ], @@ -93,8 +93,8 @@ [ [ "salt", 1 ] ], [ [ "pepper", 1 ] ], [ [ "onion", 2 ] ], - [ [ "tomato", 4 ], [ "tomato_cut", 4 ] ], - [ [ "bell_pepper", 2 ], [ "bell_pepper_cut", 2 ] ], + [ [ "any_tomato", 4, "LIST" ] ], + [ [ "any_bell_pepper", 2, "LIST" ] ], [ [ "garlic_clove", 2 ], [ "rehydrated_garlic", 2 ] ], [ [ "seasoning_mild", 2, "LIST" ] ], [ [ "yoghurt", 1 ] ] From 2e9713c6c8d92dbab1519b6b4aa2c32a9416ad30 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:04:36 -0600 Subject: [PATCH 16/31] changed to requirement --- data/json/recipes/food/milling.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/food/milling.json b/data/json/recipes/food/milling.json index 3948c098daa14..7ef39e354da12 100644 --- a/data/json/recipes/food/milling.json +++ b/data/json/recipes/food/milling.json @@ -91,7 +91,7 @@ "batch_time_factors": [ 83, 3 ], "charges": 50, "tools": [ [ [ "surface_heat", 3, "LIST" ] ], [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ], - "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] + "components": [ [ [ "any_chili_pepper", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -124,7 +124,7 @@ "charges": 50, "batch_time_factors": [ 95, 10 ], "tools": [ [ [ "food_processor", 10 ] ] ], - "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] + "components": [ [ [ "any_chili_pepper", 1, "LIST" ] ] ] }, { "//": "For use by mills, so the only entries used are the charges and components.", From 96b6e1658095a9f05f903d70151015136d2c5a0b Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:07:37 -0600 Subject: [PATCH 17/31] Update brewing.json --- data/json/recipes/food/brewing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index 1c691f5b76e83..ea2a07199367d 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -584,7 +584,7 @@ [ [ "milk_standard_raw", 9, "LIST" ] ], [ [ "cabbage", 1 ], - [ "any_chili_pepper", 1, "LIST" ] + [ "any_chili_pepper", 1, "LIST" ], [ "yoghurt", 1 ], [ "yogurt_starter_culture", 1 ] ] From a0bbebfdb13da14e22cc6d5f234e025d777846c1 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:11:30 -0600 Subject: [PATCH 18/31] Update brewing.json --- data/json/recipes/food/brewing.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index ea2a07199367d..0670efe811cb0 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -582,12 +582,7 @@ "//": "14u for dairy and 1u for the additive", "components": [ [ [ "milk_standard_raw", 9, "LIST" ] ], - [ - [ "cabbage", 1 ], - [ "any_chili_pepper", 1, "LIST" ], - [ "yoghurt", 1 ], - [ "yogurt_starter_culture", 1 ] - ] + [ [ "cabbage", 1 ], [ "any_chili_pepper", 1, "LIST" ], [ "yoghurt", 1 ], [ "yogurt_starter_culture", 1 ] ] ], "charges": 10 }, From 100cc9064b769e0b866374ce5351fa4ad31679bb Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:16:29 -0600 Subject: [PATCH 19/31] changed to requirement --- data/json/recipes/food/vegetable_dishes.json | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/data/json/recipes/food/vegetable_dishes.json b/data/json/recipes/food/vegetable_dishes.json index 5d7e3b238d6ca..44b8ff9f940cd 100644 --- a/data/json/recipes/food/vegetable_dishes.json +++ b/data/json/recipes/food/vegetable_dishes.json @@ -28,12 +28,9 @@ [ "cabbage", 2 ] ], [ - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], + [ "any_salad_cucumber", 1, "LIST" ], [ "japanese_knotweed_stem", 2 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], - [ "can_tomato", 1 ], + [ "any_tomato", 1, "LIST" ], [ "carrot", 2 ], [ "pineapple_chunks", 1 ], [ "cranberries", 1 ], @@ -176,7 +173,7 @@ "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "//": "2u for roasting a veggy", - "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ], [ "rehydrated_chili", 1 ] ] ] + "components": [ [ [ "any_chili_pepper", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -440,9 +437,7 @@ ], [ [ "onion", 2 ], - [ "can_tomato", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], + [ "any_tomato", 1, "LIST" ], [ "jerusalem_artichoke", 1 ], [ "jerusalem_artichoke_boiled", 1 ], [ "groundnut_prepared", 1 ], From 981b4e3b4c15556f2bafe78eeb17f44db4264855 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:34:58 -0600 Subject: [PATCH 20/31] changed to requirements --- data/json/recipes/recipe_food.json | 74 ++++++++++-------------------- 1 file changed, 25 insertions(+), 49 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 2dfff5e3798a1..0718734d44f4d 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -6093,10 +6093,10 @@ [ "dry_veggy", 2 ], [ "dry_corn", 2 ] ], - [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ], + [ [ "any_tomato", 1, "LIST" ] ], [ [ "meat_cooked", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ], [ [ "can_beans", 1 ], [ "raw_beans", 1 ], [ "dry_beans", 1 ] ], - [ [ "chilly-p", 2 ], [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ], [ "rehydrated_chili", 1 ] ] + [ [ "chilly-p", 2 ], [ "any_chili_pepper", 1, "LIST" ] ] ] }, { @@ -6692,9 +6692,7 @@ [ "pickle", 1 ], [ "veggy_pickled", 1 ], [ "onion", 1 ], - [ "can_tomato", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], + [ "any_tomato", 1, "LIST" ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], [ "lettuce", 1 ] @@ -6731,7 +6729,7 @@ [ [ "cheese_standard", 1, "LIST" ] ], [ [ "pickle", 1 ], [ "veggy_pickled", 1 ], [ "sauerkraut", 1 ] ], [ [ "onion", 1 ] ], - [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ], + [ [ "any_tomato", 1, "LIST" ] ], [ [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], [ "lettuce", 1 ] ], [ [ "ketchup", 1 ], [ "barbecue_sauce", 1 ] ], [ [ "mustard", 1 ], [ "honey_mustard", 1 ] ], @@ -6756,9 +6754,7 @@ [ "pickle", 1 ], [ "veggy_pickled", 1 ], [ "onion", 1 ], - [ "can_tomato", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], + [ "any_tomato", 1, "LIST" ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], [ "lettuce", 1 ] @@ -6793,9 +6789,7 @@ [ [ "onion", 1 ], [ "lemon", 1 ], - [ "can_tomato", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], + [ "any_tomato", 1, "LIST" ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], [ "lettuce", 1 ] @@ -6874,9 +6868,7 @@ [ "grape_leaves", 1 ], [ "cabbage", 1 ], [ "sauerkraut", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], - [ "can_tomato", 1 ], + [ "any_tomato", 1, "LIST" ], [ "pumpkin_cut", 1 ], [ "onion", 1 ], [ "broccoli", 1 ], @@ -6892,17 +6884,14 @@ [ "beans_cooked", 1 ], [ "carrot", 1 ], [ "carrot_wild", 1 ], - [ "zucchini_cut", 1 ], - [ "zucchini", 1 ], + [ "any_zucchini", 1, "LIST" ], [ "lettuce", 1 ], [ "pine_nuts", 1 ], [ "morel_fried", 1 ], [ "veggy_aspic", 1 ], [ "dahlia_baked", 1 ], - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], - [ "gherkin_cut", 1 ], - [ "gherkin", 1 ], + [ "any_salad_cucumber", 1, "LIST" ], + [ "any_gherkin_cucumber", 1, "LIST" ], [ "veggy_pickled", 1 ], [ "cooked_cattail_stalk", 1 ], [ "cooked_burdock_stalk", 1 ], @@ -6970,9 +6959,7 @@ [ "pickle", 1 ], [ "veggy_pickled", 1 ], [ "onion", 1 ], - [ "can_tomato", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], + [ "any_tomato", 1, "LIST" ], [ "lettuce", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ] @@ -7253,7 +7240,7 @@ "//": "4u for meat 1u for sauce = 5u", "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], - [ [ "sauce_red", 2 ], [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ], + [ [ "sauce_red", 2 ], [ "any_tomato", 1, "LIST" ] ], [ [ "meat_red_cooked", 1, "LIST" ] ] ] }, @@ -7458,7 +7445,7 @@ "batch_time_factors": [ 67, 5 ], "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 2 } ], "components": [ - [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "autumn_olive", 1 ] ], + [ [ "any_tomato", 1, "LIST" ], [ "autumn_olive", 1 ] ], [ [ "salt", 2 ], [ "salt_water", 1 ], [ "saline", 2 ], [ "seasoning_salt", 2 ], [ "soysauce", 1 ] ], [ [ "vinegar", 1 ] ] ] @@ -7976,9 +7963,7 @@ [ "grape_leaves", 1 ], [ "cabbage", 1 ], [ "sauerkraut", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], - [ "can_tomato", 1 ], + [ "any_tomato", 1, "LIST" ], [ "pumpkin_cut", 1 ], [ "onion", 1 ], [ "broccoli", 1 ], @@ -7992,15 +7977,13 @@ [ "veggy_canned", 1 ], [ "beans_cooked", 1 ], [ "carrot", 1 ], - [ "zucchini", 1 ], - [ "zucchini_cut", 1 ], + [ "any_zucchini", 1, "LIST" ], [ "lettuce", 1 ], [ "pine_nuts", 1 ], [ "morel_fried", 1 ], [ "veggy_aspic", 1 ], [ "dahlia_baked", 1 ], - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], + [ "any_salad_cucumber", 1, "LIST" ], [ "veggy_pickled", 1 ], [ "cooked_cattail_stalk", 1 ], [ "cooked_burdock_stalk", 1 ], @@ -8034,9 +8017,7 @@ [ "grape_leaves", 1 ], [ "cabbage", 1 ], [ "sauerkraut", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], - [ "can_tomato", 1 ], + [ "any_tomato", 1, "LIST" ], [ "pumpkin_cut", 1 ], [ "onion", 1 ], [ "broccoli", 1 ], @@ -8052,15 +8033,13 @@ [ "beans_cooked", 1 ], [ "carrot", 1 ], [ "carrot_wild", 1 ], - [ "zucchini", 1 ], - [ "zucchini_cut", 1 ], + [ "any_zucchini", 1, "LIST" ], [ "lettuce", 1 ], [ "pine_nuts", 1 ], [ "morel_fried", 1 ], [ "veggy_aspic", 1 ], [ "dahlia_baked", 1 ], - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], + [ "any_salad_cucumber", 1, "LIST" ], [ "veggy_pickled", 1 ], [ "cooked_cattail_stalk", 1 ], [ "cooked_burdock_stalk", 1 ], @@ -9049,7 +9028,7 @@ "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 }, { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "water_boiling_heat", 8, "LIST" ] ] ], "//": "1u water + 1u tomato boils and reduces for 45 min = 2u + 6u", - "components": [ [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] + "components": [ [ [ "any_tomato", 1, "LIST" ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] }, { "type": "recipe", @@ -9185,16 +9164,14 @@ [ "grape_leaves", 2 ], [ "cabbage", 2 ] ], - [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ], [ "onion", 1 ], [ "salsa", 1 ] ], + [ [ "any_tomato", 1, "LIST" ], [ "onion", 1 ], [ "salsa", 1 ] ], [ [ "pepper", 20 ], [ "chilly-p", 20 ], [ "garlic_clove", 6 ], [ "rehydrated_garlic", 1 ], [ "garlic_powder", 20 ], - [ "chili_pepper", 2 ], - [ "chili_pepper_cut", 2 ], - [ "rehydrated_chili", 2 ] + [ "any_chili_pepper", 2, "LIST" ] ] ] }, @@ -9730,8 +9707,7 @@ [ "rehydrated_garlic", 1 ], [ "wild_garlic", 1 ], [ "garlic_powder", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ] + [ "any_tomato", 1, "LIST" ] ], [ [ "water_clean", 1 ] ] ], @@ -9783,7 +9759,7 @@ "book_learn": [ [ "cookbook_mexican", 1 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "CUT", "level": 2 } ], "components": [ - [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ], + [ [ "any_tomato", 1, "LIST" ] ], [ [ "veggy_any_uncooked", 1, "LIST" ], [ "rehydrated_corn_kernels", 1 ], [ "can_beans", 1 ] ], [ [ "salt", 1 ], [ "seasoning_mild", 1, "LIST" ] ] ] @@ -9805,7 +9781,7 @@ "tools": [ [ [ "food_processor", 20 ] ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ - [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ], + [ [ "any_tomato", 1, "LIST" ] ], [ [ "veggy_any_uncooked", 1, "LIST" ], [ "rehydrated_corn_kernels", 1 ], [ "can_beans", 1 ] ], [ [ "salt", 1 ], [ "seasoning_mild", 1, "LIST" ] ] ] From e0a0b4394f90f378fd38c76bff5f9c9a9a7f79e9 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:52:43 -0600 Subject: [PATCH 21/31] more requirement replacement --- data/json/recipes/recipe_food.json | 32 ++++++++++++------------------ 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 0718734d44f4d..3f686911eeebb 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -197,7 +197,7 @@ "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "//": "2u energy to roast 100g vegetable per standard, bell pepper is 110g", "proficiencies": [ { "proficiency": "prof_food_prep" } ], - "components": [ [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ] ] + "components": [ [ [ "any_bell_pepper", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -1363,8 +1363,7 @@ "components": [ [ [ "sushi_rice", 1 ] ], [ - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], + [ "any_salad_cucumber", 1, "LIST" ], [ "carrot", 6 ], [ "carrot_wild", 6 ], [ "celery", 3 ], @@ -1553,8 +1552,7 @@ "components": [ [ [ "fish", 1 ] ], [ - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], + [ "any_salad_cucumber", 1, "LIST" ], [ "carrot", 3 ], [ "carrot_wild", 3 ], [ "celery", 3 ], @@ -3728,9 +3726,9 @@ "autolearn": true, "components": [ [ [ "water_clean", 2 ] ], - [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ], + [ [ "any_tomato", 1, "LIST" ] ], [ [ "broccoli", 1 ] ], - [ [ "zucchini", 1 ], [ "zucchini_cut", 1 ] ] + [ [ "any_zucchini", 1, "LIST" ] ] ] }, { @@ -6009,7 +6007,7 @@ [ "barley", 1 ], [ "buckwheat", 1 ] ], - [ [ "tomato", 1 ], [ "tomato_cut", 1 ], [ "can_tomato", 1 ] ], + [ [ "any_tomato", 1, "LIST" ] ], [ [ "meat_cooked", 1, "LIST" ], [ "dry_meat", 1 ], [ "can_chicken", 1 ] ], [ [ "curry_powder", 4 ], [ "chilly-p", 4 ] ] ] @@ -6059,7 +6057,7 @@ [ "barley", 1 ], [ "buckwheat", 1 ] ], - [ [ "tomato", 1 ], [ "can_tomato", 1 ] ], + [ [ "any_tomato", 1, "LIST" ] ], [ [ "curry_powder", 4 ], [ "chilly-p", 4 ] ] ] }, @@ -6135,8 +6133,7 @@ [ "sauce_red", 1 ], [ "seasoning_italian", 5 ], [ "wild_herbs", 10 ], - [ "tomato", 1 ], - [ "can_tomato", 1 ] + [ "any_tomato", 1, "LIST" ] ], [ [ "water_clean", 1 ] ] ], @@ -7220,7 +7217,7 @@ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "bacon", 1 ] ], [ [ "lettuce", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ] ], - [ [ "can_tomato", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ] + [ [ "any_tomato", 1, "LIST" ] ] ], "charges": 2 }, @@ -7543,7 +7540,7 @@ [ [ "vinegar", 1 ] ], [ [ "saline", 1 ], [ "salt", 2 ] ], [ [ "jar_glass_sealed", 1 ] ], - [ [ "gherkin", 1 ], [ "gherkin_cut", 1 ] ] + [ [ "any_gherkin_cucumber", 1, "LIST" ] ] ] }, { @@ -7748,11 +7745,8 @@ [ "cabbage", 2 ] ], [ - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], - [ "can_tomato", 1 ], + [ "any_salad_cucumber", 1, "LIST" ], + [[ "any_tomato", 1, "LIST" ], [ "carrot", 2 ], [ "carrot_wild", 2 ], [ "pineapple_chunks", 1 ], @@ -8065,7 +8059,7 @@ "qualities": [ { "id": "CUT", "level": 2 } ], "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], - [ [ "cucumber", 1 ], [ "cucumber_cut", 1 ] ], + [ [ "any_salad_cucumber", 1, "LIST" ] ], [ [ "mayonnaise", 1 ], [ "mustard", 1 ], [ "horseradish", 1 ], [ "seasoning_salt", 1 ] ] ] }, From 3351a8a947fb5d6b376dcfdecc3a456e0be9f007 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:04:51 -0600 Subject: [PATCH 22/31] Update recipe_food.json --- 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 3f686911eeebb..af3d2dc53b400 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -7746,7 +7746,7 @@ ], [ [ "any_salad_cucumber", 1, "LIST" ], - [[ "any_tomato", 1, "LIST" ], + [ "any_tomato", 1, "LIST" ], [ "carrot", 2 ], [ "carrot_wild", 2 ], [ "pineapple_chunks", 1 ], From 4d521915f5548394799e5a7780a0936f23321e49 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:07:33 -0600 Subject: [PATCH 23/31] Update recipe_food.json --- data/json/recipes/recipe_food.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index af3d2dc53b400..b1152da6f88ed 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -3724,12 +3724,7 @@ "charges": 3, "time": "5 m", "autolearn": true, - "components": [ - [ [ "water_clean", 2 ] ], - [ [ "any_tomato", 1, "LIST" ] ], - [ [ "broccoli", 1 ] ], - [ [ "any_zucchini", 1, "LIST" ] ] - ] + "components": [ [ [ "water_clean", 2 ] ], [ [ "any_tomato", 1, "LIST" ] ], [ [ "broccoli", 1 ] ], [ [ "any_zucchini", 1, "LIST" ] ] ] }, { "type": "recipe", From f728bd11bc93736299b6193a62a163db1b60c62a Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:13:27 -0600 Subject: [PATCH 24/31] more requirement replacement --- data/json/recipes/food/vegetable_dishes.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/data/json/recipes/food/vegetable_dishes.json b/data/json/recipes/food/vegetable_dishes.json index 44b8ff9f940cd..06fa94695c7e6 100644 --- a/data/json/recipes/food/vegetable_dishes.json +++ b/data/json/recipes/food/vegetable_dishes.json @@ -442,10 +442,8 @@ [ "jerusalem_artichoke_boiled", 1 ], [ "groundnut_prepared", 1 ], [ "potato", 1 ], - [ "zucchini", 1 ], - [ "zucchini_cut", 1 ], - [ "bell_pepper", 1 ], - [ "bell_pepper_cut", 1 ], + [ "any_zucchini", 1, "LIST" ], + [ "any_bell_pepper", 1, "LIST" ], [ "pumpkin_cut", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], From 5c6a1583b874bffd3f41d728e39cc80f08b38631 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:19:58 -0600 Subject: [PATCH 25/31] more requirement replacement --- data/json/recipes/food/casseroles.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/casseroles.json b/data/json/recipes/food/casseroles.json index 2f86175d60a1f..462a25454d6da 100644 --- a/data/json/recipes/food/casseroles.json +++ b/data/json/recipes/food/casseroles.json @@ -19,7 +19,7 @@ [ [ "salt", 7 ], [ "seasoning_salt", 7 ], [ "soysauce", 4 ] ], [ [ "seasoning_italian", 7 ], [ "wild_herbs", 7 ], [ "pepper", 7 ], [ "cinnamon", 7 ], [ "mustard_powder", 7 ] ], [ [ "any_butter_or_oil", 4, "LIST" ] ], - [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ], + [ [ "any_bell_pepper", 1, "LIST" ] ], [ [ "onion", 1 ] ], [ [ "cheese", 6 ], [ "can_cheese", 6 ], [ "cheese_hard", 6 ] ], [ [ "garlic_clove", 1 ], [ "rehydrated_garlic", 1 ] ], From bc9396a1b20657e6a12f59bf1dbb55e02fd28e68 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:34:38 -0600 Subject: [PATCH 26/31] more requirement replacement --- data/json/recipes/food/canned.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 3a3f0e6568b2b..4500c202d5415 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -893,9 +893,9 @@ "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "water_clean", 6 ] ], - [ [ "can_tomato", 4 ], [ "tomato_cut", 4 ], [ "tomato", 4 ] ], + [ [ "any_tomato", 4, "LIST" ] ], [ [ "broccoli", 4 ] ], - [ [ "zucchini", 4 ], [ "zucchini_cut", 4 ] ], + [ [ "any_zucchini", 4, "LIST" ] ], [ [ "canning_acid_large", 1, "LIST" ] ] ] }, @@ -922,7 +922,7 @@ "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "water_clean", 12 ] ], - [ [ "can_tomato", 24 ], [ "tomato", 24 ], [ "tomato_cut", 24 ] ], + [ [ "any_tomato", 24, "LIST" ] ], [ [ "canning_acid_large", 1, "LIST" ] ] ] }, @@ -948,7 +948,7 @@ "//2": "pressure canning is measured in 0.5 liter quantities, so 1u of canning_high_heat.", "components": [ [ [ "jar_glass_sealed", 1 ] ], - [ [ "can_tomato", 4 ], [ "tomato", 4 ], [ "tomato_cut", 4 ] ], + [ [ "any_tomato", 4, "LIST" ] ], [ [ "water_clean", 2 ] ], [ [ "canning_acid_small", 1, "LIST" ] ] ] @@ -2425,7 +2425,7 @@ "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_preservation" }, { "proficiency": "prof_food_canning" } ], "contained": true, "batch_time_factors": [ 83, 5 ], - "components": [ [ [ "can_tomato", 4 ], [ "tomato", 4 ], [ "tomato_cut", 4 ] ], [ [ "water_clean", 5 ] ] ], + "components": [ [ [ "any_tomato", 4, "LIST" ] ], [ [ "water_clean", 5 ] ] ], "using": [ [ "canning_metal", 2, "LIST" ], [ "tincan_medium", 1 ] ], "//1": "tincan canning is measured in 0.25 liter quantities, so 2u of canning_metal.", "byproducts": [ [ "water_clean", 1 ] ] @@ -2445,7 +2445,7 @@ "container": "can_food", "charges": 4, "batch_time_factors": [ 83, 5 ], - "components": [ [ [ "can_tomato", 2 ], [ "tomato", 2 ], [ "tomato_cut", 2 ] ], [ [ "water_clean", 3 ] ] ], + "components": [ [ [ "any_tomato", 2, "LIST" ] ], [ [ "water_clean", 3 ] ] ], "using": [ [ "canning_metal", 1, "LIST" ], [ "tincan_small", 1 ] ], "//1": "tincan canning is measured in 0.25 liter quantities, so 1u of canning_metal.", "byproducts": [ [ "water_clean", 1 ] ] @@ -2465,7 +2465,7 @@ "container": "can_food_big", "charges": 48, "batch_time_factors": [ 83, 5 ], - "components": [ [ [ "can_tomato", 24 ], [ "tomato", 24 ], [ "tomato_cut", 24 ] ], [ [ "water_clean", 30 ] ] ], + "components": [ [ [ "any_tomato", 24, "LIST" ] ], [ [ "water_clean", 30 ] ] ], "using": [ [ "canning_metal", 12, "LIST" ], [ "tincan_large", 1 ] ], "//1": "tincan canning is measured in 0.25 liter quantities, so 12u of canning_metal.", "byproducts": [ [ "water_clean", 6 ] ] From 37c7b0a413c434d7985d6b05c6006560f13215e0 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:39:22 -0600 Subject: [PATCH 27/31] more requirement replacement --- data/json/recipes/food/dairy_products.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/json/recipes/food/dairy_products.json b/data/json/recipes/food/dairy_products.json index 4c756f2c9f8fa..34752d2101628 100644 --- a/data/json/recipes/food/dairy_products.json +++ b/data/json/recipes/food/dairy_products.json @@ -120,14 +120,7 @@ "components": [ [ [ "cottage_cheese", 1 ] ], [ [ "onion", 1 ] ], - [ - [ "bell_pepper", 1 ], - [ "bell_pepper_cut", 1 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], - [ "cucumber", 1 ], - [ "cucumber_cut", 1 ] - ] + [ [ "any_bell_pepper", 1, "LIST" ], [ "any_tomato", 1, "LIST" ], [ "any_salad_cucumber", 1, "LIST" ] ] ] }, { From 7c917701be0efcd9c9b8c4fe20472f4bf76d19a2 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:44:46 -0600 Subject: [PATCH 28/31] more requirement replacement --- data/json/recipes/food/offal_dishes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index 263ebef8e9c39..cff9c4db7f975 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -417,7 +417,7 @@ [ [ "salt", 1 ] ], [ [ "water_clean", 1 ] ], [ [ "mustard", 1 ] ], - [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ] + [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "any_tomato", 1, "LIST" ] ] ] }, { @@ -468,7 +468,7 @@ [ [ "pepper", 6 ] ], [ [ "worthy_wine", 3, "LIST" ] ], [ [ "garlic_clove", 1 ], [ "rehydrated_garlic", 1 ], [ "garlic_powder", 6 ] ], - [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ] + [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "any_tomato", 1, "LIST" ] ] ] }, { @@ -498,7 +498,7 @@ [ [ "sugar_standard", 3, "LIST" ], [ "artificial_sweetener", 42 ] ], [ [ "worthy_wine", 3, "LIST" ] ], [ [ "batter", 4, "LIST" ] ], - [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "tomato", 1 ], [ "tomato_cut", 1 ] ] + [ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "any_tomato", 1, "LIST" ] ] ] }, { From e8042f973c0dcbf9f655ed4fc8f0815903ec4243 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:47:19 -0600 Subject: [PATCH 29/31] more requirement replacement --- 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 346ae96e3e35c..8496ffb920803 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -326,11 +326,11 @@ "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ - [ [ "bell_pepper", 1 ], [ "bell_pepper_cut", 1 ] ], + [ [ "any_bell_pepper", 1, "LIST" ] ], [ [ "onion", 1 ] ], [ [ "salt", 1 ] ], [ [ "pepper", 1 ] ], - [ [ "tomato", 2 ], [ "tomato_cut", 2 ] ], + [ [ "any_tomato", 2, "LIST" ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], [ [ "eggs_bird", 4, "LIST" ] ], [ [ "water", 2 ] ] From cf0b2b9d0f3917d1b7e91e808fa6a87c5b8314fd Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 21:51:15 -0600 Subject: [PATCH 30/31] more requirement replacement --- data/json/recipes/food/pasta.json | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/data/json/recipes/food/pasta.json b/data/json/recipes/food/pasta.json index 3f85f7d049877..bc1b0bdb8b6a9 100644 --- a/data/json/recipes/food/pasta.json +++ b/data/json/recipes/food/pasta.json @@ -56,14 +56,7 @@ "components": [ [ [ "spaghetti_raw", 1 ] ], [ [ "water_clean", 1 ] ], - [ - [ "seasoning_italian", 4 ], - [ "sauce_red", 2 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], - [ "can_tomato", 1 ], - [ "wild_herbs", 10 ] - ], + [ [ "seasoning_italian", 4 ], [ "sauce_red", 2 ], [ "any_tomato", 1, "LIST" ], [ "wild_herbs", 10 ] ], [ [ "meat_red", 1, "LIST" ], [ "meatball", 2 ] ] ] }, @@ -86,14 +79,7 @@ "components": [ [ [ "lasagne_raw", 1 ] ], [ [ "water_clean", 1 ] ], - [ - [ "seasoning_italian", 4 ], - [ "sauce_red", 2 ], - [ "tomato", 1 ], - [ "tomato_cut", 1 ], - [ "can_tomato", 1 ], - [ "wild_herbs", 10 ] - ], + [ [ "seasoning_italian", 4 ], [ "sauce_red", 2 ], [ "any_tomato", 1, "LIST" ], [ "wild_herbs", 10 ] ], [ [ "cheese_standard", 1, "LIST" ] ], [ [ "meat_cooked", 1, "LIST" ], [ "can_chicken", 1 ], [ "dry_meat", 1 ] ] ] From cec30b8ee2f83de18475cc557638fa64d6647653 Mon Sep 17 00:00:00 2001 From: FauxNight <166245728+FauxNight@users.noreply.github.com> Date: Mon, 9 Dec 2024 22:01:51 -0600 Subject: [PATCH 31/31] fixed crafting loop --- data/json/recipes/food/dry.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/food/dry.json b/data/json/recipes/food/dry.json index d4045bd956361..47e50139f680b 100644 --- a/data/json/recipes/food/dry.json +++ b/data/json/recipes/food/dry.json @@ -440,7 +440,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 12, "LIST" ] ], [ [ "surface_heat", 2, "LIST" ] ] ], "//": "I pretty much made up all the relating numbers, feel free to change them", - "components": [ [ [ "any_chili_pepper", 1, "LIST" ] ] ] + "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] }, { "type": "recipe", @@ -455,7 +455,7 @@ "batch_time_factors": [ 67, 5 ], "tools": [ [ [ "dehydrating_heat", 12, "LIST" ] ] ], "//": "I pretty much made up all the relating numbers, feel free to change them", - "components": [ [ [ "any_chili_pepper", 1, "LIST" ] ] ] + "components": [ [ [ "chili_pepper", 1 ], [ "chili_pepper_cut", 1 ] ] ] }, { "type": "recipe",