Fix woods soup being treated as a meat material when eggs were used (#…

…48499)
CleverRaven · Jun 21, 2021 · 0d1fe44 · 0d1fe44
1 parent 5dbecdd
commit 0d1fe44
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 5 deletions.
diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json
@@ -179,7 +179,7 @@
   {
     "type": "COMESTIBLE",
     "id": "soup_woods",
-    "name": { "str": "woods soup" },
+    "name": { "str": "woods meat soup" },
     "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": "Mirkwood soup" } ],
     "weight": "250 g",
     "color": "red",
@@ -201,6 +201,31 @@
     "vitamins": [ [ "vitA", 20 ], [ "vitC", 9 ], [ "iron", 3 ], [ "vitB", 5 ] ],
     "fun": 1
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "soup_woods_egg",
+    "name": { "str": "woods egg soup" },
+    "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": "Mirkwood soup" } ],
+    "weight": "250 g",
+    "color": "red",
+    "spoils_in": "5 days",
+    "container": "can_medium",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": 8,
+    "healthy": 1,
+    "calories": 304,
+    "description": "A nutritious and delicious soup, made of gifts of nature.",
+    "price": 350,
+    "price_postapoc": 100,
+    "material": [ "egg", "veggy" ],
+    "volume": "500 ml",
+    "charges": 2,
+    "phase": "liquid",
+    "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
+    "vitamins": [ [ "vitA", 20 ], [ "vitC", 9 ], [ "iron", 3 ], [ "vitB", 5 ] ],
+    "fun": 1
+  },
   {
     "type": "COMESTIBLE",
     "id": "soup_chicken",

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -2585,6 +2585,22 @@
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
     "using": [ [ "woods_soup_ingredients", 1 ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "soup_woods_egg",
+    "charges": 2,
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "skill_used": "cooking",
+    "difficulty": 3,
+    "time": "20 m",
+    "autolearn": true,
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
+    "using": [ [ "woods_soup_ingredients_veggy", 1 ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
@@ -443,10 +443,7 @@
         [ "can_tuna", 1 ],
         [ "sausage", 1 ],
         [ "sausage_cooked", 1 ],
-        [ "bratwurst_sausage", 1 ],
-        [ "powder_eggs", 2 ],
-        [ "eggs_bird", 2, "LIST" ],
-        [ "egg_reptile", 2 ]
+        [ "bratwurst_sausage", 1 ]
       ],
       [
         [ "veggy_wild", 2 ],
@@ -473,6 +470,34 @@
       ]
     ]
   },
+  {
+    "id": "woods_soup_ingredients_veggy",
+    "type": "requirement",
+    "components": [
+      [ [ "broth", 2 ], [ "broth_bone", 2 ], [ "pine_tea", 2 ] ],
+      [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ],
+      [
+        [ "veggy_wild", 2 ],
+        [ "veggy", 2 ],
+        [ "rehydrated_veggy", 2 ],
+        [ "dry_veggy", 2 ],
+        [ "dry_beans", 2 ],
+        [ "can_beans", 2 ],
+        [ "raw_beans", 2 ],
+        [ "beans_cooked", 2 ],
+        [ "dry_lentils", 2 ],
+        [ "raw_lentils", 2 ],
+        [ "dry_rice", 2 ],
+        [ "dandelion_cooked", 2 ],
+        [ "burdock_cooked", 2 ],
+        [ "mushroom", 2 ],
+        [ "dry_mushroom", 2 ],
+        [ "mushroom_cooked", 2 ],
+        [ "morel_cooked", 2 ],
+        [ "acorns_cooked", 2 ]
+      ]
+    ]
+  },
   {
     "id": "any_fat",
     "type": "requirement",