not irradiated

cataclysmbnteam · Jun 4, 2024 · 788a3c4 · 788a3c4
1 parent a32a82f
commit 788a3c4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 162 deletions.
diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json
@@ -474,33 +474,7 @@
       { "type": "COMPONENT_ID", "condition": "huckleberries", "name": { "str_sp": "huckleberry wine" } },
       { "type": "COMPONENT_ID", "condition": "mulberries", "name": { "str_sp": "mulberry wine" } },
       { "type": "COMPONENT_ID", "condition": "elderberries", "name": { "str_sp": "elderberry wine" } },
-      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apple", "name": { "str_sp": "apple wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apricot", "name": { "str_sp": "apricot wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_banana", "name": { "str_sp": "banana wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blackberries", "name": { "str_sp": "blackberry wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blueberries", "name": { "str_sp": "blueberry wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cherries", "name": { "str_sp": "cherry wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cranberries", "name": { "str_sp": "cranberry wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapefruit", "name": { "str_sp": "grapefruit wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapes", "name": { "str_sp": "grape wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_kiwi", "name": { "str_sp": "kiwi wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mango", "name": { "str_sp": "mango wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_melon", "name": { "str_sp": "melon wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_orange", "name": { "str_sp": "orange wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_papaya", "name": { "str_sp": "papaya wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_peach", "name": { "str_sp": "peach wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pear", "name": { "str_sp": "pear wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pineapple", "name": { "str_sp": "pineapple wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_plums", "name": { "str_sp": "plum wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pomegranate", "name": { "str_sp": "pomegranate wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_raspberries", "name": { "str_sp": "raspberry wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_rose_hips", "name": { "str_sp": "rose_hip wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_strawberries", "name": { "str_sp": "strawberry wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_huckleberries", "name": { "str_sp": "huckleberry wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mulberries", "name": { "str_sp": "mulberry wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_elderberries", "name": { "str_sp": "elderberry wine" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_watermelon", "name": { "str_sp": "watermelon wine" } }
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon wine" } }
     ],
     "weight": "36 g",
     "color": "light_red",

diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
@@ -559,33 +559,7 @@
       { "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" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apple", "name": { "str_sp": "apple %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apricot", "name": { "str_sp": "apricot %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_banana", "name": { "str_sp": "banana %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blackberries", "name": { "str_sp": "blackberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blueberries", "name": { "str_sp": "blueberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cherries", "name": { "str_sp": "cherry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cranberries", "name": { "str_sp": "cranberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapefruit", "name": { "str_sp": "grapefruit %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapes", "name": { "str_sp": "grape %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_kiwi", "name": { "str_sp": "kiwi %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mango", "name": { "str_sp": "mango %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_melon", "name": { "str_sp": "melon %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_orange", "name": { "str_sp": "orange %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_papaya", "name": { "str_sp": "papaya %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_peach", "name": { "str_sp": "peach %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pear", "name": { "str_sp": "pear %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pineapple", "name": { "str_sp": "pineapple %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_plums", "name": { "str_sp": "plum %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pomegranate", "name": { "str_sp": "pomegranate %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_raspberries", "name": { "str_sp": "raspberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_rose_hips", "name": { "str_sp": "rose_hip %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_strawberries", "name": { "str_sp": "strawberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_huckleberries", "name": { "str_sp": "huckleberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mulberries", "name": { "str_sp": "mulberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_elderberries", "name": { "str_sp": "elderberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_watermelon", "name": { "str_sp": "watermelon %s" } }
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon %s" } }
     ],
     "weight": "125 g",
     "color": "light_red",

diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
@@ -48,33 +48,7 @@
       { "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" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apple", "name": { "str_sp": "apple %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apricot", "name": { "str_sp": "apricot %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_banana", "name": { "str_sp": "banana %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blackberries", "name": { "str_sp": "blackberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blueberries", "name": { "str_sp": "blueberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cherries", "name": { "str_sp": "cherry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cranberries", "name": { "str_sp": "cranberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapefruit", "name": { "str_sp": "grapefruit %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapes", "name": { "str_sp": "grape %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_kiwi", "name": { "str_sp": "kiwi %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mango", "name": { "str_sp": "mango %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_melon", "name": { "str_sp": "melon %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_orange", "name": { "str_sp": "orange %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_papaya", "name": { "str_sp": "papaya %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_peach", "name": { "str_sp": "peach %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pear", "name": { "str_sp": "pear %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pineapple", "name": { "str_sp": "pineapple %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_plums", "name": { "str_sp": "plum %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pomegranate", "name": { "str_sp": "pomegranate %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_raspberries", "name": { "str_sp": "raspberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_rose_hips", "name": { "str_sp": "rose_hip %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_strawberries", "name": { "str_sp": "strawberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_huckleberries", "name": { "str_sp": "huckleberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mulberries", "name": { "str_sp": "mulberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_elderberries", "name": { "str_sp": "elderberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_watermelon", "name": { "str_sp": "watermelon %s" } }
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon %s" } }
     ],
     "weight": "34 g",
     "color": "pink",
@@ -203,33 +177,7 @@
       { "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" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apple", "name": "cooked apple" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apricot", "name": "cooked apricot" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_banana", "name": "cooked banana" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blackberries", "name": "cooked blackberry" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blueberries", "name": "cooked blueberry" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cherries", "name": "cooked cherry" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cranberries", "name": "cooked cranberry" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapefruit", "name": "cooked grapefruit" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapes", "name": "cooked grape" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_kiwi", "name": "cooked kiwi" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mango", "name": "cooked mango" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_melon", "name": "cooked melon" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_orange", "name": "cooked orange" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_papaya", "name": "cooked papaya" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_peach", "name": "cooked peach" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pear", "name": "cooked pear" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pineapple", "name": "cooked pineapple" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_plums", "name": "cooked plum" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pomegranate", "name": "cooked pomegranate" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_raspberries", "name": "cooked raspberry" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_rose_hips", "name": "cooked rose_hip" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_strawberries", "name": "cooked strawberry" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_huckleberries", "name": "cooked huckleberry" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mulberries", "name": "cooked mulberry" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_elderberries", "name": "cooked elderberry" },
-      { "type": "COMPONENT_ID", "condition": "irradiated_watermelon", "name": "cooked watermelon" }
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": "cooked watermelon" }
     ],
     "weight": "150 g",
     "color": "red",
@@ -279,33 +227,7 @@
       { "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" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apple", "name": { "str_sp": "apple %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apricot", "name": { "str_sp": "apricot %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_banana", "name": { "str_sp": "banana %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blackberries", "name": { "str_sp": "blackberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blueberries", "name": { "str_sp": "blueberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cherries", "name": { "str_sp": "cherry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cranberries", "name": { "str_sp": "cranberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapefruit", "name": { "str_sp": "grapefruit %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapes", "name": { "str_sp": "grape %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_kiwi", "name": { "str_sp": "kiwi %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mango", "name": { "str_sp": "mango %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_melon", "name": { "str_sp": "melon %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_orange", "name": { "str_sp": "orange %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_papaya", "name": { "str_sp": "papaya %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_peach", "name": { "str_sp": "peach %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pear", "name": { "str_sp": "pear %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pineapple", "name": { "str_sp": "pineapple %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_plums", "name": { "str_sp": "plum %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pomegranate", "name": { "str_sp": "pomegranate %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_raspberries", "name": { "str_sp": "raspberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_rose_hips", "name": { "str_sp": "rose_hip %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_strawberries", "name": { "str_sp": "strawberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_huckleberries", "name": { "str_sp": "huckleberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mulberries", "name": { "str_sp": "mulberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_elderberries", "name": { "str_sp": "elderberry %s" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_watermelon", "name": { "str_sp": "watermelon %s" } }
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon %s" } }
     ],
     "weight": "15 g",
     "color": "red",

diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json
@@ -315,33 +315,7 @@
       { "type": "COMPONENT_ID", "condition": "huckleberries", "name": { "str_sp": "huckleberry pulp" } },
       { "type": "COMPONENT_ID", "condition": "mulberries", "name": { "str_sp": "mulberry pulp" } },
       { "type": "COMPONENT_ID", "condition": "elderberries", "name": { "str_sp": "elderberry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apple", "name": { "str_sp": "apple pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_apricot", "name": { "str_sp": "apricot pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_banana", "name": { "str_sp": "banana pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blackberries", "name": { "str_sp": "blackberry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_blueberries", "name": { "str_sp": "blueberry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cherries", "name": { "str_sp": "cherry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_cranberries", "name": { "str_sp": "cranberry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapefruit", "name": { "str_sp": "grapefruit pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_grapes", "name": { "str_sp": "grape pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_kiwi", "name": { "str_sp": "kiwi pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mango", "name": { "str_sp": "mango pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_melon", "name": { "str_sp": "melon pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_orange", "name": { "str_sp": "orange pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_papaya", "name": { "str_sp": "papaya pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_peach", "name": { "str_sp": "peach pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pear", "name": { "str_sp": "pear pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pineapple", "name": { "str_sp": "pineapple pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_plums", "name": { "str_sp": "plum pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_pomegranate", "name": { "str_sp": "pomegranate pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_raspberries", "name": { "str_sp": "raspberry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_rose_hips", "name": { "str_sp": "rose_hip pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_strawberries", "name": { "str_sp": "strawberry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_huckleberries", "name": { "str_sp": "huckleberry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_mulberries", "name": { "str_sp": "mulberry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_elderberries", "name": { "str_sp": "elderberry pulp" } },
-      { "type": "COMPONENT_ID", "condition": "irradiated_watermelon", "name": { "str_sp": "watermelon pulp" } }
+      { "type": "COMPONENT_ID", "condition": "watermelon", "name": { "str_sp": "watermelon pulp" } }
     ],
     "weight": "62 g",
     "color": "light_red",