not irradiated

sadly wine is also not working. Due vat transformation. Pulp is a byproduct, doesn't inherit anything. Comment fix Update drink.json extra names Update recipes.json Update recipes.json Update egg.json fixes and completion
cataclysmbnteam · Jun 4, 2024 · 3fc3d43 · 3fc3d43
1 parent e03918c
commit 3fc3d43
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 160 deletions.
diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
@@ -333,6 +333,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cranberry_juice",
+    "//": "should not be obsoleted together with its recipe, because generic juice spawns as juice.",
     "name": "cranberry juice",
     "weight": "250 g",
     "color": "magenta",
@@ -532,7 +533,35 @@
   {
     "type": "COMESTIBLE",
     "id": "juice",
-    "name": "fruit juice",
+    "name": "juice",
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "apple", "name": { "str_sp": "apple %s" } },
+      { "type": "COMPONENT_ID", "condition": "apricot", "name": { "str_sp": "apricot %s" } },
+      { "type": "COMPONENT_ID", "condition": "banana", "name": { "str_sp": "banana %s" } },
+      { "type": "COMPONENT_ID", "condition": "blackberries", "name": { "str_sp": "blackberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "blueberries", "name": { "str_sp": "blueberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "cherries", "name": { "str_sp": "cherry %s" } },
+      { "type": "COMPONENT_ID", "condition": "cranberries", "name": { "str_sp": "cranberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "grapefruit", "name": { "str_sp": "grapefruit %s" } },
+      { "type": "COMPONENT_ID", "condition": "grapes", "name": { "str_sp": "grape %s" } },
+      { "type": "COMPONENT_ID", "condition": "kiwi", "name": { "str_sp": "kiwi %s" } },
+      { "type": "COMPONENT_ID", "condition": "mango", "name": { "str_sp": "mango %s" } },
+      { "type": "COMPONENT_ID", "condition": "melon", "name": { "str_sp": "melon %s" } },
+      { "type": "COMPONENT_ID", "condition": "orange", "name": { "str_sp": "orange %s" } },
+      { "type": "COMPONENT_ID", "condition": "papaya", "name": { "str_sp": "papaya %s" } },
+      { "type": "COMPONENT_ID", "condition": "peach", "name": { "str_sp": "peach %s" } },
+      { "type": "COMPONENT_ID", "condition": "pear", "name": { "str_sp": "pear %s" } },
+      { "type": "COMPONENT_ID", "condition": "pineapple", "name": { "str_sp": "pineapple %s" } },
+      { "type": "COMPONENT_ID", "condition": "plums", "name": { "str_sp": "plum %s" } },
+      { "type": "COMPONENT_ID", "condition": "pomegranate", "name": { "str_sp": "pomegranate %s" } },
+      { "type": "COMPONENT_ID", "condition": "raspberries", "name": { "str_sp": "raspberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "rose_hips", "name": { "str_sp": "rose_hip %s" } },
+      { "type": "COMPONENT_ID", "condition": "strawberries", "name": { "str_sp": "strawberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "huckleberries", "name": { "str_sp": "huckleberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "mulberries", "name": { "str_sp": "mulberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "elderberries", "name": { "str_sp": "elderberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon %s" } }
+    ],
     "weight": "125 g",
     "color": "light_red",
     "spoils_in": "5 days",
@@ -761,6 +790,7 @@
   {
     "type": "COMESTIBLE",
     "id": "oj",
+    "//": "should not be obsoleted together with its recipe, because generic juice spawns as juice.",
     "name": "orange juice",
     "weight": "263 g",
     "color": "yellow",
@@ -779,7 +809,7 @@
     "volume": "250 ml",
     "phase": "liquid",
     "flags": [ "EATEN_COLD" ],
-    "//": "most store-bought oj is fortified with calcium.",
+    "//2": "most store-bought oj is fortified with calcium.",
     "vitamins": [ [ "vitA", 2 ], [ "vitC", 146 ], [ "calcium", 28 ], [ "iron", 2 ] ],
     "fun": 3
   },

diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -352,11 +352,11 @@
     "id": "boiled_egg_condiment",
     "name": { "str": "boiled egg with condiment" },
     "conditional_names": [
-      { "type": "COMPONENT_ID", "condition": "ketchup", "name": "boiled egg with ketchup" },
-      { "type": "COMPONENT_ID", "condition": "mayonnaise", "name": "boiled egg with mayonnaise" },
-      { "type": "COMPONENT_ID", "condition": "mustard", "name": "boiled egg with mustard" },
-      { "type": "COMPONENT_ID", "condition": "horseradish", "name": "boiled egg with horseradish" },
-      { "type": "COMPONENT_ID", "condition": "salt", "name": "salted boiled egg" }
+      { "type": "COMPONENT_ID", "condition": "ketchup", "name": { "str": "%s with ketchup" } },
+      { "type": "COMPONENT_ID", "condition": "mayonnaise", "name": { "str": "%s with mayonnaise" } },
+      { "type": "COMPONENT_ID", "condition": "mustard", "name": { "str": "%s with mustard" } },
+      { "type": "COMPONENT_ID", "condition": "horseradish", "name": { "str": "%s with horseradish" } },
+      { "type": "COMPONENT_ID", "condition": "salt", "name": { "str": "salted boiled egg" } }
     ],
     "copy-from": "boiled_egg",
     "quench": 0,

diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
@@ -22,6 +22,34 @@
     "type": "COMESTIBLE",
     "id": "fruit_leather",
     "name": "fruit leather",
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "apple", "name": { "str_sp": "apple %s" } },
+      { "type": "COMPONENT_ID", "condition": "apricot", "name": { "str_sp": "apricot %s" } },
+      { "type": "COMPONENT_ID", "condition": "banana", "name": { "str_sp": "banana %s" } },
+      { "type": "COMPONENT_ID", "condition": "blackberries", "name": { "str_sp": "blackberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "blueberries", "name": { "str_sp": "blueberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "cherries", "name": { "str_sp": "cherry %s" } },
+      { "type": "COMPONENT_ID", "condition": "cranberries", "name": { "str_sp": "cranberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "grapefruit", "name": { "str_sp": "grapefruit %s" } },
+      { "type": "COMPONENT_ID", "condition": "grapes", "name": { "str_sp": "grape %s" } },
+      { "type": "COMPONENT_ID", "condition": "kiwi", "name": { "str_sp": "kiwi %s" } },
+      { "type": "COMPONENT_ID", "condition": "mango", "name": { "str_sp": "mango %s" } },
+      { "type": "COMPONENT_ID", "condition": "melon", "name": { "str_sp": "melon %s" } },
+      { "type": "COMPONENT_ID", "condition": "orange", "name": { "str_sp": "orange %s" } },
+      { "type": "COMPONENT_ID", "condition": "papaya", "name": { "str_sp": "papaya %s" } },
+      { "type": "COMPONENT_ID", "condition": "peach", "name": { "str_sp": "peach %s" } },
+      { "type": "COMPONENT_ID", "condition": "pear", "name": { "str_sp": "pear %s" } },
+      { "type": "COMPONENT_ID", "condition": "pineapple", "name": { "str_sp": "pineapple %s" } },
+      { "type": "COMPONENT_ID", "condition": "plums", "name": { "str_sp": "plum %s" } },
+      { "type": "COMPONENT_ID", "condition": "pomegranate", "name": { "str_sp": "pomegranate %s" } },
+      { "type": "COMPONENT_ID", "condition": "raspberries", "name": { "str_sp": "raspberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "rose_hips", "name": { "str_sp": "rose_hip %s" } },
+      { "type": "COMPONENT_ID", "condition": "strawberries", "name": { "str_sp": "strawberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "huckleberries", "name": { "str_sp": "huckleberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "mulberries", "name": { "str_sp": "mulberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "elderberries", "name": { "str_sp": "elderberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon %s" } }
+    ],
     "weight": "34 g",
     "color": "pink",
     "container": "bag_plastic",
@@ -123,6 +151,34 @@
     "type": "COMESTIBLE",
     "id": "fruit_cooked",
     "name": "cooked fruit",
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "apple", "name": "cooked apple" },
+      { "type": "COMPONENT_ID", "condition": "apricot", "name": "cooked apricot" },
+      { "type": "COMPONENT_ID", "condition": "banana", "name": "cooked banana" },
+      { "type": "COMPONENT_ID", "condition": "blackberries", "name": "cooked blackberry" },
+      { "type": "COMPONENT_ID", "condition": "blueberries", "name": "cooked blueberry" },
+      { "type": "COMPONENT_ID", "condition": "cherries", "name": "cooked cherry" },
+      { "type": "COMPONENT_ID", "condition": "cranberries", "name": "cooked cranberry" },
+      { "type": "COMPONENT_ID", "condition": "grapefruit", "name": "cooked grapefruit" },
+      { "type": "COMPONENT_ID", "condition": "grapes", "name": "cooked grape" },
+      { "type": "COMPONENT_ID", "condition": "kiwi", "name": "cooked kiwi" },
+      { "type": "COMPONENT_ID", "condition": "mango", "name": "cooked mango" },
+      { "type": "COMPONENT_ID", "condition": "melon", "name": "cooked melon" },
+      { "type": "COMPONENT_ID", "condition": "orange", "name": "cooked orange" },
+      { "type": "COMPONENT_ID", "condition": "papaya", "name": "cooked papaya" },
+      { "type": "COMPONENT_ID", "condition": "peach", "name": "cooked peach" },
+      { "type": "COMPONENT_ID", "condition": "pear", "name": "cooked pear" },
+      { "type": "COMPONENT_ID", "condition": "pineapple", "name": "cooked pineapple" },
+      { "type": "COMPONENT_ID", "condition": "plums", "name": "cooked plum" },
+      { "type": "COMPONENT_ID", "condition": "pomegranate", "name": "cooked pomegranate" },
+      { "type": "COMPONENT_ID", "condition": "raspberries", "name": "cooked raspberry" },
+      { "type": "COMPONENT_ID", "condition": "rose_hips", "name": "cooked rose_hip" },
+      { "type": "COMPONENT_ID", "condition": "strawberries", "name": "cooked strawberry" },
+      { "type": "COMPONENT_ID", "condition": "huckleberries", "name": "cooked huckleberry" },
+      { "type": "COMPONENT_ID", "condition": "mulberries", "name": "cooked mulberry" },
+      { "type": "COMPONENT_ID", "condition": "elderberries", "name": "cooked elderberry" },
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": "cooked watermelon" }
+    ],
     "weight": "150 g",
     "color": "red",
     "spoils_in": "3 days 18 hours",
@@ -144,7 +200,35 @@
   {
     "type": "COMESTIBLE",
     "id": "jam_fruit",
-    "name": "fruit jam",
+    "name": { "str_sp": "jam" },
+    "conditional_names": [
+      { "type": "COMPONENT_ID", "condition": "apple", "name": { "str_sp": "apple %s" } },
+      { "type": "COMPONENT_ID", "condition": "apricot", "name": { "str_sp": "apricot %s" } },
+      { "type": "COMPONENT_ID", "condition": "banana", "name": { "str_sp": "banana %s" } },
+      { "type": "COMPONENT_ID", "condition": "blackberries", "name": { "str_sp": "blackberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "blueberries", "name": { "str_sp": "blueberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "cherries", "name": { "str_sp": "cherry %s" } },
+      { "type": "COMPONENT_ID", "condition": "cranberries", "name": { "str_sp": "cranberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "grapefruit", "name": { "str_sp": "grapefruit %s" } },
+      { "type": "COMPONENT_ID", "condition": "grapes", "name": { "str_sp": "grape %s" } },
+      { "type": "COMPONENT_ID", "condition": "kiwi", "name": { "str_sp": "kiwi %s" } },
+      { "type": "COMPONENT_ID", "condition": "mango", "name": { "str_sp": "mango %s" } },
+      { "type": "COMPONENT_ID", "condition": "melon", "name": { "str_sp": "melon %s" } },
+      { "type": "COMPONENT_ID", "condition": "orange", "name": { "str_sp": "orange %s" } },
+      { "type": "COMPONENT_ID", "condition": "papaya", "name": { "str_sp": "papaya %s" } },
+      { "type": "COMPONENT_ID", "condition": "peach", "name": { "str_sp": "peach %s" } },
+      { "type": "COMPONENT_ID", "condition": "pear", "name": { "str_sp": "pear %s" } },
+      { "type": "COMPONENT_ID", "condition": "pineapple", "name": { "str_sp": "pineapple %s" } },
+      { "type": "COMPONENT_ID", "condition": "plums", "name": { "str_sp": "plum %s" } },
+      { "type": "COMPONENT_ID", "condition": "pomegranate", "name": { "str_sp": "pomegranate %s" } },
+      { "type": "COMPONENT_ID", "condition": "raspberries", "name": { "str_sp": "raspberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "rose_hips", "name": { "str_sp": "rose_hip %s" } },
+      { "type": "COMPONENT_ID", "condition": "strawberries", "name": { "str_sp": "strawberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "huckleberries", "name": { "str_sp": "huckleberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "mulberries", "name": { "str_sp": "mulberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "elderberries", "name": { "str_sp": "elderberry %s" } },
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon %s" } }
+    ],
     "weight": "15 g",
     "color": "red",
     "spoils_in": "10 days",

diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json
@@ -3348,5 +3348,51 @@
     "type": "recipe",
     "result": "barrel_big",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "oj",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "oj",
+    "id_suffix": "jarred",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "oj",
+    "id_suffix": "canned",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "oj",
+    "id_suffix": "jarred_3l",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "cranberry_juice",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "cranberry_juice",
+    "id_suffix": "canned",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "cranberry_juice",
+    "id_suffix": "jarred",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "cranberry_juice",
+    "id_suffix": "jarred_3l",
+    "obsolete": true
   }
 ]
diff --git a/data/json/recipes/food/drinks.json b/data/json/recipes/food/drinks.json
@@ -432,34 +432,6 @@
       [ [ "water", 1 ], [ "water_clean", 1 ] ]
     ]
   },
-  {
-    "type": "recipe",
-    "result": "oj",
-    "byproducts": [ [ "juice_pulp", 2 ] ],
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_DRINKS",
-    "skill_used": "cooking",
-    "difficulty": 1,
-    "time": "5 m",
-    "autolearn": true,
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "rag", -1 ] ] ],
-    "components": [ [ [ "irradiated_orange", 2 ], [ "orange", 2 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "result": "cranberry_juice",
-    "byproducts": [ [ "juice_pulp", 2 ] ],
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_DRINKS",
-    "skill_used": "cooking",
-    "difficulty": 1,
-    "time": "5 m",
-    "autolearn": true,
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ],
-    "tools": [ [ [ "rag", -1 ] ] ],
-    "components": [ [ [ "cranberries", 3 ], [ "irradiated_cranberries", 3 ] ], [ [ "water_clean", 1 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "apple_cider",