and milkshake

cataclysmbnteam · Jun 4, 2024 · 8d334f6 · 8d334f6
1 parent b2a084c
commit 8d334f6
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 20 deletions.
diff --git a/data/json/items/comestibles/frozen.json b/data/json/items/comestibles/frozen.json
@@ -3,6 +3,34 @@
     "type": "COMESTIBLE",
     "id": "milkshake",
     "name": { "str": "milkshake" },
+    "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" } }
+    ],
     "//": "they bring the boys to the yard",
     "description": "An all-natural cold beverage made with milk and sweeteners.  Tastes great when frozen.",
     "weight": "160 g",
@@ -42,6 +70,34 @@
     "type": "COMESTIBLE",
     "copy-from": "milkshake",
     "id": "milkshake_deluxe",
+    "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" } }
+    ],
     "name": { "str": "deluxe milkshake" },
     "description": "This milkshake has been enhanced with added sweeteners, and even has a cherry on top.  Tastes great, but is fairly awful for your health.",
     "calories": 265,

diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json
@@ -1494,16 +1494,8 @@
         [ "candy3", 1 ],
         [ "maple_candy", 1 ],
         [ "syrup", 1 ],
-        [ "strawberries", 1 ],
-        [ "strawberries_cooked", 1 ],
-        [ "irradiated_strawberries", 1 ],
-        [ "blueberries", 1 ],
-        [ "blueberries_cooked", 1 ],
-        [ "irradiated_blueberries", 1 ],
-        [ "blackberries", 1 ],
-        [ "irradiated_blackberries", 1 ],
-        [ "cherries", 1 ],
-        [ "irradiated_cherries", 1 ]
+        [ "sweet_fruit_like", 1, "LIST" ],
+        [ "jam_fruit", 1 ]
       ],
       [ [ "sugar", 10 ] ],
       [ [ "water_clean", 1 ] ]
@@ -1527,16 +1519,8 @@
         [ "candy3", 2 ],
         [ "maple_candy", 2 ],
         [ "syrup", 2 ],
-        [ "strawberries", 2 ],
-        [ "strawberries_cooked", 2 ],
-        [ "irradiated_strawberries", 2 ],
-        [ "blueberries", 2 ],
-        [ "blueberries_cooked", 2 ],
-        [ "irradiated_blueberries", 2 ],
-        [ "blackberries", 2 ],
-        [ "irradiated_blackberries", 2 ],
-        [ "cherries", 2 ],
-        [ "irradiated_cherries", 2 ]
+        [ "sweet_fruit_like", 2, "LIST" ],
+        [ "jam_fruit", 2 ]
       ],
       [ [ "sugar", 20 ] ],
       [ [ "water_clean", 1 ] ]