Merge pull request #78454 from FauxNight/cvr

Add cut produce to more recipes
CleverRaven · Dec 10, 2024 · 9a07e2b · 9a07e2b
2 parents 9d74689 + cec30b8
commit 9a07e2b
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 134 deletions.
diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json
@@ -393,8 +393,7 @@
       [ [ "honey_bottled", 12 ], [ "honeycomb", 2 ], [ "honey_glassed", 4 ] ],
       [
         [ "chilly-p", 50 ],
-        [ "chili_pepper", 1 ],
-        [ "rehydrated_chili", 1 ],
+        [ "any_chili_pepper", 1, "LIST" ],
         [ "cinnamon", 25 ],
         [ "pepper", 50 ],
         [ "wild_herbs", 10 ]
@@ -583,13 +582,7 @@
     "//": "14u for dairy and 1u for the additive",
     "components": [
       [ [ "milk_standard_raw", 9, "LIST" ] ],
-      [
-        [ "cabbage", 1 ],
-        [ "chili_pepper", 1 ],
-        [ "rehydrated_chili", 1 ],
-        [ "yoghurt", 1 ],
-        [ "yogurt_starter_culture", 1 ]
-      ]
+      [ [ "cabbage", 1 ], [ "any_chili_pepper", 1, "LIST" ], [ "yoghurt", 1 ], [ "yogurt_starter_culture", 1 ] ]
     ],
     "charges": 10
   },

diff --git 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 ] ]

diff --git 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 ] ],
@@ -136,7 +136,7 @@
     "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 44, "LIST" ] ], [ [ "casserole", -1 ] ] ],
     "components": [
-      [ [ "eggplant", 3 ] ],
+      [ [ "any_eggplant", 3, "LIST" ] ],
       [ [ "salt", 3 ] ],
       [ [ "seasoning_italian", 5 ], [ "wild_herbs", 5 ], [ "pepper", 5 ] ],
       [ [ "any_butter_or_oil", 4, "LIST" ] ],

diff --git 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" ] ]
     ]
   },
   {

diff --git 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",

diff --git 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 ] ],
+      [ [ "any_tomato", 2, "LIST" ] ],
       [ [ "any_butter_or_oil", 1, "LIST" ] ],
       [ [ "sugar", 1 ] ],
-      [ [ "bell_pepper", 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 ] ],
+      [ [ "any_tomato", 1, "LIST" ] ],
       [ [ "any_butter_or_oil", 1, "LIST" ] ],
-      [ [ "bell_pepper", 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 ] ],
-      [ [ "bell_pepper", 2 ] ],
+      [ [ "any_tomato", 4, "LIST" ] ],
+      [ [ "any_bell_pepper", 2, "LIST" ] ],
       [ [ "garlic_clove", 2 ], [ "rehydrated_garlic", 2 ] ],
       [ [ "seasoning_mild", 2, "LIST" ] ],
       [ [ "yoghurt", 1 ] ]

diff --git 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": [ [ [ "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 ] ] ]
+    "components": [ [ [ "any_chili_pepper", 1, "LIST" ] ] ]
   },
   {
     "//": "For use by mills, so the only entries used are the charges and components.",

diff --git 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" ] ]
     ]
   },
   {

diff --git 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 ] ]

diff --git 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 ] ]
     ]

diff --git a/data/json/recipes/food/vegetable_dishes.json b/data/json/recipes/food/vegetable_dishes.json
@@ -28,10 +28,9 @@
         [ "cabbage", 2 ]
       ],
       [
-        [ "cucumber", 1 ],
+        [ "any_salad_cucumber", 1, "LIST" ],
         [ "japanese_knotweed_stem", 2 ],
-        [ "tomato", 1 ],
-        [ "can_tomato", 1 ],
+        [ "any_tomato", 1, "LIST" ],
         [ "carrot", 2 ],
         [ "pineapple_chunks", 1 ],
         [ "cranberries", 1 ],
@@ -174,7 +173,7 @@
     "qualities": [ { "id": "COOK", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
     "//": "2u for roasting a veggy",
-    "components": [ [ [ "chili_pepper", 1 ], [ "rehydrated_chili", 1 ] ] ]
+    "components": [ [ [ "any_chili_pepper", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",
@@ -438,16 +437,13 @@
       ],
       [
         [ "onion", 2 ],
-        [ "can_tomato", 1 ],
-        [ "tomato", 1 ],
+        [ "any_tomato", 1, "LIST" ],
         [ "jerusalem_artichoke", 1 ],
         [ "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 ] ],