feat(content, port): Port vitamin-based allergies and cannibalism fro…

…m DDA (#5808) * Port Cannibalism vitamin first Co-Authored-By: RenechCDDA <[email protected]> * Port the rest of the vitamin-based allergies Co-Authored-By: Anton Simakov <[email protected]> * Give the vitamins to the vanilla food items Co-Authored-By: Antti Riikonen <[email protected]> * Add cannibalism vitamins Oops, didn't realize that the script for the other vitamins didn't include cannibalism Co-Authored-By: RenechCDDA <[email protected]> * Add vitamins to in-repo mods Co-Authored-By: Antti Riikonen <[email protected]> * Fix errors related to condition_type * Format food-related materials, correct vitamins Enforces the idea that materials should always be in arrays even if there's only one, specifically for the food-related materials. This is necessary for the vitamins script to work correctly. Also does that 2nd pass of the vitamins script Co-Authored-By: Antti Riikonen <[email protected]> * Fix tests and junk vitamin name * Fix the rest of the consumption tests * Add nut allergen The DDA script apparently just didn't touch nuts? * Remove DDA bread allergy We don't even HAVE bread material! * Add very basic allergies documentation To appease the scarf * style(autofix.ci): automated formatting --------- Co-authored-by: RenechCDDA <[email protected]> Co-authored-by: Anton Simakov <[email protected]> Co-authored-by: Antti Riikonen <[email protected]> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Dec 17, 2024 · 43d2a72 · 43d2a72
1 parent 430deaf
commit 43d2a72
Show file tree

Hide file tree

Showing 67 changed files with 1,684 additions and 980 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -1204,7 +1204,7 @@
     "id": "CANNIBALISM",
     "type": "json_flag",
     "context": [ "COMESTIBLE" ],
-    "craft_inherit": true
+    "//": "Obsoleted"
   },
   {
     "id": "ALLERGEN_EGG",

diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -92,7 +92,7 @@
     "color": "light_red",
     "looks_like": "thread",
     "description": "A tough sinew cut from a corpse, usable as thread.",
-    "material": "flesh",
+    "material": [ "flesh" ],
     "volume": "250 ml",
     "weight": "1 g",
     "ammo_type": "thread",
@@ -110,7 +110,7 @@
     "color": "light_green",
     "looks_like": "thread",
     "description": "Tough thin fiber, taken from a plant.  Can be used as thread.",
-    "material": "veggy",
+    "material": [ "veggy" ],
     "volume": "250 ml",
     "weight": "1 g",
     "ammo_type": "thread",

diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json
@@ -7,7 +7,7 @@
     "symbol": "=",
     "color": "green",
     "description": "Tiny droplets of venom trickle out of the sponge-like tissue of this sharp barb.",
-    "material": "bone",
+    "material": [ "bone" ],
     "volume": "250 ml",
     "weight": "37 g",
     "bashing": 6,

diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json
@@ -1229,10 +1229,11 @@
     "container": "bag_plastic",
     "flags": [ "EATEN_COLD" ],
     "description": "These clear cubes of processed seaweed can be dissolved in boiling water to create a very sturdy, temperature resistant gel.  Not only is it good for making gels to separate molecules by size, but it's a great cheat ingredient to make sure your jellies set properly.",
-    "material": "junk",
+    "material": [ "junk" ],
     "volume": "900 ml",
     "//": "Bulk density is around 0.55 g/mL",
-    "weight": "20 g"
+    "weight": "20 g",
+    "vitamins": [ [ "junk_allergen", 1 ] ]
   },
   {
     "id": "steel_grille",
@@ -1348,7 +1349,7 @@
     "price": "10 USD",
     "price_postapoc": "10 cent",
     "container": "bottle_plastic_small",
-    "material": "flesh",
+    "material": [ "flesh" ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": "components"

diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json
@@ -23,7 +23,8 @@
     "phase": "liquid",
     "charges": 5,
     "flags": [ "UNSAFE_CONSUME", "EATEN_COLD", "MYCUS_OK" ],
-    "fun": 25
+    "fun": 25,
+    "vitamins": [ [ "veggy_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -521,7 +522,8 @@
     "volume": "250 ml",
     "phase": "liquid",
     "fun": 20,
-    "flags": [ "UNSAFE_CONSUME", "EATEN_HOT" ]
+    "flags": [ "UNSAFE_CONSUME", "EATEN_HOT" ],
+    "vitamins": [ [ "milk_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -576,7 +578,7 @@
     "phase": "liquid",
     "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
     "fun": 20,
-    "vitamins": [ [ "vitA", 2 ], [ "vitC", 118 ], [ "calcium", 2 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitA", 2 ], [ "vitC", 118 ], [ "calcium", 2 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -603,7 +605,7 @@
     "phase": "liquid",
     "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
     "fun": 20,
-    "vitamins": [ [ "vitC", 135 ], [ "calcium", 1 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitC", 135 ], [ "calcium", 1 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -629,7 +631,8 @@
     "volume": "250 ml",
     "phase": "liquid",
     "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
-    "fun": 20
+    "fun": 20,
+    "vitamins": [ [ "junk_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -1003,7 +1006,7 @@
     "charges": 6,
     "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
     "fun": 8,
-    "vitamins": [ [ "vitC", 20 ] ]
+    "vitamins": [ [ "vitC", 20 ], [ "fruit_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -1031,7 +1034,7 @@
     "charges": 6,
     "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
     "fun": -12,
-    "vitamins": [ [ "vitC", 20 ] ]
+    "vitamins": [ [ "vitC", 20 ], [ "fruit_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -1161,7 +1164,8 @@
     "phase": "liquid",
     "charges": 5,
     "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
-    "fun": 20
+    "fun": 20,
+    "vitamins": [ [ "junk_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -1188,7 +1192,8 @@
     "phase": "liquid",
     "charges": 2,
     "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
-    "fun": 20
+    "fun": 20,
+    "vitamins": [ [ "junk_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -1289,7 +1294,7 @@
     "charges": 2,
     "stack_size": 20,
     "fun": -1,
-    "vitamins": [ [ "vitC", 2 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", 2 ], [ "iron", 4 ], [ "junk_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -1318,7 +1323,7 @@
     "charges": 2,
     "flags": [ "UNSAFE_CONSUME", "EATEN_COLD" ],
     "fun": 20,
-    "vitamins": [ [ "vitA", 5 ], [ "vitC", 3 ], [ "calcium", 12 ], [ "iron", 2 ] ]
+    "vitamins": [ [ "vitA", 5 ], [ "vitC", 3 ], [ "calcium", 12 ], [ "iron", 2 ], [ "egg_allergen", 1 ], [ "milk_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
@@ -43,7 +43,8 @@
       "type": "delayed_transform",
       "transform_age": 200000,
       "not_ready_msg": "You've been caring for your starter for a while, but it's going to need longer before you can do anything tasty with it."
-    }
+    },
+    "vitamins": [ [ "wheat_allergen", 1 ] ]
   },
   {
     "id": "sourdough_split_uncovered",
@@ -68,7 +69,8 @@
       "type": "delayed_transform",
       "transform_age": 180000,
       "not_ready_msg": "The starter isn't quite ready to go."
-    }
+    },
+    "vitamins": [ [ "wheat_allergen", 1 ] ]
   },
   {
     "id": "sourdough_starter_uncovered",
@@ -85,7 +87,8 @@
     "symbol": "%",
     "color": "yellow",
     "fun": -1,
-    "calories": 192
+    "calories": 192,
+    "vitamins": [ [ "wheat_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -102,12 +105,13 @@
     "description": "Healthy and filling, with a sharper taste and thicker crust than yeast-only bread.",
     "price": "190 cent",
     "price_postapoc": "1 USD",
-    "material": "wheat",
+    "material": [ "wheat" ],
     "looks_like": "bread",
     "volume": "750 ml",
     "charges": 4,
     "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ],
-    "fun": 2
+    "fun": 2,
+    "vitamins": [ [ "wheat_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -123,10 +127,10 @@
     "description": "Simple unleavened bread.",
     "price": "23 cent",
     "price_postapoc": "1 USD",
-    "material": "wheat",
+    "material": [ "wheat" ],
     "volume": "250 ml",
     "flags": [ "EATEN_HOT" ],
-    "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ] ]
+    "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ], [ "wheat_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -143,12 +147,12 @@
     "description": "Healthy and filling.",
     "price": "47 cent",
     "price_postapoc": "1 USD",
-    "material": "wheat",
+    "material": [ "wheat" ],
     "volume": "250 ml",
     "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 1,
-    "vitamins": [ [ "vitC", 1 ], [ "calcium", 10 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", 1 ], [ "calcium", 10 ], [ "iron", 4 ], [ "wheat_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -172,7 +176,7 @@
     "charges": 14,
     "flags": [ "EATEN_HOT" ],
     "fun": 3,
-    "vitamins": [ [ "vitA", 1 ], [ "vitB", 3 ], [ "calcium", 2 ], [ "iron", 14 ] ]
+    "vitamins": [ [ "vitA", 1 ], [ "vitB", 3 ], [ "calcium", 2 ], [ "iron", 14 ], [ "wheat_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -189,13 +193,13 @@
     "description": "Healthy and filling cornbread.",
     "price": "75 cent",
     "price_postapoc": "1 USD",
-    "material": "veggy",
+    "material": [ "veggy" ],
     "primary_material": "wheat",
     "volume": "250 ml",
     "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 2,
-    "vitamins": [ [ "vitA", 2 ], [ "calcium", 8 ], [ "iron", 6 ] ]
+    "vitamins": [ [ "vitA", 2 ], [ "calcium", 8 ], [ "iron", 6 ], [ "veggy_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -216,7 +220,7 @@
     "charges": 6,
     "flags": [ "EATEN_HOT" ],
     "fun": 2,
-    "vitamins": [ [ "vitA", 1 ], [ "calcium", 4 ], [ "iron", 7 ] ]
+    "vitamins": [ [ "vitA", 1 ], [ "calcium", 4 ], [ "iron", 7 ], [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -233,13 +237,13 @@
     "description": "A round, thin flatbread made from finely ground corn flour.",
     "price": "50 cent",
     "price_postapoc": "50 cent",
-    "material": "veggy",
+    "material": [ "veggy" ],
     "primary_material": "wheat",
     "volume": "250 ml",
     "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 1,
-    "vitamins": [ [ "calcium", 1 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "calcium", 1 ], [ "iron", 1 ], [ "veggy_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -254,10 +258,10 @@
     "description": "A dry and virtually tasteless bread product capable of remaining edible without spoilage for vast lengths of time.",
     "price": "125 cent",
     "price_postapoc": "150 cent",
-    "material": "wheat",
+    "material": [ "wheat" ],
     "volume": "250 ml",
     "charges": 2,
-    "vitamins": [ [ "calcium", 2 ], [ "iron", 15 ] ],
+    "vitamins": [ [ "calcium", 2 ], [ "iron", 15 ], [ "wheat_allergen", 1 ] ],
     "stack_size": 20,
     "fun": -1
   },
@@ -275,12 +279,12 @@
     "description": "Wholesome and filling, this home made biscuit is pretty good!",
     "price": "57 cent",
     "price_postapoc": "250 cent",
-    "material": "wheat",
+    "material": [ "wheat" ],
     "volume": "250 ml",
     "charges": 10,
     "flags": [ "EATEN_HOT" ],
     "fun": 3,
-    "vitamins": [ [ "vitA", 1 ], [ "calcium", 11 ], [ "iron", 9 ] ]
+    "vitamins": [ [ "vitA", 1 ], [ "calcium", 11 ], [ "iron", 9 ], [ "wheat_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -304,7 +308,7 @@
     "stack_size": 20,
     "flags": [ "EATEN_HOT" ],
     "fun": -1,
-    "vitamins": [ [ "calcium", 12 ] ],
+    "vitamins": [ [ "calcium", 12 ], [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ],
     "//": "this item will generally inherit its values, so it is essentially a copy of bread"
   }
 ]
diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json
@@ -122,7 +122,8 @@
     "quench": 6,
     "fun": -5,
     "material": [ "fruit", "water" ],
-    "brewable": { "time": "12 hours", "results": [ "fruit_wine", "yeast" ] }
+    "brewable": { "time": "12 hours", "results": [ "fruit_wine", "yeast" ] },
+    "vitamins": [ [ "fruit_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -185,7 +186,8 @@
     "quench": 2,
     "fun": -5,
     "material": [ "water", "junk" ],
-    "brewable": { "time": "6 hours", "results": [ "wash_moonshine", "yeast" ] }
+    "brewable": { "time": "6 hours", "results": [ "wash_moonshine", "yeast" ] },
+    "vitamins": [ [ "junk_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",