diff --git a/data/json/flags.json b/data/json/flags.json index 6a6b2256da73..ddeafa0b9726 100644 --- 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 index 44493176388f..ceb9d0fb359f 100644 --- 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 index aaa5d0876a55..c32cd5dbe867 100644 --- 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 index 911587f0f13e..06310c255bb4 100644 --- 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 index f6a31ebcfda0..8c3446059c1a 100644 --- 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 index fc73968d0bcc..7d104a2f0204 100644 --- 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 index 87b3a4a98917..d53053aca3ce 100644 --- 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", diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 8c6ce5b7acfd..c3fd5d5e1cd7 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -4,11 +4,11 @@ "type": "COMESTIBLE", "comestible_type": "FOOD", "name": { "str_sp": "meat/fish" }, - "material": "flesh", + "material": [ "flesh" ], "symbol": "%", "color": "red", "parasites": 32, - "vitamins": [ ], + "vitamins": [ [ "meat_allergen", 1 ] ], "flags": [ "RAW", "UNSAFE_CONSUME" ] }, { @@ -54,7 +54,8 @@ "type": "COMESTIBLE", "name": "human stomach", "description": "The stomach of a human. It is surprisingly durable.", - "material": "hflesh" + "material": [ "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "id": "hstomach_large", @@ -70,7 +71,8 @@ "type": "COMESTIBLE", "name": { "str": "chunk of human fat", "str_pl": "chunks of human fat" }, "description": "Freshly harvested from a human body.", - "material": "hflesh" + "material": [ "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -80,7 +82,8 @@ "description": "A smooth white block of cleaned and rendered human fat. It will remain edible for a very long time, and can be used as an ingredient in many foods and projects.", "price": "5 USD", "//": "*May* have been commercially traded.", - "material": "hflesh" + "material": [ "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -96,7 +99,8 @@ "cooks_like": "human_cooked", "name": { "str": "human flesh", "str_pl": "human fleshes" }, "description": "Freshly butchered from a human body.", - "material": "hflesh" + "vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "human_flesh_vitamin", 100 ], [ "meat_allergen", 1 ] ], + "material": [ "hflesh" ] }, { "id": "human_cooked", @@ -181,7 +185,8 @@ "cooks_like": "mutant_human_cooked", "name": "mutant humanoid meat", "description": "Freshly butchered from the body of a heavily mutated creature that was unsettlingly humanoid in appearance. It smells like a failed chemical experiment. You'd have to be crazy or starving to eat this.", - "material": "hflesh" + "material": [ "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "id": "mutant_human_cooked", @@ -399,7 +404,7 @@ "type": "COMESTIBLE", "name": { "str_sp": "meat jerky" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "jerk jerky" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "jerk jerky" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "monster jerky" } } ], "description": "Salty dried meat that lasts for a long time, but will make you thirsty.", @@ -440,7 +445,7 @@ "type": "COMESTIBLE", "name": "smoked meat", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "smoked sucker" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "smoked sucker" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "%s, mutant" } } ], "description": "Tasty meat that has been heavily smoked for preservation. It could be further smoked to dehydrate it completely.", @@ -567,12 +572,13 @@ "calories": 43, "description": "Blood, possibly that of a human. Disgusting!", "price": "0 cent", - "material": "hflesh", + "material": [ "hflesh" ], "volume": "250 ml", "phase": "liquid", "fun": -50, "flags": [ "IS_BLOOD" ], - "drop_action": { "type": "emit_actor", "emits": [ "emit_drop_blood" ], "scale_qty": true } + "drop_action": { "type": "emit_actor", "emits": [ "emit_drop_blood" ], "scale_qty": true }, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -580,7 +586,8 @@ "copy-from": "blood", "name": { "str_sp": "animal blood" }, "description": "Blood extracted from a living creature.", - "material": "flesh" + "material": [ "flesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -600,9 +607,10 @@ "copy-from": "blood_concentrate", "name": { "str_sp": "concentrated animal blood" }, "description": "Blood extracted from a living creature, concentrated by some means.", - "material": "flesh", + "material": [ "flesh" ], "//": "Wouldn't be good to run it through a centrifuge", - "delete": { "flags": [ "IS_BLOOD" ] } + "delete": { "flags": [ "IS_BLOOD" ] }, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -651,10 +659,10 @@ "description": "A bone from some creature or other. Could be used to make some stuff, like needles.", "price": "0 cent", "price_postapoc": "10 cent", - "material": "bone", + "material": [ "bone" ], "milling": { "into": "meal_bone", "conversion_rate": 4 }, "volume": "250 ml", - "vitamins": [ [ "calcium", 96 ] ] + "vitamins": [ [ "calcium", 96 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -671,12 +679,13 @@ "calories": 1923, "description": "Freshly butchered fat. You could eat it raw, but it is better used as an ingredient in other foods or projects.", "price": "0 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "parasites": 32, "stack_size": 1, "fun": -20, - "flags": [ "RAW", "UNSAFE_CONSUME" ] + "flags": [ "RAW", "UNSAFE_CONSUME" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -693,11 +702,11 @@ "price": "5 USD", "price_postapoc": "8 USD", "//": "*May* have been commercially traded.", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "charges": 2, "stack_size": 4, - "vitamins": [ ], + "vitamins": [ [ "meat_allergen", 1 ] ], "fun": -18 }, { @@ -740,7 +749,8 @@ "copy-from": "mutant_fat", "name": { "str": "chunk of mutant humanoid fat", "str_pl": "chunks of mutant humanoid fat" }, "description": "Freshly butchered fat from a heavily mutated humanoid.", - "material": "hflesh" + "material": [ "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -748,7 +758,8 @@ "name": "mutant humanoid tallow", "copy-from": "mutant_tallow", "description": "A smooth white block of cleaned and rendered fat sourced from a mutant humanoid. It won't rot for a very long time, and can be used as an ingredient in many foods and projects.", - "material": "hflesh" + "material": [ "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -774,13 +785,14 @@ "calories": 43, "description": "Blood that's obviously unhealthy. You could drink it, but it will poison you.", "price": "0 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "phase": "liquid", "fun": -50, "extend": { "flags": [ "IS_BLOOD" ] }, "delete": { "flags": [ "SMOKABLE" ] }, - "drop_action": { "type": "emit_actor", "emits": [ "emit_drop_blood" ], "scale_qty": true } + "drop_action": { "type": "emit_actor", "emits": [ "emit_drop_blood" ], "scale_qty": true }, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -810,11 +822,12 @@ "description": "Meat that's obviously unhealthy. You could eat it, but it will poison you.", "price": "0 cent", "price_postapoc": "10 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "fun": -10, "flags": [ "TRADER_AVOID", "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW", "UNSAFE_CONSUME" ], - "smoking_result": "dry_meat_tainted" + "smoking_result": "dry_meat_tainted", + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -832,19 +845,20 @@ "price": "0 cent", "price_postapoc": "5 cent", "//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes except for charcoal.", - "material": "bone", + "material": [ "bone" ], "volume": "250 ml", "milling": { "into": "meal_bone_tainted", "conversion_rate": 4 }, "fun": -10, - "flags": [ "NO_SALVAGE", "UNSAFE_CONSUME" ] + "flags": [ "NO_SALVAGE", "UNSAFE_CONSUME" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { - "type": "GENERIC", + "type": "COMESTIBLE", "id": "bone_human", "copy-from": "bone", "name": { "str": "human bone" }, "description": "A bone from a human being. Could be used to make some stuff, if you're feeling sufficiently ghoulish.", - "flags": [ "CANNIBALISM" ] + "vitamins": [ [ "calcium", 96 ], [ "human_flesh_vitamin", 100 ] ] }, { "type": "COMESTIBLE", @@ -863,10 +877,11 @@ "price": "0 cent", "price_postapoc": "25 cent", "//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes.", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "fun": -10, - "flags": [ "RAW", "UNSAFE_CONSUME" ] + "flags": [ "RAW", "UNSAFE_CONSUME" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -885,12 +900,13 @@ "price": "0 cent", "price_postapoc": "50 cent", "//": "Not for use in edible/foodsafe recipes. Inefficiency is handled by tainted tallow recipe requiring 200% as much materials input as regular tallow recipe.", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "charges": 2, "stack_size": 4, "fun": -18, - "flags": [ "UNSAFE_CONSUME" ] + "flags": [ "UNSAFE_CONSUME" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -907,7 +923,8 @@ "copy-from": "stomach_boiled", "name": { "str": "boiled large human stomach" }, "description": "A boiled stomach from a large humanoid creature, nothing else. It looks all but appetizing.", - "material": "hflesh" + "material": [ "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -922,10 +939,11 @@ "description": "A small boiled stomach from an animal, nothing else. It looks all but appetizing.", "price": "375 cent", "price_postapoc": "10 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "flags": [ "EATEN_HOT" ], - "fun": -3 + "fun": -3, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -933,7 +951,8 @@ "copy-from": "small_stomach_boiled", "name": { "str": "boiled human stomach" }, "description": "A small boiled stomach from a human, nothing else. It looks all but appetizing.", - "material": "hflesh" + "material": [ "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -952,11 +971,12 @@ "description": "A carefully folded raw skin harvested from an animal. You can cure it for storage and tanning, or eat it if you're desperate enough.", "price": "330 cent", "price_postapoc": "20 cent", - "material": "flesh", + "material": [ "flesh" ], "flags": [ "RAW", "TRADER_AVOID", "UNSAFE_CONSUME", "SMOKABLE" ], "smoking_result": "cured_hide", "stack_size": 1, - "fun": -12 + "fun": -12, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -975,7 +995,8 @@ "copy-from": "raw_leather", "name": "raw human skin", "description": "A carefully folded raw skin harvested from a human. You can cure it for storage and tanning, or eat it if you're desperate enough.", - "material": "hflesh" + "material": [ "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -998,7 +1019,8 @@ "flags": [ "NO_SALVAGE", "TRADER_AVOID", "SMOKABLE" ], "smoking_result": "cured_pelt", "stack_size": 1, - "fun": -24 + "fun": -24, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1018,7 +1040,8 @@ "copy-from": "raw_fur", "name": "raw human pelt", "description": "A carefully folded raw skin harvested from a fur-bearing mutant human. It still has the fur attached. You can cure it for storage and tanning, or eat it if you're desperate enough.", - "material": [ "fur", "hflesh" ] + "material": [ "fur", "hflesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1037,7 +1060,8 @@ "material": [ "flesh" ], "volume": "500 ml", "fun": -25, - "use_action": { "type": "mutagen", "mutation_category": "BEAST", "is_strong": false } + "use_action": { "type": "mutagen", "mutation_category": "BEAST", "is_strong": false }, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1056,7 +1080,8 @@ "material": [ "flesh" ], "volume": "1 L", "fun": -25, - "use_action": { "type": "mutagen", "mutation_category": "BEAST", "is_strong": true } + "use_action": { "type": "mutagen", "mutation_category": "BEAST", "is_strong": true }, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1073,7 +1098,8 @@ "price_postapoc": "25 cent", "material": [ "flesh" ], "volume": "250 ml", - "fun": -30 + "fun": -30, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "id": "meat_frond", diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json index 9da4b6f90dc6..655972ec86f8 100644 --- a/data/json/items/comestibles/dairy.json +++ b/data/json/items/comestibles/dairy.json @@ -42,7 +42,7 @@ "phase": "liquid", "flags": [ "EATEN_COLD" ], "charges": 2, - "vitamins": [ [ "vitA", 10 ], [ "vitB", 6 ], [ "vitC", 4 ], [ "calcium", 25 ] ], + "vitamins": [ [ "vitA", 10 ], [ "vitB", 6 ], [ "vitC", 4 ], [ "calcium", 25 ], [ "milk_allergen", 1 ] ], "fun": 1 }, { @@ -63,7 +63,7 @@ "volume": "250 ml", "phase": "liquid", "fun": 15, - "vitamins": [ [ "vitA", 2 ], [ "vitB", 3 ], [ "vitC", 3 ], [ "calcium", 33 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 2 ], [ "vitB", 3 ], [ "vitC", 3 ], [ "calcium", 33 ], [ "iron", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -83,7 +83,7 @@ "material": [ "milk" ], "volume": "500 ml", "charges": 32, - "vitamins": [ [ "vitA", 7 ], [ "vitB", 3 ] ], + "vitamins": [ [ "vitA", 7 ], [ "vitB", 3 ], [ "milk_allergen", 1 ] ], "fun": -1 }, { @@ -118,7 +118,7 @@ "volume": "250 ml", "phase": "liquid", "fun": 20, - "vitamins": [ [ "calcium", 8 ], [ "iron", 1 ] ] + "vitamins": [ [ "calcium", 8 ], [ "iron", 1 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -157,7 +157,7 @@ "primary_material": "cheese", "volume": "250 ml", "charges": 5, - "vitamins": [ [ "vitA", 5 ], [ "calcium", 32 ], [ "iron", 2 ] ], + "vitamins": [ [ "vitA", 5 ], [ "calcium", 32 ], [ "iron", 2 ], [ "milk_allergen", 1 ] ], "fun": 5, "flags": [ "NUTRIENT_OVERRIDE" ] }, @@ -180,7 +180,7 @@ "volume": "250 ml", "charges": 8, "fun": 7, - "vitamins": [ [ "vitA", 8 ], [ "calcium", 16 ] ] + "vitamins": [ [ "vitA", 8 ], [ "calcium", 16 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -202,7 +202,7 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 6, - "vitamins": [ [ "vitA", 12 ], [ "calcium", 38 ], [ "iron", 10 ] ] + "vitamins": [ [ "vitA", 12 ], [ "calcium", 38 ], [ "iron", 10 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -223,7 +223,7 @@ "volume": "250 ml", "cooks_like": "milk", "charges": 4, - "vitamins": [ [ "vitA", 3 ], [ "vitB", 2 ], [ "vitC", 1 ], [ "calcium", 7 ] ], + "vitamins": [ [ "vitA", 3 ], [ "vitB", 2 ], [ "vitC", 1 ], [ "calcium", 7 ], [ "milk_allergen", 1 ] ], "fun": -5 }, { @@ -246,7 +246,7 @@ "volume": "500 ml", "phase": "liquid", "charges": 20, - "vitamins": [ [ "vitA", 2 ], [ "vitB", 1 ], [ "vitC", 1 ], [ "calcium", 7 ] ], + "vitamins": [ [ "vitA", 2 ], [ "vitB", 1 ], [ "vitC", 1 ], [ "calcium", 7 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ], "fun": 3 }, { @@ -269,6 +269,6 @@ "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitA", 1 ], [ "vitB", 1 ], [ "vitC", 1 ], [ "calcium", 1 ] ] + "vitamins": [ [ "vitA", 1 ], [ "vitB", 1 ], [ "vitC", 1 ], [ "calcium", 1 ], [ "milk_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index 79f3d6a15729..e60edd6f5ad3 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -15,12 +15,12 @@ "description": "Pressed from fresh apples. Tasty and nutritious.", "price": "85 cent", "price_postapoc": "25 cent", - "material": "fruit", + "material": [ "fruit" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitC", 167 ], [ "calcium", 1 ], [ "iron", 1 ] ], + "vitamins": [ [ "vitC", 167 ], [ "calcium", 1 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ], "fun": 2 }, { @@ -39,11 +39,11 @@ "description": "Milk some almonds? Not quite, but blend them with water, yes! A dairy-free alternative strong in calcium! Rival to soy milk.", "price": "40 cent", "price_postapoc": "50 cent", - "material": "nut", + "material": [ "nut" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", - "vitamins": [ [ "vitA", 2 ], [ "calcium", 11 ] ], + "vitamins": [ [ "vitA", 2 ], [ "calcium", 11 ], [ "nut_allergen", 1 ] ], "flags": [ "EATEN_COLD" ], "fun": 1 }, @@ -63,11 +63,11 @@ "description": "Milk some soybeans? Not quite, but blend them with water, yes! A dairy-free alternative strong in protein! Rival to almond milk.", "price": "40 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", - "vitamins": [ [ "vitA", 2 ], [ "iron", 1 ], [ "calcium", 7 ] ], + "vitamins": [ [ "vitA", 2 ], [ "iron", 1 ], [ "calcium", 7 ], [ "veggy_allergen", 1 ] ], "flags": [ "EATEN_COLD" ], "fun": 1 }, @@ -143,11 +143,11 @@ "description": "A dense, sweet creamy sauce, often used in curries.", "price": "350 cent", "price_postapoc": "5 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "500 ml", "phase": "liquid", "charges": 2, - "vitamins": [ [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 43 ] ], + "vitamins": [ [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 43 ], [ "fruit_allergen", 1 ] ], "fun": 1 }, { @@ -172,7 +172,8 @@ "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], - "fun": 14 + "fun": 14, + "vitamins": [ [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -208,7 +209,7 @@ "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitA", 9 ], [ "vitC", 8 ], [ "calcium", 18 ], [ "iron", 4 ] ], + "vitamins": [ [ "vitA", 9 ], [ "vitC", 8 ], [ "calcium", 18 ], [ "iron", 4 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ], "fun": 7 }, { @@ -271,12 +272,13 @@ "description": "Things go better with cola. Sugar water with caffeine added.", "price": "95 cent", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "fun": 5 + "fun": 5, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -297,12 +299,13 @@ "description": "It tastes and looks like windshield wiper fluid, but it's loaded to the brim with sugar and caffeine.", "price": "1 USD", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "fun": 5 + "fun": 5, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -323,12 +326,13 @@ "description": "A caffeinated, carbonated drink, flavored with vanilla.", "price": "95 cent", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "fun": 5 + "fun": 5, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -347,12 +351,12 @@ "description": "Made from real Massachusetts cranberries. Delicious and nutritious.", "price": "80 cent", "price_postapoc": "50 cent", - "material": "fruit", + "material": [ "fruit" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitA", 1 ], [ "vitC", 131 ], [ "calcium", 3 ], [ "iron", 1 ] ], + "vitamins": [ [ "vitA", 1 ], [ "vitC", 131 ], [ "calcium", 3 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ], "fun": 3 }, { @@ -374,7 +378,7 @@ "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitC", 60 ] ], + "vitamins": [ [ "vitC", 60 ], [ "fruit_allergen", 1 ], [ "junk_allergen", 1 ] ], "fun": 6 }, { @@ -439,7 +443,7 @@ "phase": "liquid", "charges": 2, "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitA", 5 ], [ "vitC", 3 ], [ "calcium", 13 ], [ "iron", 2 ] ], + "vitamins": [ [ "vitA", 5 ], [ "vitC", 3 ], [ "calcium", 13 ], [ "iron", 2 ], [ "egg_allergen", 1 ], [ "milk_allergen", 1 ] ], "fun": 15 }, { @@ -461,12 +465,12 @@ "description": "A heavily caffeinated soft drink. Energy drinks are popular among those who need to stay up late working.", "price": "170 cent", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitC", 105 ] ], + "vitamins": [ [ "vitC", 105 ], [ "junk_allergen", 1 ] ], "fun": 5 }, { @@ -529,7 +533,7 @@ "quench": 35, "fun": 8, "spoils_in": "1 day", - "vitamins": [ [ "calcium", 4 ], [ "iron", 2 ] ], + "vitamins": [ [ "calcium", 4 ], [ "iron", 2 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ], "flags": [ "EATEN_HOT" ] }, { @@ -576,13 +580,13 @@ "description": "Freshly-squeezed from real fruit! Tasty and nutritious.", "price": "80 cent", "price_postapoc": "50 cent", - "material": "fruit", + "material": [ "fruit" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "charges": 2, "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitC", 53 ], [ "iron", 2 ] ], + "vitamins": [ [ "vitC", 53 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ], "fun": 3 }, { @@ -629,12 +633,12 @@ "description": "Clear juice obtained by cooking fruit in a large volume of water.", "price": "62 cent", "price_postapoc": "50 cent", - "material": "fruit", + "material": [ "fruit" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitC", 25 ] ], + "vitamins": [ [ "vitC", 25 ], [ "fruit_allergen", 1 ] ], "fun": 8 }, { @@ -652,12 +656,12 @@ "description": "Lemon juice mixed with water and sugar to dull the sourness. Delicious and refreshing.", "price": "80 cent", "price_postapoc": "50 cent", - "material": "fruit", + "material": [ "fruit" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitC", 16 ], [ "iron", 2 ] ], + "vitamins": [ [ "vitC", 16 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ], "fun": 3 }, { @@ -675,12 +679,13 @@ "description": "Unlike cola this is caffeine free, however it is still carbonated and has plenty of sugar. Not to mention a lemon-lime taste.", "price": "95 cent", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "fun": 5 + "fun": 5, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -716,7 +721,8 @@ "quench": 35, "fun": 10, "spoils_in": "1 day", - "flags": [ "EATEN_HOT" ] + "flags": [ "EATEN_HOT" ], + "vitamins": [ [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -739,7 +745,7 @@ "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitA", 10 ], [ "vitB", 6 ], [ "vitC", 4 ], [ "calcium", 25 ] ], + "vitamins": [ [ "vitA", 10 ], [ "vitB", 6 ], [ "vitC", 4 ], [ "calcium", 25 ], [ "milk_allergen", 1 ] ], "fun": 1 }, { @@ -773,7 +779,7 @@ "volume": "500 ml", "phase": "liquid", "charges": 2, - "vitamins": [ [ "vitA", 5 ], [ "vitB", 3 ], [ "vitC", 2 ], [ "calcium", 12 ] ], + "vitamins": [ [ "vitA", 5 ], [ "vitB", 3 ], [ "vitC", 2 ], [ "calcium", 12 ], [ "milk_allergen", 1 ] ], "fun": 10 }, { @@ -814,7 +820,7 @@ "volume": "500 ml", "phase": "liquid", "charges": 2, - "vitamins": [ [ "vitA", 5 ], [ "vitB", 3 ], [ "vitC", 2 ], [ "calcium", 12 ] ], + "vitamins": [ [ "vitA", 5 ], [ "vitB", 3 ], [ "vitC", 2 ], [ "calcium", 12 ], [ "milk_allergen", 1 ] ], "fun": 10 }, { @@ -834,13 +840,13 @@ "description": "Freshly-squeezed from real oranges! Tasty and nutritious.", "price": "90 cent", "price_postapoc": "50 cent", - "material": "fruit", + "material": [ "fruit" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], "//2": "most store-bought oj is fortified with calcium.", - "vitamins": [ [ "vitA", 2 ], [ "vitC", 146 ], [ "calcium", 28 ], [ "iron", 2 ] ], + "vitamins": [ [ "vitA", 2 ], [ "vitC", 146 ], [ "calcium", 28 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ], "fun": 3 }, { @@ -858,12 +864,13 @@ "description": "Unlike cola this is caffeine free, however it is still carbonated, sweet, and tastes vaguely orange-like.", "price": "95 cent", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "fun": 5 + "fun": 5, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -901,12 +908,12 @@ "description": "A mass-produced grape flavored beverage of artificial origin. Good for when you want something that tastes like fruit, but still don't care about your health.", "price": "85 cent", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "vitamins": [ [ "vitC", 50 ], [ "calcium", 3 ] ], + "vitamins": [ [ "vitC", 50 ], [ "calcium", 3 ], [ "junk_allergen", 1 ] ], "fun": 3 }, { @@ -924,12 +931,13 @@ "description": "Like cola, but without caffeine. Still not that healthy.", "price": "95 cent", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "fun": 3 + "fun": 3, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -949,12 +957,13 @@ "description": "Originating in Germany almost a century ago, this mix of cola and orange soda tastes great.", "price": "1 USD", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "fun": 6 + "fun": 6, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1113,13 +1122,13 @@ "description": "Contains up to eight vegetables! Nutritious and tasty.", "price": "40 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], "fun": 1, - "vitamins": [ [ "vitA", 60 ], [ "vitC", 180 ], [ "calcium", 4 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 60 ], [ "vitC", 180 ], [ "calcium", 4 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "id": "water", @@ -1261,11 +1270,12 @@ "description": "A traditional Korean beverage made from rice, often served as a dessert or a digestive aid.", "price": "85 cent", "price_postapoc": "25 cent", - "material": "veggy", + "material": [ "veggy" ], "primary_material": "water", "volume": "250 ml", "phase": "liquid", "flags": [ "EATEN_COLD" ], - "fun": 3 + "fun": 3, + "vitamins": [ [ "veggy_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json index aa104857eb25..e2dde1660fee 100644 --- a/data/json/items/comestibles/drink_other.json +++ b/data/json/items/comestibles/drink_other.json @@ -15,12 +15,13 @@ "price": "4 cent", "price_postapoc": "50 cent", "//": "Small cans--needs upsized after the string freeze.", - "material": "tomato", + "material": [ "tomato" ], "volume": "500 ml", "charges": 8, "phase": "liquid", "flags": [ "EATEN_HOT" ], - "fun": 1 + "fun": 1, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "id": "maple_sap", @@ -64,7 +65,8 @@ "spoils_in": "6 days 16 hours", "charges": 16, "fun": -7, - "phase": "liquid" + "phase": "liquid", + "vitamins": [ [ "egg_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "id": "ketchup", @@ -84,7 +86,8 @@ "spoils_in": "15 days", "charges": 16, "fun": -6, - "phase": "liquid" + "phase": "liquid", + "vitamins": [ [ "veggy_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "id": "mustard", @@ -95,7 +98,7 @@ "description": "A condiment made from the seeds of a mustard plant (/Brassica/ or /Sinapis/), vinegar, salt, and spices.", "price": "50 cent", "price_postapoc": "1 USD", - "material": "junk", + "material": [ "junk" ], "weight": "5 g", "volume": "250 ml", "comestible_type": "DRINK", @@ -105,7 +108,7 @@ "spoils_in": "15 days", "charges": 48, "phase": "liquid", - "vitamins": [ [ "iron", 2 ] ] + "vitamins": [ [ "iron", 2 ], [ "junk_allergen", 1 ] ] }, { "id": "honey_bottled", @@ -199,7 +202,7 @@ "phase": "liquid", "fun": -25, "flags": [ "NUTRIENT_OVERRIDE" ], - "vitamins": [ ] + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -207,7 +210,8 @@ "name": { "str_sp": "animal cooking oil" }, "copy-from": "cooking_oil", "description": "Thin yellow animal oil used for cooking.", - "material": [ "flesh", "oil" ] + "material": [ "flesh", "oil" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -224,13 +228,13 @@ "description": "An extremely sugary tar-like syrup, produced by repeatedly boiling the juice of sugarcane or sugar beets. It has a slightly bitter aftertaste.", "price": "2 USD", "price_postapoc": "5 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "phase": "liquid", "charges": 4, "fun": 2, "flags": [ "USE_EAT_VERB" ], - "vitamins": [ [ "calcium", 18 ], [ "iron", 23 ] ] + "vitamins": [ [ "calcium", 18 ], [ "iron", 23 ], [ "junk_allergen", 1 ] ] }, { "id": "horseradish", @@ -241,7 +245,7 @@ "description": "A spicy grated root vegetable packed in vinegared brine.", "price": "75 cent", "price_postapoc": "1 USD", - "material": "veggy", + "material": [ "veggy" ], "weight": "6 g", "volume": "250 ml", "comestible_type": "FOOD", @@ -251,7 +255,8 @@ "charges": 48, "healthy": 1, "fun": -20, - "phase": "liquid" + "phase": "liquid", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -271,11 +276,12 @@ "description": "A thick syrup made of water and sugar strained through coffee grounds. Can be used to flavor many foods and beverages.", "price": "8 USD", "price_postapoc": "1 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "phase": "liquid", "charges": 8, "calories": 80, - "fun": 6 + "fun": 6, + "vitamins": [ [ "junk_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index de42f1577e83..2ffaed6d222b 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -14,13 +14,13 @@ "description": "Nutritious egg laid by a bird.", "price": "44 cent", "price_postapoc": "50 cent", - "material": "egg", + "material": [ "egg" ], "volume": "50 ml", "stack_size": 1, "fun": -3, "flags": [ "RAW" ], "rot_spawn": "GROUP_EGG_BIRD_WILD", - "vitamins": [ [ "vitA", 9 ], [ "calcium", 3 ], [ "iron", 4 ], [ "vitB", 21 ] ], + "vitamins": [ [ "vitA", 9 ], [ "calcium", 3 ], [ "iron", 4 ], [ "vitB", 21 ], [ "egg_allergen", 1 ] ], "rot_spawn_chance": 50 }, { @@ -116,13 +116,14 @@ "description": "An egg belonging to one of reptile species found in New England.", "price": "250 cent", "price_postapoc": "50 cent", - "material": "egg", + "material": [ "egg" ], "volume": "250 ml", "stack_size": 4, "fun": -4, "flags": [ "RAW" ], "rot_spawn": "GROUP_EGG_SNAKE", - "rot_spawn_chance": 60 + "rot_spawn_chance": 60, + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -144,7 +145,7 @@ "price": "25 cent", "price_postapoc": "5 cent", "flags": [ "RAW" ], - "vitamins": [ [ "vitA", 19 ], [ "calcium", 7 ], [ "iron", 18 ], [ "vitB", 66 ], [ "mutant_toxin", 25 ] ] + "vitamins": [ [ "vitA", 19 ], [ "calcium", 7 ], [ "iron", 18 ], [ "vitB", 66 ], [ "mutant_toxin", 25 ], [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -180,8 +181,9 @@ "quench": 3, "description": "A egg from a giant roach, a bit bigger than a chicken one. Incredibly gross.", "price": "80 cent", - "material": "egg", - "rot_spawn": "GROUP_EGG_ROACH" + "material": [ "egg" ], + "rot_spawn": "GROUP_EGG_ROACH", + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -214,7 +216,8 @@ "description": "The fist-sized egg of a mutant firefly. Glows faintly in the dark.", "material": [ "egg" ], "rot_spawn": "GROUP_EGG_FIREFLY", - "rot_spawn_chance": 50 + "rot_spawn_chance": 50, + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -265,9 +268,9 @@ "description": "A clump of razorclaw eggs. A post-Cataclysm delicacy.", "price": "30 USD", "price_postapoc": "750 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", - "vitamins": [ [ "vitA", 24 ], [ "vitC", 42 ], [ "calcium", 5 ], [ "iron", 8 ], [ "vitB", 985 ] ], + "vitamins": [ [ "vitA", 24 ], [ "vitC", 42 ], [ "calcium", 5 ], [ "iron", 8 ], [ "vitB", 985 ], [ "meat_allergen", 1 ] ], "fun": 5, "flags": [ "RAW" ] }, @@ -286,11 +289,11 @@ "description": "Common roe from an unknown fish.", "price": "50 cent", "price_postapoc": "1 USD", - "material": "egg", + "material": [ "egg" ], "volume": "25 ml", "stack_size": 4, "fun": 1, - "vitamins": [ [ "vitC", 1 ], [ "vitB", 24 ] ], + "vitamins": [ [ "vitC", 1 ], [ "vitB", 24 ], [ "egg_allergen", 1 ] ], "flags": [ "RAW" ] }, { @@ -312,7 +315,7 @@ "volume": "250 ml", "charges": 16, "fun": -3, - "vitamins": [ [ "vitB", 2 ] ] + "vitamins": [ [ "vitB", 2 ], [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -325,11 +328,12 @@ "description": "Fluffy and delicious scrambled eggs.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "egg", + "material": [ "egg" ], "volume": "125 ml", "charges": 2, "flags": [ "EATEN_HOT" ], - "fun": 3 + "fun": 3, + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -342,10 +346,11 @@ "description": "A hard-boiled egg, still in its shell. Portable and nutritious!", "price": "95 cent", "price_postapoc": "50 cent", - "material": "egg", + "material": [ "egg" ], "fun": 2, "spoils_in": "10 days", - "delete": { "flags": [ "RAW" ] } + "delete": { "flags": [ "RAW" ] }, + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -376,8 +381,9 @@ "description": "A pickled egg. Rather salty, but tastes good and lasts for a long time.", "price": "95 cent", "price_postapoc": "75 cent", - "material": "egg", - "fun": 2 + "material": [ "egg" ], + "fun": 2, + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -392,7 +398,15 @@ "quench": 4, "healthy": 1, "calories": 349, - "vitamins": [ [ "vitA", 9 ], [ "vitC", 18 ], [ "calcium", 11 ], [ "iron", 9 ], [ "vitB", 21 ] ], + "vitamins": [ + [ "vitA", 9 ], + [ "vitC", 18 ], + [ "calcium", 11 ], + [ "iron", 9 ], + [ "vitB", 21 ], + [ "veggy_allergen", 1 ], + [ "egg_allergen", 1 ] + ], "price": "490 cent", "price_postapoc": "150 cent", "material": [ "egg", "veggy" ], @@ -414,7 +428,15 @@ "comestible_type": "FOOD", "healthy": 1, "calories": 209, - "vitamins": [ [ "vitA", 9 ], [ "vitC", 36 ], [ "calcium", 7 ], [ "iron", 8 ], [ "vitB", 21 ] ], + "vitamins": [ + [ "vitA", 9 ], + [ "vitC", 36 ], + [ "calcium", 7 ], + [ "iron", 8 ], + [ "vitB", 21 ], + [ "veggy_allergen", 1 ], + [ "egg_allergen", 1 ] + ], "price": "1190 cent", "price_postapoc": "2 USD", "material": [ "egg", "veggy" ], @@ -436,7 +458,15 @@ "healthy": 1, "comestible_type": "FOOD", "calories": 215, - "vitamins": [ [ "vitA", 9 ], [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 11 ], [ "vitB", 21 ] ], + "vitamins": [ + [ "vitA", 9 ], + [ "vitC", 4 ], + [ "calcium", 3 ], + [ "iron", 11 ], + [ "vitB", 21 ], + [ "veggy_allergen", 1 ], + [ "egg_allergen", 1 ] + ], "price": "4 USD", "price_postapoc": "1 USD", "material": [ "egg", "veggy" ], @@ -458,10 +488,10 @@ "comestible_type": "FOOD", "healthy": 1, "calories": 322, - "vitamins": [ [ "vitA", 10 ], [ "vitC", 9 ], [ "calcium", 13 ], [ "iron", 12 ], [ "vitB", 21 ] ], + "vitamins": [ [ "vitA", 10 ], [ "vitC", 9 ], [ "calcium", 13 ], [ "iron", 12 ], [ "vitB", 21 ], [ "egg_allergen", 1 ] ], "price": "4 USD", "price_postapoc": "1 USD", - "material": "egg", + "material": [ "egg" ], "volume": "125 ml", "charges": 2, "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], diff --git a/data/json/items/comestibles/frozen.json b/data/json/items/comestibles/frozen.json index 66f75556cedf..515d800f747f 100644 --- a/data/json/items/comestibles/frozen.json +++ b/data/json/items/comestibles/frozen.json @@ -46,10 +46,10 @@ "healthy": -1, "price": "250 cent", "price_postapoc": "1 USD", - "material": "milk", + "material": [ "milk" ], "phase": "liquid", "charges": 2, - "vitamins": [ [ "vitA", 1 ], [ "calcium", 12 ] ], + "vitamins": [ [ "vitA", 1 ], [ "calcium", 12 ], [ "milk_allergen", 1 ] ], "flags": [ "MELTS" ] }, { @@ -64,7 +64,8 @@ "price": "275 cent", "price_postapoc": "1 USD", "material": [ "milk", "junk" ], - "primary_material": "milk" + "primary_material": "milk", + "vitamins": [ [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -107,7 +108,8 @@ "price": "4 USD", "price_postapoc": "150 cent", "material": [ "milk", "junk" ], - "primary_material": "milk" + "primary_material": "milk", + "vitamins": [ [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -126,12 +128,12 @@ "healthy": -1, "price": "250 cent", "price_postapoc": "3 USD", - "material": "milk", + "material": [ "milk" ], "primary_material": "ice_cream", "phase": "liquid", "//": "not technically a drink, but is quasi-liquid enough that it'd get all over everything if you carried it", "charges": 2, - "vitamins": [ [ "vitA", 9 ], [ "calcium", 9 ], [ "vitB", 11 ] ], + "vitamins": [ [ "vitA", 9 ], [ "calcium", 9 ], [ "vitB", 11 ], [ "milk_allergen", 1 ] ], "flags": [ "MELTS", "EATEN_COLD" ] }, { @@ -144,7 +146,8 @@ "price": "2 USD", "price_postapoc": "1 USD", "primary_material": "ice_cream", - "material": [ "milk", "junk" ] + "material": [ "milk", "junk" ], + "vitamins": [ [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -158,7 +161,7 @@ "price_postapoc": "3 USD", "calories": 330, "primary_material": "ice_cream", - "vitamins": [ [ "vitA", 9 ], [ "calcium", 8 ], [ "iron", 4 ], [ "vitB", 8 ] ], + "vitamins": [ [ "vitA", 9 ], [ "calcium", 8 ], [ "iron", 4 ], [ "vitB", 8 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ], "material": [ "milk", "junk" ] }, { @@ -173,7 +176,15 @@ "price": "3 USD", "price_postapoc": "3 USD", "primary_material": "ice_cream", - "vitamins": [ [ "vitA", 8 ], [ "vitC", 6 ], [ "calcium", 8 ], [ "iron", 1 ], [ "vitB", 9 ] ], + "vitamins": [ + [ "vitA", 8 ], + [ "vitC", 6 ], + [ "calcium", 8 ], + [ "iron", 1 ], + [ "vitB", 9 ], + [ "fruit_allergen", 1 ], + [ "milk_allergen", 1 ] + ], "material": [ "milk", "fruit" ] }, { @@ -187,7 +198,7 @@ "price": "3 USD", "price_postapoc": "3 USD", "primary_material": "ice_cream", - "vitamins": [ [ "vitA", 1 ], [ "calcium", 8 ], [ "vitB", 10 ] ], + "vitamins": [ [ "vitA", 1 ], [ "calcium", 8 ], [ "vitB", 10 ], [ "egg_allergen", 1 ], [ "milk_allergen", 1 ] ], "material": [ "milk", "egg" ] }, { @@ -201,7 +212,7 @@ "price_postapoc": "1 USD", "weight": "80 g", "primary_material": "ice_cream", - "vitamins": [ [ "vitC", 4 ], [ "calcium", 10 ] ], + "vitamins": [ [ "vitC", 4 ], [ "calcium", 10 ], [ "milk_allergen", 1 ] ], "material": [ "milk" ] }, { @@ -217,7 +228,7 @@ "price": "175 cent", "price_postapoc": "1 USD", "weight": "106 g", - "vitamins": [ ], + "vitamins": [ [ "fruit_allergen", 1 ] ], "material": [ "water", "fruit" ] }, { @@ -231,7 +242,7 @@ "price_postapoc": "2 USD", "weight": "90 g", "primary_material": "ice_cream", - "vitamins": [ [ "calcium", 2 ], [ "iron", 2 ] ], + "vitamins": [ [ "calcium", 2 ], [ "iron", 2 ], [ "milk_allergen", 1 ] ], "material": [ "milk" ] } ] diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json index 44cb70f41643..a779dc4ca42f 100644 --- a/data/json/items/comestibles/fruit_dishes.json +++ b/data/json/items/comestibles/fruit_dishes.json @@ -13,10 +13,11 @@ "price": "50 cent", "price_postapoc": "50 cent", "//": "Cheap for three liters of spread!", - "material": "fruit", + "material": [ "fruit" ], "phase": "liquid", "fun": 2, - "flags": [ "USE_EAT_VERB", "EATEN_COLD" ] + "flags": [ "USE_EAT_VERB", "EATEN_COLD" ], + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -59,11 +60,11 @@ "description": "Dried strips of sugary fruit paste.", "price": "160 cent", "price_postapoc": "250 cent", - "material": "fruit", + "material": [ "fruit" ], "primary_material": "dried_vegetable", "volume": "250 ml", "charges": 5, - "vitamins": [ [ "vitC", 21 ], [ "calcium", 2 ], [ "iron", 4 ] ], + "vitamins": [ [ "vitC", 21 ], [ "calcium", 2 ], [ "iron", 4 ], [ "fruit_allergen", 1 ] ], "fun": 3 }, { @@ -79,10 +80,11 @@ "description": "It's like blueberry jam, only without sugar.", "price": "50 cent", "price_postapoc": "50 cent", - "material": "fruit", + "material": [ "fruit" ], "phase": "liquid", "fun": 3, - "flags": [ "USE_EAT_VERB", "EATEN_COLD" ] + "flags": [ "USE_EAT_VERB", "EATEN_COLD" ], + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -99,10 +101,10 @@ "description": "Yellow cling peach slices packed in light syrup.", "price": "140 cent", "price_postapoc": "150 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 5, - "vitamins": [ [ "vitA", 4 ], [ "vitC", 9 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 4 ], [ "vitC", 9 ], [ "iron", 4 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -120,11 +122,11 @@ "description": "Canned pineapple rings in water. Quite tasty.", "price": "4 USD", "price_postapoc": "150 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "500 ml", "fun": 7, "charges": 2, - "vitamins": [ [ "vitC", 26 ], [ "calcium", 4 ], [ "iron", 6 ] ] + "vitamins": [ [ "vitC", 26 ], [ "calcium", 4 ], [ "iron", 6 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -144,7 +146,7 @@ "primary_material": "powder", "volume": "250 ml", "charges": 10, - "vitamins": [ [ "vitC", 7 ] ], + "vitamins": [ [ "vitC", 7 ], [ "fruit_allergen", 1 ] ], "fun": 1 }, { @@ -189,12 +191,12 @@ "description": "It's like fruit jam, only without sugar.", "price": "50 cent", "price_postapoc": "50 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "phase": "liquid", "fun": 2, "//": "this item is intended to generally be inherited from the fruit that was cooked.", - "vitamins": [ [ "vitC", 20 ] ], + "vitamins": [ [ "vitC", 20 ], [ "fruit_allergen", 1 ] ], "flags": [ "USE_EAT_VERB", "EATEN_COLD" ] }, { @@ -239,12 +241,13 @@ "description": "Fresh fruit, cooked with sugar to make them last longer.", "price": "80 cent", "price_postapoc": "75 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "phase": "liquid", "charges": 8, "fun": 10, - "flags": [ "USE_EAT_VERB" ] + "flags": [ "USE_EAT_VERB" ], + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -260,11 +263,12 @@ "description": "Dehydrated fruit flakes. With proper storage, this dried food will remain edible for an incredibly long time. They are useful for several cooking recipes.", "price": "9 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "primary_material": "dried_vegetable", "//": "most of the water weight and volume is lost", "volume": "100 ml", - "fun": 2 + "fun": 2, + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -281,9 +285,10 @@ "description": "Reconstituted fruit flakes, which are much more enjoyable to eat now that they have been rehydrated.", "price": "9 USD", "price_postapoc": "50 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", - "fun": 4 + "fun": 4, + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -328,11 +333,11 @@ "calories": 82, "description": "Fruit slices soaked in a sugar syrup, to preserve freshness and appearance.", "price": "450 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "charges": 4, "fun": 3, - "vitamins": [ [ "iron", 2 ] ] + "vitamins": [ [ "iron", 2 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -378,11 +383,11 @@ "description": "This sodden mass of preserved fruit was boiled and canned in an earlier life. Bland, mushy and losing color, likely due to the lack of added sugar.", "price": "220 cent", "price_postapoc": "50 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "charges": 2, "fun": 1, - "vitamins": [ [ "vitC", 3 ], [ "calcium", 2 ], [ "iron", 10 ] ] + "vitamins": [ [ "vitC", 3 ], [ "calcium", 2 ], [ "iron", 10 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -390,7 +395,7 @@ "looks_like": "choco_coffee_beans", "price": "50 cent", "container": "bag_plastic", - "material": "fruit", + "material": [ "fruit" ], "name": { "str_sp": "cacao nib" }, "symbol": "%", "color": "brown", @@ -402,7 +407,7 @@ "healthy": 1, "calories": 53, "volume": "200 ml", - "vitamins": [ [ "calcium", 4 ], [ "iron", 8 ] ], + "vitamins": [ [ "calcium", 4 ], [ "iron", 8 ], [ "fruit_allergen", 1 ] ], "flags": [ ], "charges": 50, "stack_size": 100, diff --git a/data/json/items/comestibles/irradiated_veggy.json b/data/json/items/comestibles/irradiated_veggy.json index 238ac26b6fd6..1fcdffdc82ed 100644 --- a/data/json/items/comestibles/irradiated_veggy.json +++ b/data/json/items/comestibles/irradiated_veggy.json @@ -114,9 +114,10 @@ "description": "An irradiated cucumber will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "price": "320 cent", "price_postapoc": "1 USD", - "material": "veggy", + "material": [ "veggy" ], "flags": [ "SMOKABLE" ], - "volume": "250 ml" + "volume": "250 ml", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -132,8 +133,9 @@ "description": "An irradiated cluster of celery will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "price": "220 cent", "price_postapoc": "50 cent", - "material": "veggy", - "volume": "250 ml" + "material": [ "veggy" ], + "volume": "250 ml", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 189f120e35fe..6d3be7690d43 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -17,7 +17,7 @@ "volume": "1 L", "charges": 8, "flags": [ "EATEN_HOT" ], - "vitamins": [ [ "vitA", 3 ], [ "iron", 10 ] ], + "vitamins": [ [ "vitA", 3 ], [ "iron", 10 ], [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ], "fun": 20 }, { @@ -56,7 +56,7 @@ "charges": 2, "flags": [ "EATEN_HOT" ], "fun": -10, - "vitamins": [ [ "vitA", 16 ], [ "iron", 10 ] ] + "vitamins": [ [ "vitA", 16 ], [ "iron", 10 ], [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -97,10 +97,11 @@ "description": "Dried kernels from a particular type of corn. Practically inedible raw, they can be cooked to make a tasty snack.", "price": "1 USD", "price_postapoc": "4 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "charges": 8, - "fun": -6 + "fun": -6, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -117,12 +118,12 @@ "description": "Plain and unseasoned popcorn. Not as tasty as other kinds, but healthier as a result.", "price": "115 cent", "price_postapoc": "25 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "1 L", "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 4, - "vitamins": [ [ "iron", 2 ] ] + "vitamins": [ [ "iron", 2 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -132,8 +133,9 @@ "quench": -3, "healthy": -1, "description": "Popcorn with salt added for extra flavor.", - "material": "junk", - "fun": 8 + "material": [ "junk" ], + "fun": 8, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -143,8 +145,9 @@ "healthy": -1, "calories": 50, "description": "Popcorn with a light covering of butter for extra flavor.", - "material": "junk", - "fun": 10 + "material": [ "junk" ], + "fun": 10, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -163,7 +166,7 @@ "material": [ "wheat", "junk" ], "volume": "250 ml", "charges": 3, - "vitamins": [ [ "iron", 16 ] ], + "vitamins": [ [ "iron", 16 ], [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ], "fun": 4 }, { @@ -183,7 +186,8 @@ "material": [ "wheat", "junk" ], "volume": "500 ml", "charges": 3, - "fun": 6 + "fun": 6, + "vitamins": [ [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -198,10 +202,11 @@ "description": "Chocolate isn't very healthy, but it does make a delicious treat.", "price": "130 cent", "price_postapoc": "2 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "charges": 3, - "fun": 10 + "fun": 10, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -216,9 +221,10 @@ "description": "A handful of squishy, fluffy, puffy, delicious marshmallows.", "price": "250 cent", "price_postapoc": "1 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", - "fun": 10 + "fun": 10, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -235,7 +241,7 @@ "price_postapoc": "250 cent", "material": [ "wheat", "junk" ], "volume": "250 ml", - "vitamins": [ [ "calcium", 4 ], [ "iron", 6 ] ], + "vitamins": [ [ "calcium", 4 ], [ "iron", 6 ], [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ], "fun": 20 }, { @@ -253,10 +259,11 @@ "description": "A handful of peanut butter cups… your favorite!", "price": "180 cent", "price_postapoc": "150 cent", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "charges": 3, - "fun": 4 + "fun": 4, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -272,10 +279,10 @@ "description": "A handful of colorful chocolate filled candies.", "price": "180 cent", "price_postapoc": "4 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "charges": 3, - "vitamins": [ [ "iron", 9 ] ], + "vitamins": [ [ "iron", 9 ], [ "junk_allergen", 1 ] ], "fun": 3 }, { @@ -292,10 +299,11 @@ "description": "A handful of colorful fruit-flavored chewy candy.", "price": "180 cent", "price_postapoc": "2 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "charges": 3, - "fun": 3 + "fun": 3, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -311,10 +319,11 @@ "description": "Thin paper tubes of sweet & sour candy powder. Who thinks of this stuff?", "price": "120 cent", "price_postapoc": "3 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "charges": 5, - "fun": 6 + "fun": 6, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -331,10 +340,11 @@ "description": "This golden, translucent leaf candy is made with pure maple syrup and melt slowly as you savor the taste of real maple.", "price": "6 USD", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "volume": "100 ml", "charges": 2, - "fun": 10 + "fun": 10, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -353,7 +363,7 @@ "material": [ "wheat", "junk" ], "volume": "750 ml", "charges": 8, - "vitamins": [ [ "calcium", 4 ], [ "iron", 6 ] ], + "vitamins": [ [ "calcium", 4 ], [ "iron", 6 ], [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ], "fun": 2 }, { @@ -402,7 +412,7 @@ "volume": "250 ml", "charges": 4, "stack_size": 20, - "vitamins": [ [ "calcium", 2 ], [ "iron", 6 ] ], + "vitamins": [ [ "calcium", 2 ], [ "iron", 6 ], [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ], "fun": 7 }, { @@ -419,12 +429,12 @@ "description": "Boiling the sap of a maple tree has concentrated it into sweet, delicious maple syrup.", "price": "6 USD", "price_postapoc": "750 cent", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "phase": "liquid", "charges": 16, "fun": 5, - "vitamins": [ [ "calcium", 2 ] ] + "vitamins": [ [ "calcium", 2 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -440,10 +450,10 @@ "description": "A thick syrup produced from shredded sugar beets. Useful in cooking as a sweetener.", "price": "15 USD", "price_postapoc": "350 cent", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "phase": "liquid", - "vitamins": [ [ "iron", 34 ] ], + "vitamins": [ [ "iron", 34 ], [ "junk_allergen", 1 ] ], "charges": 16 }, { @@ -462,7 +472,7 @@ "material": [ "wheat", "junk" ], "volume": "2 L", "charges": 12, - "vitamins": [ [ "calcium", 3 ], [ "iron", 6 ] ], + "vitamins": [ [ "calcium", 3 ], [ "iron", 6 ], [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ], "fun": 15 }, { @@ -505,7 +515,8 @@ "volume": "250 ml", "charges": 5, "stack_size": 30, - "fun": 2 + "fun": 2, + "vitamins": [ [ "veggy_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -522,10 +533,10 @@ "description": "Fast-food fried potatoes. Somehow, they're still edible.", "price": "120 cent", "price_postapoc": "50 cent", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "fun": 4, - "vitamins": [ [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 3 ] ], + "vitamins": [ [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 3 ], [ "junk_allergen", 1 ] ], "flags": [ "EATEN_HOT" ] }, { @@ -551,10 +562,11 @@ "description": "A handful of soft chocolate-covered peppermint patties… yum!", "price": "130 cent", "price_postapoc": "150 cent", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "charges": 3, - "fun": 4 + "fun": 4, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -571,9 +583,10 @@ "description": "A handful of candy wafers, in assorted flavors: orange, lemon, lime, clove, chocolate, wintergreen, cinnamon, and licorice. Yum!", "price": "1 USD", "price_postapoc": "1 USD", - "material": "junk", + "material": [ "junk" ], "volume": "40 ml", - "fun": 4 + "fun": 4, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -590,10 +603,11 @@ "description": "Candy sticks. Slightly more healthy than tobacco cigarettes, but with no possibility of addiction.", "price": "130 cent", "price_postapoc": "1 USD", - "material": "junk", + "material": [ "junk" ], "volume": "84 ml", "charges": 3, - "fun": 4 + "fun": 4, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -610,10 +624,10 @@ "description": "Some caramel. Still bad for your health.", "price": "150 cent", "price_postapoc": "5 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "charges": 5, - "vitamins": [ [ "calcium", 9 ], [ "vitB", 8 ] ], + "vitamins": [ [ "calcium", 9 ], [ "vitB", 8 ], [ "junk_allergen", 1 ] ], "fun": 2 }, { @@ -630,10 +644,10 @@ "description": "Betcha can't eat just one.", "price": "180 cent", "price_postapoc": "2 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "charges": 3, - "vitamins": [ [ "vitC", 7 ], [ "calcium", 1 ], [ "iron", 2 ] ], + "vitamins": [ [ "vitC", 7 ], [ "calcium", 1 ], [ "iron", 2 ], [ "junk_allergen", 1 ] ], "fun": 6 }, { @@ -650,9 +664,9 @@ "description": "Sugary breakfast cereal with marshmallows. It takes you back to your childhood.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", - "vitamins": [ [ "vitA", 21 ], [ "vitC", 17 ], [ "calcium", 13 ], [ "iron", 48 ] ], + "vitamins": [ [ "vitA", 21 ], [ "vitC", 17 ], [ "calcium", 13 ], [ "iron", 48 ], [ "junk_allergen", 1 ] ], "fun": 10 }, { @@ -669,9 +683,9 @@ "description": "Plain cornflake cereal. They're not that good, but it beats nothing.", "price": "3 USD", "price_postapoc": "75 cent", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", - "vitamins": [ [ "iron", 42 ] ], + "vitamins": [ [ "iron", 42 ], [ "junk_allergen", 1 ] ], "fun": 6 }, { @@ -688,9 +702,9 @@ "description": "Salted chips made from corn tortillas, could really use some cheese, maybe some beef.", "price": "170 cent", "price_postapoc": "150 cent", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", - "vitamins": [ [ "calcium", 5 ], [ "iron", 3 ] ], + "vitamins": [ [ "calcium", 5 ], [ "iron", 3 ], [ "junk_allergen", 1 ] ], "fun": 8 }, { @@ -713,14 +727,14 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 16, - "vitamins": [ [ "calcium", 12 ], [ "iron", 6 ] ] + "vitamins": [ [ "calcium", 12 ], [ "iron", 6 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "nachosm", "name": { "str_sp": "meat nachos" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "niño nachos" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "niño nachos" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "nachos con chupacabra" } } ], "weight": "125 g", @@ -739,14 +753,14 @@ "charges": 3, "flags": [ "EATEN_HOT" ], "fun": 16, - "vitamins": [ [ "vitC", 5 ], [ "calcium", 2 ], [ "iron", 24 ], [ "vitB", 259 ] ] + "vitamins": [ [ "vitC", 5 ], [ "calcium", 2 ], [ "iron", 24 ], [ "vitB", 259 ], [ "meat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "nachosmc", "name": { "str_sp": "meat nachos with cheese" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "niño nachos with cheese" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "niño nachos with cheese" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "cheese and chupacabra nachos" } } ], "weight": "22 g", @@ -765,7 +779,15 @@ "volume": "500 ml", "flags": [ "EATEN_HOT" ], "fun": 20, - "vitamins": [ [ "vitA", 10 ], [ "calcium", 10 ], [ "iron", 12 ], [ "vitB", 29 ] ] + "vitamins": [ + [ "vitA", 10 ], + [ "calcium", 10 ], + [ "iron", 12 ], + [ "vitB", 29 ], + [ "meat_allergen", 1 ], + [ "junk_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -784,7 +806,7 @@ "material": [ "flesh", "junk" ], "volume": "250 ml", "charges": 4, - "vitamins": [ [ "vitA", 1 ], [ "calcium", 8 ], [ "iron", 4 ] ], + "vitamins": [ [ "vitA", 1 ], [ "calcium", 8 ], [ "iron", 4 ], [ "meat_allergen", 1 ], [ "junk_allergen", 1 ] ], "fun": 4 }, { @@ -807,7 +829,8 @@ "primary_material": "processed_food", "volume": "250 ml", "flags": [ "EATEN_HOT" ], - "fun": 5 + "fun": 5, + "vitamins": [ [ "meat_allergen", 1 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -829,7 +852,8 @@ "primary_material": "processed_food", "volume": "1 L", "charges": 2, - "fun": -3 + "fun": -3, + "vitamins": [ [ "meat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -851,7 +875,8 @@ "volume": "1 L", "charges": 2, "flags": [ "EATEN_HOT" ], - "fun": 2 + "fun": 2, + "vitamins": [ [ "meat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -872,7 +897,7 @@ "volume": "1 L", "charges": 4, "fun": 12, - "vitamins": [ [ "iron", 4 ] ] + "vitamins": [ [ "iron", 4 ], [ "meat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -894,7 +919,15 @@ "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 15, - "vitamins": [ [ "vitA", 7 ], [ "vitC", 46 ], [ "calcium", 14 ], [ "iron", 21 ] ] + "vitamins": [ + [ "vitA", 7 ], + [ "vitC", 46 ], + [ "calcium", 14 ], + [ "iron", 21 ], + [ "meat_allergen", 1 ], + [ "wheat_allergen", 1 ], + [ "junk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -916,7 +949,7 @@ "charges": 2, "flags": [ "EATEN_HOT" ], "fun": -18, - "vitamins": [ [ "vitA", 4 ], [ "calcium", 6 ], [ "iron", 8 ], [ "vitB", 15 ] ] + "vitamins": [ [ "vitA", 4 ], [ "calcium", 6 ], [ "iron", 8 ], [ "vitB", 15 ], [ "meat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -955,7 +988,15 @@ "material": [ "wheat", "junk", "milk" ], "primary_material": "processed_food", "fun": 6, - "vitamins": [ [ "vitA", 5 ], [ "calcium", 5 ], [ "iron", 17 ], [ "vitB", 33 ] ] + "vitamins": [ + [ "vitA", 5 ], + [ "calcium", 5 ], + [ "iron", 17 ], + [ "vitB", 33 ], + [ "wheat_allergen", 1 ], + [ "junk_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -975,7 +1016,15 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 12, - "vitamins": [ [ "vitA", 7 ], [ "calcium", 25 ], [ "iron", 25 ], [ "vitB", 63 ] ] + "vitamins": [ + [ "vitA", 7 ], + [ "calcium", 25 ], + [ "iron", 25 ], + [ "vitB", 63 ], + [ "wheat_allergen", 1 ], + [ "junk_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -997,7 +1046,7 @@ "charges": 8, "flags": [ "EATEN_HOT" ], "fun": 6, - "vitamins": [ [ "vitA", 1 ], [ "calcium", 15 ] ] + "vitamins": [ [ "vitA", 1 ], [ "calcium", 15 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1019,7 +1068,7 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 6, - "vitamins": [ [ "vitA", 7 ], [ "vitC", 4 ], [ "calcium", 17 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitA", 7 ], [ "vitC", 4 ], [ "calcium", 17 ], [ "iron", 3 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1040,7 +1089,7 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 6, - "vitamins": [ [ "calcium", 4 ], [ "iron", 7 ] ] + "vitamins": [ [ "calcium", 4 ], [ "iron", 7 ], [ "veggy_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1062,7 +1111,7 @@ "charges": 10, "flags": [ "EATEN_HOT" ], "fun": -6, - "vitamins": [ [ "iron", 3 ] ] + "vitamins": [ [ "iron", 3 ], [ "meat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "id": "hotdogs_campfire", @@ -1093,7 +1142,14 @@ "volume": "500 ml", "flags": [ "EATEN_HOT" ], "fun": 12, - "vitamins": [ [ "vitC", 85 ], [ "calcium", 22 ], [ "iron", 15 ] ] + "vitamins": [ + [ "vitC", 85 ], + [ "calcium", 22 ], + [ "iron", 15 ], + [ "meat_allergen", 1 ], + [ "wheat_allergen", 1 ], + [ "junk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -1114,7 +1170,7 @@ "primary_material": "processed_food", "volume": "500 ml", "charges": 4, - "vitamins": [ [ "calcium", 4 ] ], + "vitamins": [ [ "calcium", 4 ], [ "junk_allergen", 1 ], [ "milk_allergen", 1 ] ], "fun": 6 } ] diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 16280d673cd3..b86a4815920a 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -4,7 +4,7 @@ "id": "sausage_raw", "name": "raw sausage", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "raw Mannwurst" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "raw Mannwurst" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "sinister %s" } } ], "weight": "148 g", @@ -19,11 +19,11 @@ "description": "A hefty raw sausage, prepared for smoking or cooking.", "price": "16 USD", "price_postapoc": "2 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "flags": [ "SMOKABLE" ], "smoking_result": "sausage", - "vitamins": [ [ "vitA", 2 ], [ "calcium", 2 ], [ "iron", 6 ], [ "vitB", 36 ] ], + "vitamins": [ [ "vitA", 2 ], [ "calcium", 2 ], [ "iron", 6 ], [ "vitB", 36 ], [ "meat_allergen", 1 ] ], "fun": -10 }, { @@ -31,7 +31,7 @@ "id": "sausage", "name": "smoked sausage", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "smoked Mannwurst" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "smoked Mannwurst" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "sinister %s" } } ], "copy-from": "sausage_raw", @@ -48,7 +48,7 @@ "id": "sausage_cooked", "name": "cooked sausage", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "cooked Mannwurst" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "cooked Mannwurst" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "sinister %s" } } ], "copy-from": "sausage_raw", @@ -80,7 +80,7 @@ "looks_like": "meat_cooked", "name": { "str_sp": "potted meat" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "potted person" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "potted person" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "potted freak" } } ], "weight": "351 g", @@ -96,7 +96,7 @@ "price_postapoc": "350 cent", "material": [ "flesh" ], "volume": "250 ml", - "vitamins": [ [ "calcium", 2 ], [ "iron", 20 ] ], + "vitamins": [ [ "calcium", 2 ], [ "iron", 20 ], [ "meat_allergen", 1 ] ], "fun": 1, "flags": [ "EATEN_HOT" ] }, @@ -113,10 +113,10 @@ "calories": 539, "description": "A sweet and delicious sausage. Better eat it fresh.", "price": "24 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "price_postapoc": "250 cent", - "vitamins": [ [ "vitA", 30 ], [ "vitC", 4 ], [ "iron", 22 ], [ "vitB", 36 ] ], + "vitamins": [ [ "vitA", 30 ], [ "vitC", 4 ], [ "iron", 22 ], [ "vitB", 36 ], [ "meat_allergen", 1 ] ], "flags": [ "EATEN_HOT" ], "fun": 8 }, @@ -125,7 +125,7 @@ "id": "bratwurst_sausage", "name": { "str": "bratwurst" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "Mannbrat" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "Mannbrat" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "baleful %s" } } ], "weight": "100 g", @@ -139,11 +139,12 @@ "description": "A type of German sausage made of finely chopped meat and meant to be pan fried or roasted. Better eat it hot and fresh.", "price": "18 USD", "price_postapoc": "15 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "500 ml", "charges": 10, "flags": [ "EATEN_HOT" ], - "fun": 5 + "fun": 5, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -159,10 +160,10 @@ "description": "A chunk of meat with a coat of honey or royal jelly over it, making it quite rich and savory.", "price": "210 USD", "price_postapoc": "45 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "500 ml", "fun": 7, - "vitamins": [ [ "vitC", 16 ], [ "calcium", 2 ], [ "iron", 69 ], [ "vitB", 778 ] ] + "vitamins": [ [ "vitC", 16 ], [ "calcium", 2 ], [ "iron", 69 ], [ "vitB", 778 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -179,11 +180,11 @@ "description": "A thick slab of salty cured bacon. Shelf stable, precooked and ready-to-eat, it tastes better when reheated.", "price": "19 USD", "price_postapoc": "5 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "charges": 2, "flags": [ "EATEN_HOT" ], - "vitamins": [ [ "calcium", 1 ], [ "iron", 5 ], [ "vitB", 39 ] ], + "vitamins": [ [ "calcium", 1 ], [ "iron", 5 ], [ "vitB", 39 ], [ "meat_allergen", 1 ] ], "fun": 5 }, { @@ -262,7 +263,7 @@ "id": "cracklins", "name": { "str_sp": "cracklins" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "long pork rinds" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "long pork rinds" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "cursed %s" } } ], "weight": "42 g", @@ -276,11 +277,12 @@ "description": "Also known as pork rinds or chicharrones, these are bits of edible fat and skin that have been fried until they are crispy and delicious.", "price": "170 cent", "price_postapoc": "5 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "charges": 4, "flags": [ "EATEN_HOT" ], - "fun": 4 + "fun": 4, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -304,14 +306,22 @@ "charges": 3, "flags": [ "EATEN_HOT" ], "fun": 18, - "vitamins": [ [ "vitA", 5 ], [ "vitC", 17 ], [ "calcium", 8 ], [ "iron", 32 ], [ "vitB", 259 ] ] + "vitamins": [ + [ "vitA", 5 ], + [ "vitC", 17 ], + [ "calcium", 8 ], + [ "iron", 32 ], + [ "vitB", 259 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ] + ] }, { "type": "COMESTIBLE", "id": "currywurst", "name": "currywurst", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "cheapskate %s" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "cheapskate %s" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "bloodcurdling %s" } } ], "weight": "85 g", @@ -325,12 +335,12 @@ "description": "Sausage covered in a curry ketchup sauce. Fairly spicy and impressive at the same time!", "price": "9 USD", "price_postapoc": "350 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 10, - "vitamins": [ [ "vitA", 2 ], [ "calcium", 20 ], [ "iron", 10 ] ] + "vitamins": [ [ "vitA", 2 ], [ "calcium", 20 ], [ "iron", 10 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -338,7 +348,7 @@ "name": { "str": "aspic" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "abomination %s" } }, - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "amoral %s" } } + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "amoral %s" } } ], "weight": "154 g", "color": "red", @@ -350,9 +360,9 @@ "description": "A dish in which meat or fish is set into a gelatin made from a meat or vegetable stock.", "price": "25 USD", "price_postapoc": "150 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", - "vitamins": [ [ "vitA", 10 ], [ "vitC", 15 ], [ "calcium", 2 ], [ "iron", 8 ] ], + "vitamins": [ [ "vitA", 10 ], [ "vitC", 15 ], [ "calcium", 2 ], [ "iron", 8 ], [ "meat_allergen", 1 ] ], "flags": [ "EATEN_COLD" ] }, { @@ -391,8 +401,9 @@ "quench": -1, "healthy": 1, "description": "This is a serving of crisply brined and canned fish. Tasty and nutritious.", - "material": "flesh", - "fun": 7 + "material": [ "flesh" ], + "fun": 7, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -421,11 +432,11 @@ "description": "A delicious golden brown serving of crispy fried fish.", "price": "5 USD", "price_postapoc": "4 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 10, - "vitamins": [ [ "calcium", 3 ], [ "iron", 5 ], [ "vitB", 94 ] ] + "vitamins": [ [ "calcium", 3 ], [ "iron", 5 ], [ "vitB", 94 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -444,16 +455,16 @@ "price": "14 cent", "price_postapoc": "75 cent", "//": "*Looking for ~$6 per pound here.", - "material": "flesh", + "material": [ "flesh" ], "volume": "75 ml", - "vitamins": [ [ "iron", 2 ] ] + "vitamins": [ [ "iron", 2 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "bologna", "name": { "str_sp": "bologna" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "brat %s" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "brat %s" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "bleak %s" } } ], "weight": "56 g", @@ -468,10 +479,10 @@ "description": "Formally known as Bologna sausage, this is a finely ground preserved meat that comes in circular slices. Its first name isn't Oscar. You can eat it cold.", "price": "10 USD", "price_postapoc": "250 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "750 ml", "charges": 10, - "vitamins": [ [ "iron", 15 ], [ "vitB", 8 ] ] + "vitamins": [ [ "iron", 15 ], [ "vitB", 8 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -488,12 +499,12 @@ "description": "Lutefisk is preserved fish that has been dried in a lye solution. Vile and soap-like yet highly nutritious, it is reminiscent of the afterbirth of a dog or the world's largest chunk of phlegm.", "price": "2 USD", "price_postapoc": "250 cent", - "material": "flesh", + "material": [ "flesh" ], "primary_material": "cured_meat", "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": -15, - "vitamins": [ [ "iron", 3 ] ] + "vitamins": [ [ "iron", 3 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -511,12 +522,12 @@ "description": "A canned pork product that is unnaturally pink, oddly rubbery, and not very tasty, this SPAM remains quite filling. Completely unappetizing, but quite filling.", "price": "4 USD", "price_postapoc": "3 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "500 ml", "charges": 6, "flags": [ "EATEN_HOT" ], "fun": -2, - "vitamins": [ [ "iron", 3 ] ] + "vitamins": [ [ "iron", 3 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -543,18 +554,22 @@ "description": "Salty little fish. They'll make you thirsty.", "price": "2 USD", "price_postapoc": "3 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 1, - "vitamins": [ [ "calcium", 40 ], [ "iron", 12 ] ] + "vitamins": [ [ "calcium", 40 ], [ "iron", 12 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "sausagegravy", "name": { "str": "sausage gravy", "str_pl": "sausage gravies" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "Mannwurst gravy", "str_pl": "Mannwurst gravies" } }, + { + "type": "VITAMIN", + "condition": "human_flesh_vitamin", + "name": { "str": "Mannwurst gravy", "str_pl": "Mannwurst gravies" } + }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "ghastly %s" } } ], "weight": "60 g", @@ -571,14 +586,15 @@ "material": [ "flesh", "wheat", "mushroom" ], "volume": "250 ml", "flags": [ "EATEN_HOT" ], - "fun": 9 + "fun": 9, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "pemmican", "name": { "str_sp": "pemmican" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "prepper %s" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "prepper %s" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "pernicious %s" } } ], "weight": "106 g", @@ -593,7 +609,7 @@ "price_postapoc": "350 cent", "material": [ "flesh", "veggy" ], "volume": "250 ml", - "vitamins": [ [ "vitC", 3 ], [ "calcium", 24 ], [ "iron", 14 ] ], + "vitamins": [ [ "vitC", 3 ], [ "calcium", 24 ], [ "iron", 14 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ], "fun": 3 }, { @@ -601,7 +617,7 @@ "id": "macaroni_helper", "name": "hamburger helper", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "hobo helper" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "hobo helper" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "heinous %s" } } ], "weight": "170 g", @@ -620,7 +636,16 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 5, - "vitamins": [ [ "vitA", 15 ], [ "vitC", 4 ], [ "calcium", 32 ], [ "iron", 20 ], [ "vitB", 195 ] ] + "vitamins": [ + [ "vitA", 15 ], + [ "vitC", 4 ], + [ "calcium", 32 ], + [ "iron", 20 ], + [ "vitB", 195 ], + [ "meat_allergen", 1 ], + [ "wheat_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -640,14 +665,18 @@ "volume": "500 ml", "flags": [ "EATEN_HOT" ], "charges": 2, - "vitamins": [ [ "vitA", 6 ], [ "calcium", 16 ], [ "iron", 9 ] ] + "vitamins": [ [ "vitA", 6 ], [ "calcium", 16 ], [ "iron", 9 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "chili", "name": { "str": "chili con carne", "str_pl": "chilis con carne" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "chili con cabron", "str_pl": "chilis con cabron" } }, + { + "type": "VITAMIN", + "condition": "human_flesh_vitamin", + "name": { "str": "chili con cabron", "str_pl": "chilis con cabron" } + }, { "type": "COMPONENT_ID", "condition": "mutant", @@ -670,7 +699,7 @@ "flags": [ "EATEN_HOT" ], "fun": 5, "charges": 2, - "vitamins": [ [ "vitA", 14 ], [ "vitC", 7 ], [ "calcium", 6 ], [ "iron", 27 ] ] + "vitamins": [ [ "vitA", 14 ], [ "vitC", 7 ], [ "calcium", 6 ], [ "iron", 27 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -692,7 +721,7 @@ "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 5, - "vitamins": [ [ "vitC", 6 ], [ "calcium", 14 ], [ "iron", 25 ] ] + "vitamins": [ [ "vitC", 6 ], [ "calcium", 14 ], [ "iron", 25 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -708,10 +737,10 @@ "description": "Now with 95 percent fewer dolphins!", "price": "2 USD", "price_postapoc": "3 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "fun": 2, - "vitamins": [ [ "vitA", 4 ], [ "calcium", 2 ], [ "iron", 12 ], [ "vitB", 141 ] ] + "vitamins": [ [ "vitA", 4 ], [ "calcium", 2 ], [ "iron", 12 ], [ "vitB", 141 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -727,10 +756,10 @@ "description": "Bright pink fish-paste in a can!", "price": "5 USD", "price_postapoc": "350 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "fun": 1, - "vitamins": [ [ "vitA", 4 ], [ "calcium", 57 ], [ "iron", 9 ], [ "vitB", 413 ] ] + "vitamins": [ [ "vitA", 4 ], [ "calcium", 57 ], [ "iron", 9 ], [ "vitB", 413 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -746,11 +775,11 @@ "description": "Bright white chicken-paste.", "price": "4 USD", "price_postapoc": "6 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "500 ml", "charges": 2, "fun": 1, - "vitamins": [ [ "vitA", 18 ], [ "calcium", 3 ], [ "iron", 18 ], [ "vitB", 34 ] ] + "vitamins": [ [ "vitA", 18 ], [ "calcium", 3 ], [ "iron", 18 ], [ "vitB", 34 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -766,11 +795,11 @@ "description": "Fish fillets pickled in some sort of tangy white sauce.", "price": "310 cent", "price_postapoc": "7 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "500 ml", "fun": 3, "charges": 2, - "vitamins": [ [ "calcium", 34 ], [ "iron", 34 ] ] + "vitamins": [ [ "calcium", 34 ], [ "iron", 34 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -787,10 +816,10 @@ "description": "Chopped quahog clams in water.", "price": "5 USD", "price_postapoc": "5 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "fun": 2, - "vitamins": [ [ "vitA", 28 ], [ "calcium", 11 ], [ "iron", 25 ], [ "vitB", 1312 ] ] + "vitamins": [ [ "vitA", 28 ], [ "calcium", 11 ], [ "iron", 25 ], [ "vitB", 1312 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -816,7 +845,15 @@ "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 6, - "vitamins": [ [ "vitA", 20 ], [ "vitC", 14 ], [ "calcium", 7 ], [ "iron", 16 ], [ "vitB", 348 ] ] + "vitamins": [ + [ "vitA", 20 ], + [ "vitC", 14 ], + [ "calcium", 7 ], + [ "iron", 16 ], + [ "vitB", 348 ], + [ "meat_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -838,7 +875,7 @@ "//": "One beans + one protein = 2 servings", "flags": [ "EATEN_HOT" ], "fun": 4, - "vitamins": [ [ "vitC", 10 ], [ "calcium", 6 ], [ "iron", 51 ], [ "vitB", 389 ] ] + "vitamins": [ [ "vitC", 10 ], [ "calcium", 6 ], [ "iron", 51 ], [ "vitB", 389 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -860,7 +897,15 @@ "//": "One rice + one protein/veg = 2 servings", "flags": [ "EATEN_HOT" ], "fun": 5, - "vitamins": [ [ "vitA", 1 ], [ "vitC", 8 ], [ "calcium", 1 ], [ "iron", 40 ], [ "vitB", 389 ] ] + "vitamins": [ + [ "vitA", 1 ], + [ "vitC", 8 ], + [ "calcium", 1 ], + [ "iron", 40 ], + [ "vitB", 389 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -882,14 +927,14 @@ "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 4, - "vitamins": [ [ "vitA", 2 ], [ "vitC", 5 ], [ "calcium", 4 ], [ "iron", 10 ] ] + "vitamins": [ [ "vitA", 2 ], [ "vitC", 5 ], [ "calcium", 4 ], [ "iron", 10 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "pie_meat", "name": "meat pie", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "prick pie" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "prick pie" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "malignant %s" } } ], "weight": "189 g", @@ -909,14 +954,14 @@ "charges": 8, "flags": [ "EATEN_HOT" ], "fun": 3, - "vitamins": [ [ "calcium", 2 ], [ "iron", 14 ] ] + "vitamins": [ [ "calcium", 2 ], [ "iron", 14 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "pizza_meat", "name": "meat pizza", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "poser pizza" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "poser pizza" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "miserable %s" } } ], "weight": "230 g", @@ -934,7 +979,7 @@ "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 10, - "vitamins": [ [ "vitA", 3 ], [ "vitC", 10 ], [ "calcium", 28 ], [ "iron", 28 ] ] + "vitamins": [ [ "vitA", 3 ], [ "vitC", 10 ], [ "calcium", 28 ], [ "iron", 28 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -949,7 +994,16 @@ "price_postapoc": "15 USD", "material": [ "wheat", "flesh", "veggy", "milk" ], "fun": 11, - "vitamins": [ [ "vitA", 12 ], [ "vitC", 20 ], [ "calcium", 32 ], [ "iron", 28 ] ] + "vitamins": [ + [ "vitA", 12 ], + [ "vitC", 20 ], + [ "calcium", 32 ], + [ "iron", 28 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ], + [ "wheat_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -971,14 +1025,22 @@ "charges": 3, "flags": [ "EATEN_HOT" ], "fun": 4, - "vitamins": [ [ "vitA", 9 ], [ "vitC", 8 ], [ "calcium", 4 ], [ "iron", 39 ], [ "vitB", 410 ] ] + "vitamins": [ + [ "vitA", 9 ], + [ "vitC", 8 ], + [ "calcium", 4 ], + [ "iron", 39 ], + [ "vitB", 410 ], + [ "meat_allergen", 1 ], + [ "egg_allergen", 1 ] + ] }, { "type": "COMESTIBLE", "id": "meat_canned", "name": "canned meat", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "soylent slice" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "soylent slice" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "%s, mutant" } } ], "copy-from": "meat_cooked", @@ -995,7 +1057,7 @@ "id": "meat_salted", "name": "salted meat slice", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "salted simpleton slice" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "salted simpleton slice" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "%s, mutant" } } ], "copy-from": "meat_cooked", @@ -1005,17 +1067,18 @@ "description": "Meat slices cured in brine. Salty but tasty in a pinch.", "price": "5 USD", "price_postapoc": "3 USD", - "material": "flesh", + "material": [ "flesh" ], "delete": { "flags": [ "NUTRIENT_OVERRIDE" ] }, "primary_material": "cured_meat", - "fun": 2 + "fun": 2, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "spaghetti_bolognese", "name": { "str_sp": "spaghetti bolognese" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "scoundrel spaghetti" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "scoundrel spaghetti" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "gnarly %s" } } ], "weight": "150 g", @@ -1033,14 +1096,14 @@ "charges": 8, "flags": [ "EATEN_HOT" ], "fun": 4, - "vitamins": [ [ "vitA", 3 ], [ "vitC", 3 ], [ "calcium", 13 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 3 ], [ "vitC", 3 ], [ "calcium", 13 ], [ "iron", 4 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "lasagne", "name": "lasagne", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "Luigi %s" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "Luigi %s" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "monster %s" } } ], "weight": "255 g", @@ -1060,7 +1123,15 @@ "charges": 8, "flags": [ "EATEN_HOT" ], "fun": 15, - "vitamins": [ [ "vitA", 5 ], [ "vitC", 19 ], [ "calcium", 22 ], [ "iron", 10 ] ] + "vitamins": [ + [ "vitA", 5 ], + [ "vitC", 19 ], + [ "calcium", 22 ], + [ "iron", 10 ], + [ "meat_allergen", 1 ], + [ "wheat_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -1072,16 +1143,17 @@ "quench": -6, "description": "Having been fried, this SPAM is actually pretty tasty.", "price": "5 USD", - "material": "flesh", + "material": [ "flesh" ], "flags": [ "EATEN_HOT" ], - "fun": 8 + "fun": 8, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "cheeseburger", "name": "cheeseburger", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "chump %s" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "chump %s" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "chilling %s" } } ], "weight": "133 g", @@ -1099,14 +1171,14 @@ "volume": "500 ml", "flags": [ "EATEN_HOT", "ALLERGEN_MILK" ], "fun": 5, - "vitamins": [ [ "calcium", 9 ], [ "iron", 14 ] ] + "vitamins": [ [ "calcium", 9 ], [ "iron", 14 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "hamburger", "name": "hamburger", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "bobburger" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "bobburger" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "horrible %s" } } ], "weight": "99 g", @@ -1123,14 +1195,14 @@ "volume": "500 ml", "flags": [ "EATEN_HOT" ], "fun": 4, - "vitamins": [ [ "vitC", 2 ], [ "calcium", 8 ], [ "iron", 16 ] ] + "vitamins": [ [ "vitC", 2 ], [ "calcium", 8 ], [ "iron", 16 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "sloppyjoe", "name": "sloppy joe", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "manwich", "str_pl": "manwiches" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str": "manwich", "str_pl": "manwiches" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "suspicious %s" } } ], "weight": "113 g", @@ -1147,14 +1219,21 @@ "volume": "500 ml", "flags": [ "EATEN_HOT" ], "fun": 4, - "vitamins": [ [ "vitC", 5 ], [ "calcium", 4 ], [ "iron", 5 ] ] + "vitamins": [ + [ "vitC", 5 ], + [ "calcium", 4 ], + [ "iron", 5 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ], + [ "wheat_allergen", 1 ] + ] }, { "type": "COMESTIBLE", "id": "taco", "name": "taco", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "tio %s" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "tio %s" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "terrifying %s" } } ], "weight": "102 g", @@ -1168,17 +1247,17 @@ "description": "A traditional Mexican dish composed of a corn tortilla folded or rolled around a meat filling.", "price": "210 cent", "price_postapoc": "150 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "250 ml", "fun": 8, - "vitamins": [ [ "calcium", 13 ], [ "iron", 9 ], [ "vitB", 36 ] ] + "vitamins": [ [ "calcium", 13 ], [ "iron", 9 ], [ "vitB", 36 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "meat_pickled", "name": "pickled meat", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "pickled punk" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "pickled punk" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "%s, mutant" } } ], "copy-from": "meat_cooked", @@ -1197,7 +1276,7 @@ "id": "dry_meat", "name": "dehydrated meat", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "%s, human" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "%s, human" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "%s, mutant" } } ], "copy-from": "meat_cooked", @@ -1209,16 +1288,17 @@ "price": "9 USD", "price_postapoc": "3 USD", "delete": { "flags": [ "NUTRIENT_OVERRIDE" ] }, - "material": "flesh", + "material": [ "flesh" ], "primary_material": "cured_meat", - "volume": "125 ml" + "volume": "125 ml", + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "rehydrated_meat", "name": "rehydrated meat", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "%s, human" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "%s, human" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "%s, mutant" } } ], "copy-from": "meat_cooked", @@ -1233,7 +1313,7 @@ "type": "COMESTIBLE", "id": "haggis", "name": { "str": "haggis", "str_pl": "haggises" }, - "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "human %s" } } ], + "conditional_names": [ { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "human %s" } } ], "//": "That's whisky without an 'e' because we're talking about Scotch whisky.", "weight": "156 g", "color": "brown", @@ -1250,7 +1330,7 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 2, - "vitamins": [ [ "vitA", 144 ], [ "vitC", 21 ], [ "calcium", 1 ], [ "iron", 29 ] ] + "vitamins": [ [ "vitA", 144 ], [ "vitC", 21 ], [ "calcium", 1 ], [ "iron", 29 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1270,7 +1350,15 @@ "volume": "750 ml", "charges": 3, "fun": 14, - "vitamins": [ [ "vitA", 1 ], [ "vitC", 23 ], [ "calcium", 3 ], [ "iron", 3 ], [ "vitB", 22 ] ] + "vitamins": [ + [ "vitA", 1 ], + [ "vitC", 23 ], + [ "calcium", 3 ], + [ "iron", 3 ], + [ "vitB", 22 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -1291,7 +1379,7 @@ "volume": "1 L", "charges": 2, "fun": 13, - "vitamins": [ [ "vitC", 36 ], [ "calcium", 4 ], [ "iron", 37 ], [ "vitB", 389 ] ] + "vitamins": [ [ "vitC", 36 ], [ "calcium", 4 ], [ "iron", 37 ], [ "vitB", 389 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1306,7 +1394,8 @@ "price": "6 USD", "price_postapoc": "3 USD", "material": [ "veggy", "flesh" ], - "fun": 7 + "fun": 7, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1321,10 +1410,11 @@ "description": "Pieces of poisonous meat that have been dried to prevent them from rotting away. It will still poison you if you eat this.", "price": "0 cent", "price_postapoc": "10 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "125 ml", "fun": -4, - "delete": { "flags": [ "RAW" ] } + "delete": { "flags": [ "RAW" ] }, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1345,7 +1435,7 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 6, - "vitamins": [ [ "vitC", 3 ], [ "calcium", 2 ], [ "iron", 15 ] ] + "vitamins": [ [ "vitC", 3 ], [ "calcium", 2 ], [ "iron", 15 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -1367,7 +1457,7 @@ "charges": 3, "flags": [ "EATEN_HOT" ], "fun": 7, - "vitamins": [ [ "vitC", 3 ], [ "calcium", 19 ], [ "iron", 12 ] ] + "vitamins": [ [ "vitC", 3 ], [ "calcium", 19 ], [ "iron", 12 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "id": "curdled_blood", @@ -1387,7 +1477,7 @@ "id": "bibimbap", "name": { "str_sp": "bibimbap" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "saram %s" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "saram %s" }, { "type": "COMPONENT_ID", "condition": "fish", "name": "sashimi %s" } ], "type": "COMESTIBLE", @@ -1402,13 +1492,14 @@ "calories": 680, "material": [ "veggy", "flesh" ], "fun": 10, - "looks_like": "rice_cooked" + "looks_like": "rice_cooked", + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "id": "bibimbap_simple", "name": { "str_sp": "simple bibimbap" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "saram %s" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "saram %s" }, { "type": "COMPONENT_ID", "condition": "fish", "name": "sashimi %s" } ], "type": "COMESTIBLE", @@ -1423,7 +1514,8 @@ "calories": 555, "material": [ "veggy", "flesh" ], "fun": 5, - "looks_like": "rice_cooked" + "looks_like": "rice_cooked", + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "id": "deluxe_rice_kimchi", @@ -1440,7 +1532,8 @@ "fun": 10, "material": [ "veggy", "flesh" ], "looks_like": "deluxe_rice", - "flags": [ "EATEN_HOT" ] + "flags": [ "EATEN_HOT" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "id": "samhap", @@ -1457,7 +1550,8 @@ "charges": 3, "fun": 12, "material": [ "veggy", "flesh" ], - "flags": [ "EATEN_HOT" ] + "flags": [ "EATEN_HOT" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "id": "bossam", @@ -1474,6 +1568,7 @@ "charges": 2, "fun": 10, "material": [ "veggy", "flesh" ], - "flags": [ "EATEN_HOT" ] + "flags": [ "EATEN_HOT" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index 8c3bbe4c53a0..bb1179212b8f 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -430,12 +430,13 @@ "description": "A potent cocktail of amphetamines, caffeine and corn syrup, this stuff puts a spring in your step, a fire in your eye, and a bad case of tachycardia tremors in your somersaulting heart.", "price": "90 USD", "price_postapoc": "3 USD", - "material": "junk", + "material": [ "junk" ], "volume": "250 ml", "phase": "liquid", "charges": 4, "flags": [ "EATEN_COLD" ], - "fun": 30 + "fun": 30, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "id": "contacts", diff --git a/data/json/items/comestibles/mre.json b/data/json/items/comestibles/mre.json index 02ee2531bf5c..7ece9f448c3e 100644 --- a/data/json/items/comestibles/mre.json +++ b/data/json/items/comestibles/mre.json @@ -256,7 +256,8 @@ "name": "chili & beans entree", "description": "The chili & beans entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "veggy", "bean" ], - "fun": -2 + "fun": -2, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -264,8 +265,9 @@ "copy-from": "mre_entree", "name": { "str": "BBQ beef entree" }, "description": "The BBQ beef entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", - "material": "flesh", - "fun": 2 + "material": [ "flesh" ], + "fun": 2, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -274,7 +276,8 @@ "name": "chicken noodle entree", "description": "The chicken noodle entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "veggy", "wheat" ], - "fun": 1 + "fun": 1, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -283,7 +286,8 @@ "name": "spaghetti entree", "description": "The spaghetti entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "wheat" ], - "fun": 0 + "fun": 0, + "vitamins": [ [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -291,7 +295,8 @@ "copy-from": "mre_entree", "name": "chicken chunks entree", "description": "The chicken chunks entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", - "material": "flesh" + "material": [ "flesh" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -300,7 +305,8 @@ "name": { "str": "beef taco entree" }, "description": "The beef taco entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "veggy" ], - "fun": 0 + "fun": 0, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -308,8 +314,9 @@ "copy-from": "mre_entree", "name": { "str": "beef brisket entree" }, "description": "The beef brisket entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", - "material": "flesh", - "fun": 1 + "material": [ "flesh" ], + "fun": 1, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -318,7 +325,8 @@ "name": "meatballs & marinara entree", "description": "The meatballs & marinara entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "tomato" ], - "fun": 0 + "fun": 0, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -327,7 +335,8 @@ "name": { "str": "beef stew entree" }, "description": "The beef stew entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "veggy" ], - "fun": 0 + "fun": 0, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -336,7 +345,8 @@ "name": "chili & macaroni entree", "description": "The chili & macaroni entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "wheat", "veggy" ], - "fun": 1 + "fun": 1, + "vitamins": [ [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -345,7 +355,8 @@ "name": "vegetarian taco entree", "description": "The vegetarian taco entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "veggy", "tomato" ], - "fun": -2 + "fun": -2, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -354,7 +365,8 @@ "name": "macaroni & marinara entree", "description": "The macaroni & marinara entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "tomato", "veggy" ], - "fun": 0 + "fun": 0, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -362,7 +374,8 @@ "copy-from": "mre_entree", "name": "cheese tortellini entree", "description": "The cheese tortellini entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", - "material": [ "tomato", "veggy", "milk" ] + "material": [ "tomato", "veggy", "milk" ], + "vitamins": [ [ "veggy_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -370,7 +383,8 @@ "copy-from": "mre_entree", "name": "mushroom fettuccine entree", "description": "The mushroom fettuccine entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", - "material": [ "mushroom", "veggy", "wheat" ] + "material": [ "mushroom", "veggy", "wheat" ], + "vitamins": [ [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -379,7 +393,8 @@ "name": { "str": "Mexican chicken stew entree" }, "description": "The Mexican chicken stew entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "tomato", "veggy", "flesh", "bean" ], - "fun": 1 + "fun": 1, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -388,7 +403,8 @@ "name": "chicken burrito bowl entree", "description": "The chicken burrito bowl entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "veggy", "bean" ], - "fun": 0 + "fun": 0, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -397,7 +413,8 @@ "name": "maple sausage entree", "description": "The maple sausage entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "junk" ], - "fun": 1 + "fun": 1, + "vitamins": [ [ "meat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -406,7 +423,8 @@ "name": "ravioli entree", "description": "The ravioli entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "wheat" ], - "fun": 0 + "fun": 0, + "vitamins": [ [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -414,7 +432,8 @@ "copy-from": "mre_entree", "name": "pepper jack beef entree", "description": "The pepper jack beef entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", - "material": [ "flesh", "milk" ] + "material": [ "flesh", "milk" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -423,7 +442,8 @@ "name": "hash browns & bacon entree", "description": "The hash browns & bacon entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "veggy" ], - "fun": 2 + "fun": 2, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -431,8 +451,9 @@ "copy-from": "mre_entree", "name": "lemon pepper tuna entree", "description": "The lemon pepper tuna entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", - "material": "flesh", - "fun": 2 + "material": [ "flesh" ], + "fun": 2, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -441,7 +462,8 @@ "name": { "str": "asian beef & vegetables entree" }, "description": "The asian beef & vegetables entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "veggy" ], - "fun": 1 + "fun": 1, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -450,7 +472,8 @@ "name": "chicken pesto & pasta entree", "description": "The chicken pesto & pasta entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "wheat", "veggy" ], - "fun": 0 + "fun": 0, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -459,7 +482,8 @@ "name": "southwest beef & beans entree", "description": "The southwest beef & beans entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "bean" ], - "fun": 2 + "fun": 2, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -469,6 +493,7 @@ "description": "The dreaded four fingers of death. It seems to be several decades old. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "price": "850 cent", "material": [ "flesh", "junk", "bean" ], - "fun": -6 + "fun": -6, + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "junk_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/mushroom.json b/data/json/items/comestibles/mushroom.json index 59db1d08abdc..ad90dbc72b30 100644 --- a/data/json/items/comestibles/mushroom.json +++ b/data/json/items/comestibles/mushroom.json @@ -28,13 +28,13 @@ "description": "Prized by chefs and woodsmen alike, morel mushrooms are delicious but must be cooked before they are safe to eat.", "price": "20 USD", "price_postapoc": "50 cent", - "material": "mushroom", + "material": [ "mushroom" ], "volume": "250 ml", "fun": 1, "charges": 6, "flags": [ "SMOKABLE", "UNSAFE_CONSUME" ], "smoking_result": "dry_mushroom", - "vitamins": [ [ "calcium", 2 ], [ "iron", 52 ] ] + "vitamins": [ [ "calcium", 2 ], [ "iron", 52 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -79,10 +79,11 @@ "description": "Dried mushrooms are a tasty and healthy addition to many meals.", "price": "180 cent", "price_postapoc": "1 USD", - "material": "mushroom", + "material": [ "mushroom" ], "primary_material": "dried_vegetable", "volume": "25 ml", - "fun": 1 + "fun": 1, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -98,12 +99,12 @@ "description": "Mushrooms are tasty, but be careful. Some can poison you, while others are hallucinogenic.", "price": "140 cent", "price_postapoc": "50 cent", - "material": "mushroom", + "material": [ "mushroom" ], "volume": "250 ml", "fun": -3, "charges": 10, "flags": [ "SMOKABLE", "FORAGE_POISON", "FORAGE_HALLU", "RAW" ], "smoking_result": "dry_mushroom", - "vitamins": [ [ "vitC", 2 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitC", 2 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index f686654aa81a..fe7f61a5f234 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -492,9 +492,10 @@ "description": "A deformed human fetus. Eating this would be the most vile thing you can think of, and just might cause you to mutate.", "price": "0 cent", "price_postapoc": "0 cent", - "material": "hflesh", + "material": [ "hflesh" ], "volume": "250 ml", - "fun": -60 + "fun": -60, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -513,9 +514,10 @@ "description": "A misshapen human arm. Eating this would be incredibly disgusting and probably cause you to mutate.", "price": "0 cent", "price_postapoc": "0 cent", - "material": "hflesh", + "material": [ "hflesh" ], "volume": "2 L", - "fun": -20 + "fun": -20, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -534,9 +536,10 @@ "description": "A malformed human leg. This would be gross to eat, and probably cause mutations.", "price": "0 cent", "price_postapoc": "0 cent", - "material": "hflesh", + "material": [ "hflesh" ], "volume": "5 L", - "fun": -20 + "fun": -20, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -561,7 +564,7 @@ "charges": 2, "flags": [ "NUTRIENT_OVERRIDE" ], "fun": -40, - "vitamins": [ [ "mutant_toxin", 2000 ] ] + "vitamins": [ [ "mutant_toxin", 2000 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -587,6 +590,6 @@ "charges": 2, "flags": [ "NUTRIENT_OVERRIDE" ], "fun": -15, - "vitamins": [ [ "mutant_toxin", 2000 ] ] + "vitamins": [ [ "mutant_toxin", 2000 ], [ "junk_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index 0909ec9941bd..083a416ced9b 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -14,11 +14,11 @@ "description": "A handful of tasty crunchy nuts from a pinecone.", "price": "136 cent", "price_postapoc": "6 USD", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE" ], "charges": 4, - "vitamins": [ [ "iron", 9 ] ], + "vitamins": [ [ "iron", 9 ], [ "nut_allergen", 1 ] ], "fun": 2 }, { @@ -36,10 +36,10 @@ "description": "A handful of junipers, for making gin and earthy flavors. Technically a seed cone, but resembles a small blue berry. Spicy, tastes similar to rosemary.", "price": "4 USD", "price_postapoc": "25 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": -2, - "vitamins": [ [ "vitA", 12 ], [ "vitC", 12 ], [ "calcium", 1 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 12 ], [ "vitC", 12 ], [ "calcium", 1 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -56,12 +56,12 @@ "description": "A handful of nuts from a pistachio tree.", "price": "1 USD", "price_postapoc": "6 USD", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE", "RAW", "SMOKABLE" ], "smoking_result": "pistachio_roasted", "charges": 4, - "vitamins": [ [ "vitA", 1 ], [ "vitC", 1 ], [ "calcium", 3 ], [ "iron", 7 ] ], + "vitamins": [ [ "vitA", 1 ], [ "vitC", 1 ], [ "calcium", 3 ], [ "iron", 7 ], [ "nut_allergen", 1 ] ], "fun": 1 }, { @@ -90,11 +90,11 @@ "description": "A handful of nuts from an almond tree.", "price": "1 USD", "price_postapoc": "6 USD", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE", "RAW", "SMOKABLE" ], "smoking_result": "almond_roasted", - "vitamins": [ [ "calcium", 6 ], [ "iron", 6 ] ], + "vitamins": [ [ "calcium", 6 ], [ "iron", 6 ], [ "nut_allergen", 1 ] ], "charges": 4, "fun": 1 }, @@ -111,9 +111,10 @@ "description": "Pulp left over after making almond milk. It's gritty and incredibly bland.", "price": "10 cent", "price_postapoc": "50 cent", - "material": "nut", + "material": [ "nut" ], "volume": "125 ml", - "fun": -8 + "fun": -8, + "vitamins": [ [ "nut_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -142,11 +143,11 @@ "description": "A handful of salty cashews.", "price": "110 cent", "price_postapoc": "6 USD", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE" ], "charges": 4, - "vitamins": [ [ "calcium", 1 ], [ "iron", 12 ] ], + "vitamins": [ [ "calcium", 1 ], [ "iron", 12 ], [ "nut_allergen", 1 ] ], "fun": 3 }, { @@ -164,12 +165,12 @@ "description": "A handful of pecans which are a sub-species of hickory nuts.", "price": "1 USD", "price_postapoc": "6 USD", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE", "RAW", "SMOKABLE" ], "smoking_result": "pecan_roasted", "charges": 4, - "vitamins": [ [ "calcium", 2 ], [ "iron", 4 ] ], + "vitamins": [ [ "calcium", 2 ], [ "iron", 4 ], [ "nut_allergen", 1 ] ], "fun": 1 }, { @@ -197,11 +198,11 @@ "description": "Salty peanuts, ready to eat.", "price": "1 USD", "price_postapoc": "6 USD", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE", "RAW" ], "charges": 4, - "vitamins": [ [ "calcium", 1 ], [ "iron", 3 ] ], + "vitamins": [ [ "calcium", 1 ], [ "iron", 3 ], [ "nut_allergen", 1 ] ], "fun": 3 }, { @@ -218,10 +219,10 @@ "description": "A handful of hard pointy nuts from a beech tree.", "price": "0 cent", "price_postapoc": "4 USD", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE", "RAW" ], - "vitamins": [ [ "vitC", 5 ], [ "iron", 9 ] ], + "vitamins": [ [ "vitC", 5 ], [ "iron", 9 ], [ "nut_allergen", 1 ] ], "charges": 4 }, { @@ -240,10 +241,10 @@ "price_postapoc": "6 USD", "flags": [ "NUTRIENT_OVERRIDE", "RAW", "SMOKABLE" ], "smoking_result": "walnut_roasted", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "charges": 4, - "vitamins": [ [ "calcium", 2 ], [ "iron", 4 ] ], + "vitamins": [ [ "calcium", 2 ], [ "iron", 4 ], [ "nut_allergen", 1 ] ], "fun": -1 }, { @@ -273,10 +274,10 @@ "price_postapoc": "1 USD", "flags": [ "NUTRIENT_OVERRIDE", "RAW", "SMOKABLE" ], "smoking_result": "chestnut_roasted", - "material": "nut", + "material": [ "nut" ], "charges": 4, "volume": "250 ml", - "vitamins": [ [ "vitC", 13 ], [ "iron", 1 ] ], + "vitamins": [ [ "vitC", 13 ], [ "iron", 1 ], [ "nut_allergen", 1 ] ], "fun": -10 }, { @@ -306,10 +307,10 @@ "price_postapoc": "5 USD", "flags": [ "NUTRIENT_OVERRIDE", "RAW", "SMOKABLE" ], "smoking_result": "hazelnut_roasted", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "charges": 4, - "vitamins": [ [ "vitC", 2 ], [ "calcium", 3 ], [ "iron", 7 ] ], + "vitamins": [ [ "vitC", 2 ], [ "calcium", 3 ], [ "iron", 7 ], [ "nut_allergen", 1 ] ], "fun": -1 }, { @@ -339,10 +340,10 @@ "price_postapoc": "2 USD", "flags": [ "NUTRIENT_OVERRIDE", "RAW", "SMOKABLE" ], "smoking_result": "hickory_nut_roasted", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "charges": 4, - "vitamins": [ [ "calcium", 2 ], [ "iron", 8 ] ], + "vitamins": [ [ "calcium", 2 ], [ "iron", 8 ], [ "nut_allergen", 1 ] ], "fun": -10 }, { @@ -378,7 +379,8 @@ "charges": 4, "stack_size": 1, "flags": [ "EATEN_HOT" ], - "fun": 5 + "fun": 5, + "vitamins": [ [ "milk_allergen", 1 ], [ "nut_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -394,12 +396,12 @@ "description": "A handful of acorns, still in their shells. Squirrels like them, but they're not very good for you to eat in this state.", "price": "0 cent", "price_postapoc": "2 USD", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE", "RAW", "SMOKABLE" ], "smoking_result": "acorn_roasted", "charges": 4, - "vitamins": [ [ "calcium", 1 ], [ "iron", 2 ] ], + "vitamins": [ [ "calcium", 1 ], [ "iron", 2 ], [ "nut_allergen", 1 ] ], "fun": -20 }, { @@ -428,8 +430,8 @@ "description": "A serving of acorns that have been hulled, chopped, and boiled in water before being thoroughly toasted until dry. Filling and nutritious.", "price": "90 cent", "price_postapoc": "3 USD", - "material": "nut", - "vitamins": [ [ "calcium", 1 ], [ "iron", 2 ] ], + "material": [ "nut" ], + "vitamins": [ [ "calcium", 1 ], [ "iron", 2 ], [ "nut_allergen", 1 ] ], "volume": "250 ml", "milling": { "into": "flour", "conversion_rate": 8 } } diff --git a/data/json/items/comestibles/offal_dishes.json b/data/json/items/comestibles/offal_dishes.json index fbfffb66d66c..c89099735ce8 100644 --- a/data/json/items/comestibles/offal_dishes.json +++ b/data/json/items/comestibles/offal_dishes.json @@ -19,7 +19,15 @@ "fun": 15, "quench": 3, "flags": [ "EATEN_HOT" ], - "vitamins": [ [ "vitA", 4 ], [ "vitC", 5 ], [ "calcium", 0 ], [ "iron", 2 ], [ "vitB", 15 ] ] + "vitamins": [ + [ "vitA", 4 ], + [ "vitC", 5 ], + [ "calcium", 0 ], + [ "iron", 2 ], + [ "vitB", 15 ], + [ "meat_allergen", 1 ], + [ "fruit_allergen", 1 ] + ] }, { "id": "liver_onion", @@ -39,7 +47,15 @@ "healthy": 2, "quench": -3, "flags": [ "EATEN_HOT" ], - "vitamins": [ [ "vitA", 75 ], [ "vitC", 1 ], [ "calcium", 0 ], [ "iron", 8 ], [ "vitB", 336 ] ] + "vitamins": [ + [ "vitA", 75 ], + [ "vitC", 1 ], + [ "calcium", 0 ], + [ "iron", 8 ], + [ "vitB", 336 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ] + ] }, { "id": "fried_livers", @@ -62,7 +78,16 @@ "fun": 6, "quench": -4, "flags": [ "EATEN_HOT" ], - "vitamins": [ [ "vitA", 75 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 9 ], [ "vitB", 337 ] ] + "vitamins": [ + [ "vitA", 75 ], + [ "vitC", 0 ], + [ "calcium", 2 ], + [ "iron", 9 ], + [ "vitB", 337 ], + [ "meat_allergen", 1 ], + [ "wheat_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "id": "humble_pie", @@ -84,7 +109,15 @@ "weight": "249 g", "charges": 3, "flags": [ "EATEN_HOT" ], - "vitamins": [ [ "vitA", 36 ], [ "vitC", 15 ], [ "calcium", 1 ], [ "iron", 40 ], [ "vitB", 171 ] ] + "vitamins": [ + [ "vitA", 36 ], + [ "vitC", 15 ], + [ "calcium", 1 ], + [ "iron", 40 ], + [ "vitB", 171 ], + [ "meat_allergen", 1 ], + [ "wheat_allergen", 1 ] + ] }, { "id": "stewed_tripe", @@ -105,7 +138,8 @@ "volume": "250 ml", "weight": "70 g", "flags": [ "EATEN_HOT" ], - "calories": 130 + "calories": 130, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "id": "fried_tripe", @@ -126,7 +160,8 @@ "volume": "250 ml", "weight": "70 g", "flags": [ "EATEN_HOT" ], - "calories": 310 + "calories": 310, + "vitamins": [ [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "id": "leverpostej", @@ -145,7 +180,17 @@ "weight": "112 g", "charges": 14, "calories": 344, - "vitamins": [ [ "vitA", 43 ], [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 5 ], [ "vitB", 193 ] ] + "vitamins": [ + [ "vitA", 43 ], + [ "vitC", 0 ], + [ "calcium", 1 ], + [ "iron", 5 ], + [ "vitB", 193 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ], + [ "wheat_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "id": "brain_cooked", @@ -181,7 +226,15 @@ "flags": [ "EATEN_HOT" ], "calories": 285, "charges": 3, - "vitamins": [ [ "vitA", 1 ], [ "vitB", 144 ], [ "vitC", 6 ], [ "iron", 13 ], [ "calcium", 1 ] ] + "vitamins": [ + [ "vitA", 1 ], + [ "vitB", 144 ], + [ "vitC", 6 ], + [ "iron", 13 ], + [ "calcium", 1 ], + [ "meat_allergen", 1 ], + [ "wheat_allergen", 1 ] + ] }, { "id": "kidney_cooked", @@ -218,7 +271,16 @@ "charges": 3, "flags": [ "EATEN_HOT" ], "calories": 301, - "vitamins": [ [ "vitA", 5 ], [ "vitB", 104 ], [ "vitC", 1 ], [ "iron", 6 ], [ "calcium", 1 ] ] + "vitamins": [ + [ "vitA", 5 ], + [ "vitB", 104 ], + [ "vitC", 1 ], + [ "iron", 6 ], + [ "calcium", 1 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ], + [ "wheat_allergen", 1 ] + ] }, { "id": "sweetbread_cooked", @@ -293,7 +355,8 @@ "weight": "180 g", "charges": 6, "calories": 100, - "flags": [ "EATEN_HOT" ] + "flags": [ "EATEN_HOT" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "id": "toettchen", @@ -314,7 +377,8 @@ "weight": "180 g", "charges": 6, "calories": 400, - "flags": [ "EATEN_HOT" ] + "flags": [ "EATEN_HOT" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "id": "scrambledeggsandbrain", @@ -335,7 +399,8 @@ "weight": "180 g", "charges": 6, "calories": 400, - "flags": [ "EATEN_HOT" ] + "flags": [ "EATEN_HOT" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "id": "sausage_casings", @@ -344,8 +409,9 @@ "name": { "str": "sausage casing" }, "description": "Sausage casings made from animal intestines. Ready to be used for forming meat products.", "color": "red", - "material": "flesh", - "charges": 60 + "material": [ "flesh" ], + "charges": 60, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "id": "sausage_casings_plastic", @@ -367,7 +433,7 @@ "type": "COMESTIBLE", "name": { "str_sp": "fried offal" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "fried Frank offal" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "fried Frank offal" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "fried freak offal" } } ], "description": "This is freshly cooked organ meat and entrails. Deep-frying it makes it more palatable, and while it's probably less healthy it's still filled with essential vitamins.", diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index dc669e6d7935..8edfbf1634f6 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -108,11 +108,12 @@ "description": "This looks like a blueberry the size of your fist, but pinkish in color. It has a strong but delicious aroma, but is clearly either mutated or of alien origin.", "price": "0 cent", "price_postapoc": "0 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "stack_size": 4, "flags": [ "MYCUS_OK", "NO_BLOAT" ], - "fun": 30 + "fun": 30, + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -131,10 +132,11 @@ "description": "This looks like a handful of lemon-colored liquid which has taken a set, much like pre-Cataclysm Jello. It has a strong but delicious aroma, but is clearly either mutated or of alien origin.", "price": "0 cent", "price_postapoc": "0 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "100 ml", "stack_size": 10, - "fun": 30 + "fun": 30, + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -151,11 +153,12 @@ "description": "Humans might call this a Gray Delicious apple: large, gray, and smells even better than the Marloss. If they didn't reject it for its alien origins. But we know better.", "price": "0 cent", "price_postapoc": "0 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "stack_size": 4, "flags": [ "MYCUS_OK", "NO_BLOAT" ], - "fun": 30 + "fun": 30, + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -264,11 +267,11 @@ "description": "Canned beans. A staple among canned goods, these are reputedly good for one's coronary health.", "price": "150 cent", "price_postapoc": "150 cent", - "material": "bean", + "material": [ "bean" ], "volume": "500 ml", "charges": 2, "flags": [ "EATEN_HOT" ], - "vitamins": [ [ "calcium", 9 ], [ "iron", 24 ] ] + "vitamins": [ [ "calcium", 9 ], [ "iron", 24 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -285,11 +288,11 @@ "description": "Dehydrated great northern beans. Tasty and nutritious when cooked, virtually inedible when dry.", "price": "3 USD", "price_postapoc": "150 cent", - "material": "bean", + "material": [ "bean" ], "volume": "250 ml", "cooks_like": "beans_cooked", "charges": 6, - "vitamins": [ [ "calcium", 56 ], [ "iron", 22 ] ], + "vitamins": [ [ "calcium", 56 ], [ "iron", 22 ], [ "veggy_allergen", 1 ] ], "fun": -6 }, { @@ -307,11 +310,11 @@ "description": "A hearty serving of cooked great northern beans.", "price": "1 USD", "price_postapoc": "1 USD", - "material": "bean", + "material": [ "bean" ], "volume": "250 ml", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], "fun": 1, - "vitamins": [ [ "calcium", 8 ], [ "vitB", 32 ] ] + "vitamins": [ [ "calcium", 8 ], [ "vitB", 32 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -328,11 +331,11 @@ "price": "90 cent", "price_postapoc": "50 cent", "fun": -4, - "material": "veggy", + "material": [ "veggy" ], "volume": "85 ml", "flags": [ "SMOKABLE", "EATEN_HOT", "NUTRIENT_OVERRIDE" ], "smoking_result": "dry_tofu", - "vitamins": [ [ "calcium", 20 ], [ "iron", 4 ] ] + "vitamins": [ [ "calcium", 20 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -349,10 +352,10 @@ "description": "Tofu, a soy protein crucial to East Asian cuisine. It absorbs flavors very well and can be used as a meat alternative in many dishes.", "price": "90 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "85 ml", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], - "vitamins": [ [ "calcium", 16 ], [ "iron", 4 ] ] + "vitamins": [ [ "calcium", 16 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -367,9 +370,9 @@ "description": "Dehydrated tofu, sealed and still extra firm to last a long time.", "price": "90 cent", "price_postapoc": "75 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "85 ml", - "vitamins": [ [ "calcium", 16 ], [ "iron", 4 ] ] + "vitamins": [ [ "calcium", 16 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -387,9 +390,9 @@ "price_postapoc": "50 cent", "charges": 4, "stack_size": 100, - "material": "bean", + "material": [ "bean" ], "fun": -5, - "vitamins": [ [ "iron", 25 ], [ "vitC", 1 ], [ "calcium", 3 ] ], + "vitamins": [ [ "iron", 25 ], [ "vitC", 1 ], [ "calcium", 3 ], [ "veggy_allergen", 1 ] ], "flags": [ "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW" ], "smoking_result": "soy_nuts" }, @@ -410,9 +413,9 @@ "price_postapoc": "50 cent", "charges": 4, "stack_size": 100, - "material": "bean", + "material": [ "bean" ], "fun": 1, - "vitamins": [ [ "iron", 26 ], [ "vitC", 16 ], [ "calcium", 6 ] ], + "vitamins": [ [ "iron", 26 ], [ "vitC", 16 ], [ "calcium", 6 ], [ "veggy_allergen", 1 ] ], "flags": [ "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW" ], "smoking_result": "edamame_roasted" }, @@ -431,10 +434,10 @@ "description": "A humble but nutrient-rich legume. Should be cooked prior to consumption.", "price": "20 cent", "price_postapoc": "150 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "charges": 2, - "vitamins": [ [ "calcium", 4 ], [ "iron", 47 ], [ "vitC", 7 ] ], + "vitamins": [ [ "calcium", 4 ], [ "iron", 47 ], [ "vitC", 7 ], [ "veggy_allergen", 1 ] ], "fun": -10 }, { @@ -542,10 +545,10 @@ "description": "Canned tomato. A staple in many pantries, and useful for many recipes.", "price": "350 cent", "price_postapoc": "1 USD", - "material": "tomato", + "material": [ "tomato" ], "volume": "250 ml", "charges": 2, - "vitamins": [ [ "vitA", 3 ], [ "vitC", 26 ], [ "calcium", 9 ], [ "iron", 18 ] ], + "vitamins": [ [ "vitA", 3 ], [ "vitC", 26 ], [ "calcium", 9 ], [ "iron", 18 ], [ "veggy_allergen", 1 ] ], "flags": [ "RAW" ] }, { @@ -561,11 +564,11 @@ "healthy": -20, "quench": -47, "calories": 78, - "vitamins": [ [ "vitA", 0 ], [ "vitC", 2 ], [ "calcium", 1 ], [ "iron", 8 ], [ "vitB", 54 ] ], + "vitamins": [ [ "vitA", 0 ], [ "vitC", 2 ], [ "calcium", 1 ], [ "iron", 8 ], [ "vitB", 54 ], [ "meat_allergen", 1 ] ], "description": "This is a human brain soaked in a solution of highly toxic formaldehyde. Eating this would be a terrible idea.", "price": "80 cent", "price_postapoc": "0 cent", - "material": "hflesh", + "material": [ "hflesh" ], "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME" ], "volume": "250 ml", "fun": -30 @@ -581,12 +584,12 @@ "price": "1 USD", "price_postapoc": "25 cent", "to_hit": -5, - "material": "veggy", + "material": [ "veggy" ], "symbol": ";", "healthy": 2, "quench": 1, "calories": 170, - "vitamins": [ [ "vitA", 20 ], [ "vitC", 45 ], [ "calcium", 5 ], [ "iron", 5 ] ], + "vitamins": [ [ "vitA", 20 ], [ "vitC", 45 ], [ "calcium", 5 ], [ "iron", 5 ], [ "veggy_allergen", 1 ] ], "fun": 5, "color": "brown", "flags": [ "INEDIBLE", "CATTLE" ], @@ -604,11 +607,11 @@ "price": "20 cent", "price_postapoc": "25 cent", "to_hit": -5, - "material": "veggy", + "material": [ "veggy" ], "symbol": ";", "healthy": 1, "calories": 20, - "vitamins": [ [ "calcium", 1 ], [ "iron", 7 ] ], + "vitamins": [ [ "calcium", 1 ], [ "iron", 7 ], [ "veggy_allergen", 1 ] ], "fun": 5, "color": "brown", "flags": [ "INEDIBLE", "BIRD", "NUTRIENT_OVERRIDE" ], @@ -628,12 +631,12 @@ "price": "3 USD", "price_postapoc": "250 cent", "to_hit": -5, - "material": "flesh", + "material": [ "flesh" ], "symbol": ";", "healthy": 2, "quench": 2, "calories": 350, - "vitamins": [ [ "vitC", 4 ], [ "iron", 17 ], [ "vitB", 187 ], [ "calcium", 0 ] ], + "vitamins": [ [ "vitC", 4 ], [ "iron", 17 ], [ "vitB", 187 ], [ "calcium", 0 ], [ "meat_allergen", 1 ] ], "fun": -15, "color": "brown", "flags": [ "LUPINE" ], @@ -653,12 +656,12 @@ "price": "3 USD", "price_postapoc": "4 USD", "to_hit": -5, - "material": "flesh", + "material": [ "flesh" ], "symbol": ";", "healthy": 2, "quench": 2, "calories": 600, - "vitamins": [ [ "vitC", 4 ], [ "iron", 17 ], [ "vitB", 187 ], [ "calcium", 0 ] ], + "vitamins": [ [ "vitC", 4 ], [ "iron", 17 ], [ "vitB", 187 ], [ "calcium", 0 ], [ "meat_allergen", 1 ] ], "fun": -15, "color": "brown", "flags": [ "FELINE" ], @@ -674,11 +677,11 @@ "comestible_type": "FOOD", "symbol": "%", "calories": 70, - "vitamins": [ ], + "vitamins": [ [ "veggy_allergen", 1 ] ], "description": "Some grass, edible by grazers and ruminants only. Seeing this item is a bug.", "price": "0 cent", "price_postapoc": "0 cent", - "material": "veggy", + "material": [ "veggy" ], "flags": [ "TRADER_AVOID" ], "volume": "250 ml" }, @@ -691,11 +694,11 @@ "comestible_type": "FOOD", "symbol": "%", "calories": 174, - "vitamins": [ ], + "vitamins": [ [ "veggy_allergen", 1 ] ], "description": "Some underbrush, edible by ruminants only. Seeing this item is a bug.", "price": "0 cent", "price_postapoc": "0 cent", - "material": "veggy", + "material": [ "veggy" ], "flags": [ "TRADER_AVOID" ], "volume": "250 ml" }, diff --git a/data/json/items/comestibles/protein.json b/data/json/items/comestibles/protein.json index e90ab4140b6e..f6a0c96654b6 100644 --- a/data/json/items/comestibles/protein.json +++ b/data/json/items/comestibles/protein.json @@ -5,7 +5,7 @@ "comestible_type": "DRINK", "name": "protein drink", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "soylent green drink" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "soylent green drink" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "perturbing %s" } } ], "description": "A thin slurry of refined protein mixed with water. While quite nutritious, it is not particularly tasty.", @@ -18,12 +18,12 @@ "spoils_in": "2 days", "phase": "liquid", "container": "bottle_plastic", - "material": "flesh", + "material": [ "flesh" ], "calories": 100, "quench": 40, "healthy": 2, "fun": -1, - "vitamins": [ [ "calcium", 7 ] ], + "vitamins": [ [ "calcium", 7 ], [ "meat_allergen", 1 ] ], "flags": [ "EATEN_COLD" ] }, { @@ -32,7 +32,7 @@ "comestible_type": "FOOD", "name": { "str_sp": "protein powder" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "soylent green powder" } }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "soylent green powder" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "perturbing %s" } } ], "description": "Raw, refined protein. While quite nutritious, it is impossible to enjoy in its pure form, try adding water.", @@ -68,7 +68,16 @@ "color": "green", "container": "bag_zipper", "calories": 400, - "vitamins": [ [ "calcium", 30 ], [ "iron", 30 ], [ "vitA", 30 ], [ "vitB", 30 ], [ "vitC", 30 ], [ "bad_food", 5 ] ] + "vitamins": [ + [ "calcium", 30 ], + [ "iron", 30 ], + [ "vitA", 30 ], + [ "vitB", 30 ], + [ "vitC", 30 ], + [ "bad_food", 5 ], + [ "veggy_allergen", 1 ], + [ "fruit_allergen", 1 ] + ] }, { "id": "protein_shake", @@ -76,7 +85,7 @@ "type": "COMESTIBLE", "name": "protein shake", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "soylent green shake" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "soylent green shake" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "perturbing %s" } } ], "description": "A thick and tasty beverage made from pure refined protein and nutritious fruit.", @@ -87,7 +96,8 @@ "volume": "500 ml", "charges": 2, "quench": 20, - "relative": { "vitamins": [ [ "vitC", 20 ] ] } + "relative": { "vitamins": [ [ "vitC", 20 ] ] }, + "vitamins": [ [ "meat_allergen", 1 ], [ "fruit_allergen", 1 ] ] }, { "id": "protein_shake_fortified", @@ -95,7 +105,7 @@ "type": "COMESTIBLE", "name": "fortified protein shake", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "fortified soylent green shake" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "fortified soylent green shake" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "perturbing %s" } } ], "description": "A thick and tasty beverage made from pure refined protein and nutritious fruit. It has been supplemented with extra vitamins and minerals", diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json index 348a7037326a..c0fe0bc58c69 100644 --- a/data/json/items/comestibles/raw_fruit.json +++ b/data/json/items/comestibles/raw_fruit.json @@ -14,12 +14,12 @@ "description": "An apple a day keeps the doctor away.", "price": "9 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "375 ml", "fun": 3, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 2 ], [ "vitC", 14 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 2 ], [ "vitC", 14 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -35,12 +35,12 @@ "description": "A long, curved yellow fruit in a peel. Some people like using them in desserts. Those people are probably dead.", "price": "120 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "500 ml", "fun": 5, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 1 ], [ "vitC", 17 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 1 ], [ "vitC", 17 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -57,12 +57,12 @@ "description": "The cacao fruit, scientifically known as Theobroma cacao, is the source of cocoa beans used to make chocolate. It is a tropical fruit that contains cocoa beans surrounded by a sweet-tasting, white pulp. The beans are harvested, fermented, and processed to produce various chocolate products.", "price": "5 USD", "price_postapoc": "2 USD", - "material": "fruit", + "material": [ "fruit" ], "//": "cacao is actually a fruit.", "volume": "500 ml", "cooks_like": "beans_cooked", "flags": [ "RAW" ], - "vitamins": [ [ "vitC", 3 ], [ "calcium", 106 ], [ "iron", 4 ], [ "iron", 4 ] ], + "vitamins": [ [ "vitC", 3 ], [ "calcium", 106 ], [ "iron", 4 ], [ "iron", 4 ], [ "fruit_allergen", 1 ] ], "fun": 4 }, { @@ -80,12 +80,12 @@ "description": "Sweet citrus fruit. Also comes in juice form.", "price": "180 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "375 ml", "fun": 3, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 7 ], [ "vitC", 138 ], [ "calcium", 4 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 7 ], [ "vitC", 138 ], [ "calcium", 4 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -102,11 +102,11 @@ "description": "Very sour citrus. Can be eaten if you really want.", "price": "120 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 74 ], [ "calcium", 1 ], [ "iron", 2 ] ], + "vitamins": [ [ "vitC", 74 ], [ "calcium", 1 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ], "fun": -4 }, { @@ -124,12 +124,12 @@ "description": "They're blue, but that doesn't mean they're sad.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 2, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 1 ], [ "vitC", 24 ], [ "calcium", 1 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitA", 1 ], [ "vitC", 24 ], [ "calcium", 1 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -146,12 +146,12 @@ "description": "Tasty, juicy berry. Often found growing wild in fields.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 5, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 140 ], [ "calcium", 1 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitC", 140 ], [ "calcium", 1 ], [ "iron", 3 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -168,12 +168,12 @@ "description": "Sour red berries. Good for your health.", "price": "150 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "charges": 3, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 1 ], [ "vitC", 27 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 1 ], [ "vitC", 27 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -190,12 +190,12 @@ "description": "A sweet red berry.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 4, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 64 ], [ "calcium", 3 ], [ "iron", 5 ] ] + "vitamins": [ [ "vitC", 64 ], [ "calcium", 3 ], [ "iron", 5 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -212,12 +212,12 @@ "description": "Huckleberries, often times confused for blueberries.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 2, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 1 ], [ "vitC", 5 ], [ "calcium", 2 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitA", 1 ], [ "vitC", 5 ], [ "calcium", 2 ], [ "iron", 3 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -234,12 +234,12 @@ "description": "Mulberries, this red variety is unique to east North America and is described to have the strongest flavor of any variety in the world.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 4, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 60 ], [ "calcium", 6 ], [ "iron", 14 ] ] + "vitamins": [ [ "vitC", 60 ], [ "calcium", 6 ], [ "iron", 14 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -256,12 +256,12 @@ "description": "Elderberries, toxic when eaten raw but great when cooked.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": -2, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 5 ], [ "vitC", 61 ], [ "calcium", 6 ], [ "iron", 14 ] ] + "vitamins": [ [ "vitA", 5 ], [ "vitC", 61 ], [ "calcium", 6 ], [ "iron", 14 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -278,12 +278,12 @@ "description": "The fruit of a pollinated rose flower.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 2, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 32 ], [ "vitC", 634 ], [ "calcium", 23 ], [ "iron", 8 ] ] + "vitamins": [ [ "vitA", 32 ], [ "vitC", 634 ], [ "calcium", 23 ], [ "iron", 8 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -300,12 +300,12 @@ "description": "Left-over from juicing the fruit. Not very tasty, but contains a lot of healthy fiber.", "price": "25 cent", "price_postapoc": "25 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "50 ml", "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", "//": "juice pulp is an arbitrary item, but needed some baseline nutrients for byproducts", - "vitamins": [ [ "vitC", 8 ] ] + "vitamins": [ [ "vitC", 8 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -322,12 +322,12 @@ "description": "A juicy, bell-shaped pear. Yum!", "price": "160 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 4, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 7 ], [ "calcium", 1 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitC", 7 ], [ "calcium", 1 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -344,11 +344,11 @@ "description": "A citrus fruit, whose taste ranges from sour to semi-sweet.", "price": "180 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 16 ], [ "vitC", 84 ], [ "calcium", 5 ], [ "iron", 1 ] ], + "vitamins": [ [ "vitA", 16 ], [ "vitC", 84 ], [ "calcium", 5 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ], "fun": 2 }, { @@ -366,12 +366,12 @@ "description": "A red, sweet fruit that grows in trees.", "price": "110 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 3, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 11 ], [ "calcium", 2 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitC", 11 ], [ "calcium", 2 ], [ "iron", 3 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -388,12 +388,12 @@ "description": "A handful of large, purple plums. Healthy and good for your digestion.", "price": "2 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "66 ml", "fun": 3, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 8 ] ] + "vitamins": [ [ "vitC", 8 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -410,12 +410,12 @@ "description": "A cluster of juicy grapes.", "price": "75 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 4, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -432,14 +432,14 @@ "description": "A large, spiky pineapple. A bit sour, though.", "price": "450 cent", "price_postapoc": "5 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "1500 ml", "charges": 5, "bashing": 1, "fun": 4, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 93 ], [ "calcium", 2 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitC", 93 ], [ "calcium", 2 ], [ "iron", 3 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -454,11 +454,11 @@ "description": "A fruit with a hard and hairy shell.", "price": "1 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "2 L", "bashing": 2, "charges": 5, - "vitamins": [ [ "vitC", 3 ], [ "calcium", 1 ], [ "iron", 14 ] ], + "vitamins": [ [ "vitC", 3 ], [ "calcium", 1 ], [ "iron", 14 ], [ "fruit_allergen", 1 ] ], "fun": 1 }, { @@ -476,12 +476,12 @@ "description": "This fruit's large pit is surrounded by its tasty flesh.", "price": "140 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 4, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 3 ], [ "vitC", 12 ], [ "calcium", 1 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitA", 3 ], [ "vitC", 12 ], [ "calcium", 1 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -499,14 +499,14 @@ "description": "A fruit, bigger than your head. It is very juicy!", "price": "4 USD", "price_postapoc": "6 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "5 L", "charges": 20, "bashing": 2, "flags": [ "EATEN_COLD", "SMOKABLE" ], "fun": 4, "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 5 ], [ "vitC", 14 ], [ "calcium", 1 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitA", 5 ], [ "vitC", 14 ], [ "calcium", 1 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -524,14 +524,14 @@ "description": "A large and very sweet fruit.", "price": "39 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "1250 ml", "charges": 5, "bashing": 1, "flags": [ "EATEN_COLD", "SMOKABLE" ], "fun": 4, "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 30 ], [ "vitC", 65 ], [ "calcium", 1 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitA", 30 ], [ "vitC", 65 ], [ "calcium", 1 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -548,12 +548,12 @@ "description": "A darker cousin of raspberry.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 4, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 1 ], [ "vitC", 9 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitA", 1 ], [ "vitC", 9 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -570,14 +570,14 @@ "description": "A fleshy fruit with large pit.", "price": "180 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "//": "serving size is 250 ml of edible material, extra volume is the pit.", "volume": "1 L", "charges": 2, "fun": 5, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 10 ], [ "vitC", 70 ], [ "calcium", 2 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitA", 10 ], [ "vitC", 70 ], [ "calcium", 2 ], [ "iron", 2 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -594,13 +594,13 @@ "description": "Under this pomegranate's spongy skin lies hundreds of fleshy seeds.", "price": "190 cent", "price_postapoc": "2 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "500 ml", "charges": 2, "fun": 7, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitC", 21 ], [ "calcium", 2 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitC", 21 ], [ "calcium", 2 ], [ "iron", 3 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -617,13 +617,13 @@ "description": "A very sweet and soft tropical fruit.", "price": "250 cent", "price_postapoc": "3 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "750 ml", "charges": 3, "fun": 5, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 13 ], [ "vitC", 164 ], [ "calcium", 5 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitA", 13 ], [ "vitC", 164 ], [ "calcium", 5 ], [ "iron", 3 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -640,12 +640,12 @@ "description": "A large, brown and fuzzy-skinned berry. Its delicious insides are green.", "price": "250 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 3, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 2 ], [ "vitC", 80 ], [ "calcium", 1 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 2 ], [ "vitC", 80 ], [ "calcium", 1 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -663,12 +663,12 @@ "description": "A smooth-skinned fruit, related to the peach.", "price": "140 cent", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": 3, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 17 ], [ "vitC", 18 ], [ "calcium", 2 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 17 ], [ "vitC", 18 ], [ "calcium", 2 ], [ "iron", 4 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -685,12 +685,12 @@ "description": "Edible bud of a cholla cactus, with spines removed; the candy of the Mojave indigenous peoples. Tastes similar to asparagus.", "price": "9 USD", "price_postapoc": "1 USD", - "material": "fruit", + "material": [ "fruit" ], "volume": "175 ml", "fun": 6, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit", - "vitamins": [ [ "vitA", 2 ], [ "vitC", 18 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 2 ], [ "vitC", 18 ], [ "iron", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -707,10 +707,10 @@ "description": "An edible pad of a cactus.", "price": "50 cent", "price_postapoc": "25 cent", - "material": "fruit", + "material": [ "fruit" ], "volume": "250 ml", "fun": -1, "flags": [ "RAW" ], - "vitamins": [ [ "vitA", 9 ], [ "vitC", 9 ], [ "calcium", 16 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitA", 9 ], [ "vitC", 9 ], [ "calcium", 16 ], [ "iron", 3 ], [ "fruit_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 7848434b37d1..f45971bd4d22 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -13,12 +13,12 @@ "description": "Grainy cereal used for malting. A staple of brewing everywhere. It can also be ground into flour.", "price": "20 cent", "price_postapoc": "250 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "1 L", "milling": { "into": "flour", "conversion_rate": 15 }, "flags": [ "RAW" ], "charges": 4, - "vitamins": [ [ "calcium", 6 ], [ "iron", 29 ] ], + "vitamins": [ [ "calcium", 6 ], [ "iron", 29 ], [ "veggy_allergen", 1 ] ], "fun": -15 }, { @@ -36,7 +36,8 @@ "material": [ "veggy" ], "volume": "250 ml", "price": "0 cent", - "price_postapoc": "0 cent" + "price_postapoc": "0 cent", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -52,11 +53,11 @@ "description": "It's a bit tough, but quite delicious.", "price": "4 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "flags": [ "EATEN_HOT", "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 3 ], [ "vitC", 95 ], [ "calcium", 5 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 3 ], [ "vitC", 95 ], [ "calcium", 5 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -72,12 +73,12 @@ "description": "Seeds from a wild buckwheat plant. Not particularly good to eat in their raw state, they are commonly cooked or ground into flour.", "price": "90 cent", "price_postapoc": "4 USD", - "material": "veggy", + "material": [ "veggy" ], "volume": "500 ml", "milling": { "into": "flour", "conversion_rate": 15 }, "flags": [ "RAW" ], "charges": 2, - "vitamins": [ [ "calcium", 3 ], [ "iron", 22 ] ], + "vitamins": [ [ "calcium", 3 ], [ "iron", 22 ], [ "veggy_allergen", 1 ] ], "fun": -10 }, { @@ -95,13 +96,13 @@ "description": "Crisp white cabbage.", "price": "1 USD", "price_postapoc": "1 USD", - "material": "veggy", + "material": [ "veggy" ], "volume": "2250 ml", "charges": 9, "fun": -2, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitC", 56 ], [ "calcium", 5 ], [ "iron", 5 ] ] + "vitamins": [ [ "vitC", 56 ], [ "calcium", 5 ], [ "iron", 5 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -121,7 +122,7 @@ "volume": "250 ml", "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 21 ], [ "vitC", 2 ], [ "calcium", 4 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitA", 21 ], [ "vitC", 2 ], [ "calcium", 4 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -138,12 +139,12 @@ "description": "A bunch of spinach leaves.", "price": "1 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "2250 ml", "charges": 9, "fun": -2, "flags": [ "RAW" ], - "vitamins": [ [ "calcium", 8 ], [ "iron", 18 ] ] + "vitamins": [ [ "calcium", 8 ], [ "iron", 18 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -159,13 +160,13 @@ "description": "A healthy root vegetable. Rich in vitamin A!", "price": "2 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "125 ml", "charges": 6, "fun": -1, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 63 ], [ "vitC", 5 ], [ "calcium", 3 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 63 ], [ "vitC", 5 ], [ "calcium", 3 ], [ "iron", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -180,11 +181,11 @@ "description": "A stout branching rhizome from a cattail plant. Its crisp white flesh is very starchy and fibrous, but you really ought to cook it before you attempt to eat it.", "price": "0 cent", "price_postapoc": "10 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "fun": -12, "flags": [ "RAW" ], - "vitamins": [ [ "iron", 8 ] ] + "vitamins": [ [ "iron", 8 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -199,12 +200,12 @@ "description": "A stiff green stalk from a cattail plant. It is starchy and fibrous, but it would be much better if you cooked it.", "price": "0 cent", "price_postapoc": "10 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "fun": -8, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "calcium", 5 ], [ "iron", 5 ] ] + "vitamins": [ [ "calcium", 5 ], [ "iron", 5 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -220,11 +221,11 @@ "description": "Neither tasty nor very nutritious, but it goes well with salad.", "price": "2 USD", "price_postapoc": "10 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "1000 ml", "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 3 ], [ "vitC", 4 ], [ "calcium", 4 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 3 ], [ "vitC", 4 ], [ "calcium", 4 ], [ "iron", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -241,12 +242,12 @@ "price": "170 cent", "//": "Thinking this is a single ear here.", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "750 ml", "flags": [ "EATEN_HOT", "SMOKABLE", "RAW" ], "milling": { "into": "cornmeal", "conversion_rate": 3 }, "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -266,7 +267,8 @@ "material": [ "veggy", "cotton" ], "volume": "250 ml", "charges": 4, - "fun": -10 + "fun": -10, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -282,11 +284,11 @@ "description": "Spicy chili pepper.", "price": "50 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "charges": 3, "flags": [ "RAW" ], - "vitamins": [ [ "vitA", 3 ], [ "vitC", 88 ], [ "calcium", 1 ], [ "iron", 3 ] ], + "vitamins": [ [ "vitA", 3 ], [ "vitC", 88 ], [ "calcium", 1 ], [ "iron", 3 ], [ "veggy_allergen", 1 ] ], "fun": -2 }, { @@ -304,11 +306,11 @@ "description": "Comes from the gourd family. Not tasty but very juicy.", "price": "3 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "750 ml", "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitC", 9 ], [ "calcium", 6 ], [ "iron", 6 ] ] + "vitamins": [ [ "vitC", 9 ], [ "calcium", 6 ], [ "iron", 6 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -323,11 +325,12 @@ "description": "The large, tuberous root of a dahlia flower. It smells spicy, but is too starchy to eat without cooking.", "price": "1 USD", "price_postapoc": "25 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "fun": -4, "flags": [ "RAW" ], - "//": "Dahlia roots contain an incredible amount of vitamin B6. This isn't a vitamin tracked in Cataclysm, but be careful of vitamin overdose when eating dahlia in real life." + "//": "Dahlia roots contain an incredible amount of vitamin B6. This isn't a vitamin tracked in Cataclysm, but be careful of vitamin overdose when eating dahlia in real life.", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -343,12 +346,12 @@ "description": "An herb with a small purple flower. The roots are nutritious, but tough and bland until cooked.", "price": "75 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "fun": -2, "smoking_result": "dry_veggy", "flags": [ "RAW" ], - "vitamins": [ [ "vitC", 18 ], [ "iron", 5 ], [ "calcium", 8 ] ] + "vitamins": [ [ "vitC", 18 ], [ "iron", 5 ], [ "calcium", 8 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -363,11 +366,11 @@ "description": "A modest blue flower. The flower's roots are very bitter and not meant to be eaten raw.", "price": "110 cent", "price_postapoc": "25 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "fun": -8, "flags": [ "RAW" ], - "vitamins": [ [ "vitC", 5 ], [ "iron", 3 ], [ "calcium", 2 ] ] + "vitamins": [ [ "vitC", 5 ], [ "iron", 3 ], [ "calcium", 2 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -401,7 +404,8 @@ "volume": "250 ml", "price": "0 cent", "price_postapoc": "0 cent", - "flags": [ "UNSAFE_CONSUME" ] + "flags": [ "UNSAFE_CONSUME" ], + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -417,11 +421,11 @@ "description": "A pungent garlic bulb. Popular as a seasoning for its strong flavor. Can be disassembled to cloves.", "price": "3 USD", "price_postapoc": "50 cent", - "material": "garlic", + "material": [ "garlic" ], "volume": "150 ml", "fun": -18, "flags": [ "RAW" ], - "vitamins": [ [ "vitC", 5 ], [ "calcium", 3 ], [ "iron", 1 ] ], + "vitamins": [ [ "vitC", 5 ], [ "calcium", 3 ], [ "iron", 1 ], [ "veggy_allergen", 1 ] ], "//": "Who in their right mind would eat an entire garlic bulb raw?" }, { @@ -438,11 +442,12 @@ "description": "A cluster of small cone-like flowers, indispensable for brewing beer.", "price": "20 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "flags": [ "RAW" ], "charges": 4, - "fun": -15 + "fun": -15, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -457,11 +462,11 @@ "calories": 166, "description": "Large white tapered root of a horseradish plant. Way too spicy in this form, but can be used for making condiments.", "price": "80 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "400 ml", "fun": -12, "flags": [ "RAW" ], - "vitamins": [ [ "vitC", 41 ], [ "calcium", 6 ], [ "iron", 5 ] ] + "vitamins": [ [ "vitC", 41 ], [ "calcium", 6 ], [ "iron", 5 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -477,12 +482,12 @@ "description": "A crisp head of iceberg lettuce.", "price": "1 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "2500 ml", "charges": 10, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 16 ], [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitA", 16 ], [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -500,7 +505,8 @@ "material": [ "veggy" ], "volume": "250 ml", "price": "0 cent", - "price_postapoc": "10 cent" + "price_postapoc": "10 cent", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -516,13 +522,13 @@ "description": "An aromatic onion used in cooking. Cutting these up can make your eyes sting!", "price": "50 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "fun": -1, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", "//": "Raw onions probably aren't all that tasty to most people.", - "vitamins": [ [ "vitC", 12 ], [ "calcium", 4 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitC", 12 ], [ "calcium", 4 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -541,10 +547,11 @@ "description": "A fluid bladder from a fungus based lifeform. Not very nutritious, but fine to eat anyway.", "price": "0 cent", "price_postapoc": "10 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "flags": [ "SMOKABLE", "RAW" ], - "smoking_result": "dry_veggy" + "smoking_result": "dry_veggy", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -558,11 +565,11 @@ "calories": 120, "description": "A special variety of corn which could be used for making popcorn, after it's dried. Unlike normal corn, it's not sweet and is more dry.", "price": "170 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "750 ml", "fun": -2, "flags": [ "EATEN_HOT", "RAW" ], - "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 2 ], [ "vitC", 12 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -578,12 +585,12 @@ "description": "Mildly toxic and not very tasty raw. When cooked, it is delicious.", "price": "90 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "375 ml", "fun": -3, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitC", 47 ], [ "calcium", 3 ], [ "iron", 9 ] ] + "vitamins": [ [ "vitC", 47 ], [ "calcium", 3 ], [ "iron", 9 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -600,14 +607,14 @@ "description": "A large vegetable, about the size of your head. Not very tasty raw, but is great for cooking.", "price": "250 cent", "price_postapoc": "6 USD", - "material": "veggy", + "material": [ "veggy" ], "volume": "3 L", "charges": 12, "bashing": 2, "fun": -1, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 58 ], [ "vitC", 12 ], [ "calcium", 3 ], [ "iron", 5 ] ] + "vitamins": [ [ "vitA", 58 ], [ "vitC", 12 ], [ "calcium", 3 ], [ "iron", 5 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -622,12 +629,12 @@ "calories": 16, "description": "Leaves of a horseradish plant with a sharp, bitter and peppery taste. They're edible, but not commonly eaten.", "price": "80 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "100 ml", "fun": -2, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 7 ], [ "vitC", 30 ], [ "calcium", 2 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitA", 7 ], [ "vitC", 30 ], [ "calcium", 2 ], [ "iron", 3 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -643,13 +650,13 @@ "description": "A collection of freshly picked yellow dandelions. In their current raw state they are quite bitter.", "price": "60 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "stack_size": 4, "fun": -12, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 33 ], [ "vitC", 23 ], [ "calcium", 11 ], [ "iron", 10 ] ] + "vitamins": [ [ "vitA", 33 ], [ "vitC", 23 ], [ "calcium", 11 ], [ "iron", 10 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -665,13 +672,13 @@ "description": "Burdock, a bitter thistle-like vegetable. Can be eaten raw or cooked.", "price": "60 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "stack_size": 4, "fun": -12, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitC", 1 ], [ "calcium", 23 ], [ "iron", 10 ] ] + "vitamins": [ [ "vitC", 1 ], [ "calcium", 23 ], [ "iron", 10 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -688,11 +695,11 @@ "description": "Sour stems of the rhubarb plant, often used in baking pies.", "price": "410 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitA", 1 ], [ "vitC", 11 ], [ "calcium", 11 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitA", 1 ], [ "vitC", 11 ], [ "calcium", 11 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -706,13 +713,13 @@ "description": "This fleshy root is ripe and flowing with sugars; just takes some processing to extract them.", "price": "50 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "1 L", "charges": 4, "fun": -10, "flags": [ "SMOKABLE" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitC", 8 ], [ "calcium", 2 ], [ "iron", 6 ] ] + "vitamins": [ [ "vitC", 8 ], [ "calcium", 2 ], [ "iron", 6 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -729,12 +736,13 @@ "description": "Dried leaves of a tropical plant. You can boil them into tea, or you can just eat them raw. They aren't too filling though.", "price": "1030 cent", "price_postapoc": "250 cent", - "material": "veggy", + "material": [ "veggy" ], "primary_material": "dried_vegetable", "volume": "250 ml", "flags": [ "RAW" ], "charges": 20, - "fun": -6 + "fun": -6, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -754,12 +762,13 @@ "price_postapoc": "24 cent", "addiction_potential": 3, "addiction_type": "cocaine", - "material": "veggy", + "material": [ "veggy" ], "primary_material": "dried_vegetable", "volume": "250 ml", "flags": [ "UNSAFE_CONSUME", "RAW" ], "charges": 20, - "fun": 6 + "fun": 6, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -776,11 +785,11 @@ "description": "Juicy red tomato. It gained popularity in Italy after being brought back from the New World.", "price": "90 cent", "price_postapoc": "50 cent", - "material": "tomato", + "material": [ "tomato" ], "volume": "375 ml", "flags": [ "SMOKABLE" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitC", 22 ], [ "calcium", 3 ], [ "iron", 6 ] ] + "vitamins": [ [ "vitC", 22 ], [ "calcium", 3 ], [ "iron", 6 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -796,11 +805,11 @@ "description": "A nutrient rich chunk of plant matter, could be eaten raw or cooked.", "price": "6 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "flags": [ "TRADER_AVOID", "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", "volume": "250 ml", - "vitamins": [ [ "vitA", 16 ], [ "vitC", 36 ], [ "calcium", 4 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 16 ], [ "vitC", 36 ], [ "calcium", 4 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -843,11 +852,11 @@ "description": "A tasty summer squash.", "price": "3 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "flags": [ "EATEN_HOT", "SMOKABLE" ], "smoking_result": "dry_veggy", - "vitamins": [ [ "vitC", 39 ], [ "calcium", 3 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitC", 39 ], [ "calcium", 3 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -864,7 +873,8 @@ "material": [ "veggy" ], "volume": "250 ml", "price": "0 cent", - "price_postapoc": "25 cent" + "price_postapoc": "25 cent", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -881,12 +891,12 @@ "volume": "250 ml", "price": "90 cent", "price_postapoc": "25 cent", - "material": "bean", + "material": [ "bean" ], "fun": -1, "cooks_like": "beans_cooked", "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_beans", - "vitamins": [ [ "iron", 2 ], [ "vitC", 20 ] ] + "vitamins": [ [ "iron", 2 ], [ "vitC", 20 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -903,12 +913,12 @@ "volume": "250 ml", "price": "90 cent", "price_postapoc": "25 cent", - "material": "veggy", + "material": [ "veggy" ], "fun": -1, "cooks_like": "lentils_cooked", "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_lentils", - "vitamins": [ [ "calcium", 2 ], [ "iron", 3 ], [ "vitC", 1 ], [ "vitB", 1 ] ] + "vitamins": [ [ "calcium", 2 ], [ "iron", 3 ], [ "vitC", 1 ], [ "vitB", 1 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -924,12 +934,12 @@ "description": "A handful of immature fern fronds, still curled up like the head of a fiddle. Delicious when cooked, but consuming raw can cause food poisoning.", "price": "40 cent", "price_postapoc": "10 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "62 ml", "fun": -10, "healthy": -2, "//": "Fiddleheads that haven't been boiled can make you sick.", - "vitamins": [ [ "vitC", 6 ], [ "vitA", 10 ], [ "calcium", 4 ] ] + "vitamins": [ [ "vitC", 6 ], [ "vitA", 10 ], [ "calcium", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -944,11 +954,11 @@ "description": "The leftover outer layer of rice seeds, this vegetable matter is quite nutritionally dense and makes for a good cooking oil.", "price": "90 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "fun": -3, "flags": [ "RAW" ], "milling": { "into": "flour", "conversion_rate": 5 }, - "vitamins": [ [ "vitC", 5 ], [ "calcium", 3 ], [ "iron", 9 ] ] + "vitamins": [ [ "vitC", 5 ], [ "calcium", 3 ], [ "iron", 9 ], [ "veggy_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json index 00c4b252ec36..6ebbcb33741e 100644 --- a/data/json/items/comestibles/sandwich.json +++ b/data/json/items/comestibles/sandwich.json @@ -38,7 +38,17 @@ "volume": "500 ml", "material": [ "flesh", "veggy", "wheat", "milk" ], "fun": 12, - "vitamins": [ [ "vitA", 8 ], [ "vitC", 26 ], [ "calcium", 8 ], [ "iron", 49 ], [ "vitB", 389 ] ], + "vitamins": [ + [ "vitA", 8 ], + [ "vitC", 26 ], + [ "calcium", 8 ], + [ "iron", 49 ], + [ "vitB", 389 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ], + [ "wheat_allergen", 1 ], + [ "milk_allergen", 1 ] + ], "charges": 4 }, { @@ -53,7 +63,7 @@ "material": [ "milk", "wheat" ], "flags": [ "EATEN_HOT" ], "fun": 10, - "vitamins": [ [ "vitA", 18 ], [ "calcium", 50 ], [ "iron", 12 ] ] + "vitamins": [ [ "vitA", 18 ], [ "calcium", 50 ], [ "iron", 12 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -66,7 +76,7 @@ "price_postapoc": "2 USD", "material": [ "milk", "wheat" ], "fun": 8, - "vitamins": [ [ "vitA", 18 ], [ "calcium", 50 ], [ "iron", 12 ] ] + "vitamins": [ [ "vitA", 18 ], [ "calcium", 50 ], [ "iron", 12 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -107,7 +117,7 @@ "price_postapoc": "2 USD", "material": [ "fruit", "wheat" ], "fun": 15, - "vitamins": [ [ "vitC", 6 ], [ "calcium", 7 ], [ "iron", 12 ] ] + "vitamins": [ [ "vitC", 6 ], [ "calcium", 7 ], [ "iron", 12 ], [ "wheat_allergen", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -119,7 +129,8 @@ "price": "85 cent", "price_postapoc": "3 USD", "material": [ "junk", "wheat" ], - "fun": 10 + "fun": 10, + "vitamins": [ [ "wheat_allergen", 1 ], [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -132,7 +143,7 @@ "price_postapoc": "3 USD", "material": [ "honey", "wheat" ], "fun": 10, - "vitamins": [ [ "calcium", 10 ], [ "iron", 24 ] ] + "vitamins": [ [ "calcium", 10 ], [ "iron", 24 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -191,7 +202,8 @@ "material": [ "veggy", "wheat" ], "price": "2 USD", "price_postapoc": "2 USD", - "fun": 2 + "fun": 2, + "vitamins": [ [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -205,7 +217,7 @@ "material": [ "veggy", "wheat" ], "flags": [ "EATEN_COLD" ], "fun": 1, - "vitamins": [ [ "vitA", 16 ], [ "vitC", 36 ], [ "calcium", 14 ], [ "iron", 28 ] ] + "vitamins": [ [ "vitA", 16 ], [ "vitC", 36 ], [ "calcium", 14 ], [ "iron", 28 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -213,7 +225,11 @@ "copy-from": "sandwich_deluxe", "name": { "str": "meat sandwich", "str_pl": "meat sandwiches" }, "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "slob sandwich", "str_pl": "slob sandwiches" } }, + { + "type": "VITAMIN", + "condition": "human_flesh_vitamin", + "name": { "str": "slob sandwich", "str_pl": "slob sandwiches" } + }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "mutant %s" } } ], "calories": 200, @@ -222,7 +238,7 @@ "price_postapoc": "250 cent", "material": [ "flesh", "wheat" ], "fun": 3, - "vitamins": [ [ "vitC", 8 ], [ "calcium", 6 ], [ "iron", 47 ], [ "vitB", 389 ] ] + "vitamins": [ [ "vitC", 8 ], [ "calcium", 6 ], [ "iron", 47 ], [ "vitB", 389 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -238,10 +254,10 @@ "description": "Some peanut butter smothered between two pieces of bread. Not very filling and will stick to the roof of your mouth like glue.", "price": "175 cent", "price_postapoc": "175 cent", - "material": "wheat", + "material": [ "wheat" ], "volume": "500 ml", "fun": 3, - "vitamins": [ [ "calcium", 10 ], [ "iron", 28 ] ], + "vitamins": [ [ "calcium", 10 ], [ "iron", 28 ], [ "wheat_allergen", 1 ] ], "charges": 4 }, { @@ -252,7 +268,7 @@ "description": "A delicious peanut butter and jelly sandwich. It reminds you of the times your mother would make you lunch.", "material": [ "fruit", "wheat" ], "fun": 6, - "vitamins": [ [ "vitC", 3 ], [ "calcium", 7 ], [ "iron", 14 ] ] + "vitamins": [ [ "vitC", 3 ], [ "calcium", 7 ], [ "iron", 14 ], [ "wheat_allergen", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -263,7 +279,7 @@ "description": "Some damned fool put honey on this peanut butter sandwich, who in their right mind- oh wait this is pretty good.", "material": [ "wheat", "honey" ], "fun": 6, - "vitamins": [ [ "calcium", 8 ], [ "iron", 16 ] ] + "vitamins": [ [ "calcium", 8 ], [ "iron", 16 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -272,9 +288,9 @@ "name": { "str": "PB&M sandwich", "str_pl": "PB&M sandwiches" }, "calories": 170, "description": "Who knew you could mix maple syrup and peanut butter to create yet another different sandwich?", - "material": "wheat", + "material": [ "wheat" ], "fun": 6, - "vitamins": [ [ "calcium", 12 ], [ "iron", 28 ] ] + "vitamins": [ [ "calcium", 12 ], [ "iron", 28 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -287,7 +303,7 @@ "price_postapoc": "250 cent", "material": [ "flesh", "wheat" ], "fun": 14, - "vitamins": [ [ "vitA", 4 ], [ "vitC", 5 ], [ "calcium", 19 ], [ "iron", 17 ] ] + "vitamins": [ [ "vitA", 4 ], [ "vitC", 5 ], [ "calcium", 19 ], [ "iron", 17 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -299,7 +315,8 @@ "price": "2 USD", "price_postapoc": "2 USD", "fun": 6, - "material": [ "flesh", "veggy", "wheat" ] + "material": [ "flesh", "veggy", "wheat" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -331,6 +348,7 @@ "price": "2 USD", "price_postapoc": "2 USD", "fun": 9, - "material": [ "flesh", "veggy", "wheat" ] + "material": [ "flesh", "veggy", "wheat" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index 5d99995566b1..0a1513c5806c 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -11,11 +11,12 @@ "price_postapoc": "25 cent", "charges": 4, "stack_size": 100, - "material": "veggy", + "material": [ "veggy" ], "primary_material": "dried_vegetable", "symbol": ".", "color": "brown", - "flags": [ "NUTRIENT_OVERRIDE", "PLANTABLE_SEED", "UNSAFE_CONSUME" ] + "flags": [ "NUTRIENT_OVERRIDE", "PLANTABLE_SEED", "UNSAFE_CONSUME" ], + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "abstract": "seed_fruit", @@ -23,7 +24,8 @@ "copy-from": "seed", "name": { "str_sp": "fruit seeds" }, "primary_material": "dried_vegetable", - "material": "fruit" + "material": [ "fruit" ], + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "id": "seed_hops", @@ -311,11 +313,12 @@ "price": "50 cent", "charges": 6, "stack_size": 6, - "material": "garlic", + "material": [ "garlic" ], "volume": "150 ml", "fun": -3, "flags": [ "UNSAFE_CONSUME" ], - "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": "10 days" } + "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": "10 days" }, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -411,13 +414,14 @@ "calories": 174, "description": "This looks like a sunflower seed the size of your palm. It has a strong but delicious aroma, but is clearly either mutated or of alien origin. You could probably plant it.", "price": "0 cent", - "material": "fruit", + "material": [ "fruit" ], "primary_material": "dried_vegetable", "volume": "100 ml", "stack_size": 10, "fun": 30, "flags": [ "UNSAFE_CONSUME", "CAN_PLANT_UNDERGROUND" ], - "seed_data": { "fruit": "null", "//": "dummy entry, results are hardcoded", "plant_name": "marloss berry", "grow": "14 days" } + "seed_data": { "fruit": "null", "//": "dummy entry, results are hardcoded", "plant_name": "marloss berry", "grow": "14 days" }, + "vitamins": [ [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -625,11 +629,12 @@ "price": "50 cent", "name": { "str_sp": "oat seeds" }, "description": "Some oat seeds.", - "material": "wheat", + "material": [ "wheat" ], "primary_material": "dried_vegetable", "weight": "5 g", "stack_size": 40, - "seed_data": { "plant_name": "oats", "fruit": "oats", "byproducts": [ "withered" ], "grow": "7 days" } + "seed_data": { "plant_name": "oats", "fruit": "oats", "byproducts": [ "withered" ], "grow": "7 days" }, + "vitamins": [ [ "wheat_allergen", 1 ] ] }, { "id": "seed_wheat", @@ -640,9 +645,10 @@ "weight": "5 g", "price": "50 cent", "stack_size": 40, - "material": "wheat", + "material": [ "wheat" ], "primary_material": "dried_vegetable", - "seed_data": { "plant_name": "wheat", "fruit": "wheat", "byproducts": [ "straw_pile" ], "grow": "19 days" } + "seed_data": { "plant_name": "wheat", "fruit": "wheat", "byproducts": [ "straw_pile" ], "grow": "19 days" }, + "vitamins": [ [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -657,12 +663,13 @@ "description": "Some fried seeds of a sunflower, pumpkin or other plant. Quite nutritious and tasty.", "price": "80 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "primary_material": "dried_vegetable", "volume": "250 ml", "flags": [ "SMOKED" ], "charges": 4, - "fun": 3 + "fun": 3, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -687,7 +694,8 @@ "fun": -10, "flags": [ "HIDDEN_POISON", "RAW" ], "use_action": "POISON", - "//": "USDA states that the pods of the Kentucky coffeetree contain a toxic alkaloid broken down in the roasting process, so they're poisonous" + "//": "USDA states that the pods of the Kentucky coffeetree contain a toxic alkaloid broken down in the roasting process, so they're poisonous", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -695,7 +703,7 @@ "category": "seeds", "container": "bag_plastic", "price": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "primary_material": "dried_vegetable", "name": { "str_sp": "coffee beans" }, "symbol": ".", @@ -706,7 +714,7 @@ "addiction_potential": 1, "calories": 549, "volume": "250 ml", - "vitamins": [ [ "calcium", 4 ], [ "iron", 8 ] ], + "vitamins": [ [ "calcium", 4 ], [ "iron", 8 ], [ "veggy_allergen", 1 ] ], "flags": [ "RAW" ], "stack_size": 40, "weight": "106 g" @@ -798,7 +806,7 @@ "price": "250 cent", "price_postapoc": "40 cent", "charges": 1, - "material": "veggy", + "material": [ "veggy" ], "primary_material": "mushroom", "symbol": ".", "color": "light_gray", @@ -811,7 +819,8 @@ "fruit": "mushroom_morel", "grow": "14 days" }, - "extend": { "flags": [ "CAN_PLANT_UNDERGROUND" ] } + "extend": { "flags": [ "CAN_PLANT_UNDERGROUND" ] }, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json index 4894cc4a6acf..ba0498ce76b3 100644 --- a/data/json/items/comestibles/soup.json +++ b/data/json/items/comestibles/soup.json @@ -14,19 +14,19 @@ "description": "Vegetable stock. Tasty and fairly nutritious.", "price": "350 cent", "price_postapoc": "25 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "500 ml", "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT" ], "fun": 4, - "vitamins": [ [ "iron", 3 ] ] + "vitamins": [ [ "iron", 3 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", "id": "broth_bone", "name": "bone broth", - "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "human %s" } } ], + "conditional_names": [ { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "human %s" } } ], "weight": "267 g", "color": "yellow", "spoils_in": "6 days 16 hours", @@ -38,14 +38,14 @@ "description": "A tasty and nutritious broth made from bones.", "price": "350 cent", "price_postapoc": "25 cent", - "material": "bone", + "material": [ "bone" ], "primary_material": "water", "volume": "500 ml", "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "NO_SALVAGE" ], "fun": 6, - "vitamins": [ [ "calcium", 1 ], [ "iron", 1 ] ] + "vitamins": [ [ "calcium", 1 ], [ "iron", 1 ], [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -63,12 +63,12 @@ "description": "A nutritious and delicious hearty vegetable soup.", "price": "4 USD", "price_postapoc": "25 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "500 ml", "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 43 ], [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 5 ] ], + "vitamins": [ [ "vitA", 43 ], [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 5 ], [ "veggy_allergen", 1 ] ], "fun": 4 }, { @@ -76,7 +76,7 @@ "id": "soup_meat", "name": "meat soup", "conditional_names": [ - { "type": "FLAG", "condition": "CANNIBALISM", "name": "sap soup" }, + { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": "sap soup" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "mutant %s" } } ], "weight": "253 g", @@ -91,12 +91,12 @@ "description": "A nutritious and delicious hearty meat soup.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "500 ml", "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 80 ], [ "vitC", 36 ], [ "calcium", 3 ], [ "iron", 13 ], [ "vitB", 20 ] ], + "vitamins": [ [ "vitA", 80 ], [ "vitC", 36 ], [ "calcium", 3 ], [ "iron", 13 ], [ "vitB", 20 ], [ "meat_allergen", 1 ] ], "fun": 4 }, { @@ -125,12 +125,12 @@ "description": "A nutritious and delicious hearty fish soup.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "500 ml", "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 12 ], [ "vitC", 28 ], [ "calcium", 4 ], [ "iron", 5 ], [ "vitB", 20 ] ], + "vitamins": [ [ "vitA", 12 ], [ "vitC", 28 ], [ "calcium", 4 ], [ "iron", 5 ], [ "vitB", 20 ], [ "meat_allergen", 1 ] ], "fun": 4 }, { @@ -149,12 +149,12 @@ "description": "Spicy, and filled with bits of peppers. It's pretty good.", "price": "750 cent", "price_postapoc": "75 cent", - "material": "veggy", + "material": [ "veggy" ], "charges": 2, "volume": "500 ml", "phase": "liquid", "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 178 ], [ "vitC", 35 ], [ "calcium", 4 ], [ "iron", 12 ] ], + "vitamins": [ [ "vitA", 178 ], [ "vitC", 35 ], [ "calcium", 4 ], [ "iron", 12 ], [ "veggy_allergen", 1 ] ], "fun": 4 }, { @@ -179,7 +179,15 @@ "phase": "liquid", "charges": 2, "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 19 ], [ "vitC", 30 ], [ "calcium", 5 ], [ "iron", 28 ], [ "vitB", 24 ] ], + "vitamins": [ + [ "vitA", 19 ], + [ "vitC", 30 ], + [ "calcium", 5 ], + [ "iron", 28 ], + [ "vitB", 24 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ] + ], "fun": 5 }, { @@ -204,7 +212,7 @@ "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 20 ], [ "vitC", 9 ], [ "iron", 3 ], [ "vitB", 5 ] ], + "vitamins": [ [ "vitA", 20 ], [ "vitC", 9 ], [ "iron", 3 ], [ "vitB", 5 ], [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ], "fun": 4 }, { @@ -229,7 +237,7 @@ "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 10 ], [ "calcium", 1 ], [ "iron", 9 ], [ "vitB", 8 ] ], + "vitamins": [ [ "vitA", 10 ], [ "calcium", 1 ], [ "iron", 9 ], [ "vitB", 8 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ], "fun": 4 }, { @@ -248,13 +256,13 @@ "description": "A mushy, gray semi-liquid soup made from mushrooms.", "price": "450 cent", "price_postapoc": "1 USD", - "material": "mushroom", + "material": [ "mushroom" ], "volume": "500 ml", "phase": "liquid", "charges": 2, "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], "fun": 3, - "vitamins": [ [ "calcium", 2 ], [ "iron", 2 ] ] + "vitamins": [ [ "calcium", 2 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -272,12 +280,12 @@ "description": "It smells of tomatoes. Not very filling, but it goes well with grilled cheese.", "price": "4 USD", "price_postapoc": "50 cent", - "material": "tomato", + "material": [ "tomato" ], "volume": "250 ml", "phase": "liquid", "charges": 2, "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 7 ], [ "vitC", 10 ], [ "calcium", 1 ], [ "iron", 4 ] ], + "vitamins": [ [ "vitA", 7 ], [ "vitC", 10 ], [ "calcium", 1 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ], "fun": 3 }, { @@ -302,7 +310,15 @@ "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 81 ], [ "vitC", 7 ], [ "calcium", 9 ], [ "iron", 13 ], [ "vitB", 20 ] ], + "vitamins": [ + [ "vitA", 81 ], + [ "vitC", 7 ], + [ "calcium", 9 ], + [ "iron", 13 ], + [ "vitB", 20 ], + [ "meat_allergen", 1 ], + [ "wheat_allergen", 1 ] + ], "fun": 4 }, { @@ -326,7 +342,15 @@ "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 15 ], [ "vitC", 8 ], [ "calcium", 7 ], [ "iron", 7 ], [ "vitB", 8 ] ], + "vitamins": [ + [ "vitA", 15 ], + [ "vitC", 8 ], + [ "calcium", 7 ], + [ "iron", 7 ], + [ "vitB", 8 ], + [ "meat_allergen", 1 ], + [ "milk_allergen", 1 ] + ], "fun": 5 } ] diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json index 439ae3dcc7fa..cef44459a18b 100644 --- a/data/json/items/comestibles/spice.json +++ b/data/json/items/comestibles/spice.json @@ -73,7 +73,8 @@ "calories": 19, "flags": [ "NUTRIENT_OVERRIDE" ], "//": "a tbsp is 4.2g of sugar, meaning the volume needed to be adjusted.", - "charges": 71 + "charges": 71, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -101,12 +102,13 @@ "description": "A tasty collection of wild herbs including violet, sassafras, mint, clover, purslane, fireweed, and burdock.", "price": "190 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "charges": 20, "flags": [ "RAW" ], "stack_size": 100, - "fun": -15 + "fun": -15, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "id": "soysauce", @@ -144,7 +146,8 @@ "material": [ "veggy" ], "volume": "250 ml", "price": "0 cent", - "price_postapoc": "10 cent" + "price_postapoc": "10 cent", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "id": "mustard_powder", diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index 3ba8ded19499..15e880c41080 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -26,11 +26,11 @@ "description": "Sticky, gooey carbohydrate paste extracted from plants. Spoils rather quickly if not prepared for storage.", "price": "0 cent", "price_postapoc": "10 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "milling": { "into": "flour", "conversion_rate": 15 }, "fun": -14, - "vitamins": [ ] + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -51,7 +51,7 @@ "volume": "150 ml", "flags": [ "EATEN_HOT" ], "fun": 1, - "vitamins": [ [ "calcium", 2 ], [ "iron", 2 ] ] + "vitamins": [ [ "calcium", 2 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -71,7 +71,7 @@ "material": [ "veggy" ], "volume": "83 ml", "flags": [ "EATEN_HOT" ], - "vitamins": [ [ "vitC", 16 ], [ "calcium", 1 ], [ "iron", 2 ] ], + "vitamins": [ [ "vitC", 16 ], [ "calcium", 1 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ], "fun": 1 }, { @@ -125,10 +125,11 @@ "description": "Wild burdocks that have been battered and deep-fried. Very tasty and nutritious.", "price": "250 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "500 ml", "flags": [ "EATEN_HOT" ], - "fun": 5 + "fun": 5, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -142,10 +143,11 @@ "description": "Wild dandelions and burdocks that have been battered and deep-fried. Very tasty and nutritious.", "price": "5 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "500 ml", "flags": [ "EATEN_HOT" ], - "fun": 6 + "fun": 6, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -182,11 +184,12 @@ "description": "A dish in which vegetables are set into a gelatin made from a plant stock.", "price": "15 USD", "price_postapoc": "150 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "500 ml", "charges": 2, "//": "TODO: Confirm nutrition facts for aspic", - "flags": [ "EATEN_COLD" ] + "flags": [ "EATEN_COLD" ], + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -209,8 +212,8 @@ "weight": "178 g", "color": "yellow", "symbol": "%", - "material": "veggy", - "vitamins": [ [ "vitA", 6 ], [ "vitC", 3 ], [ "iron", 3 ] ], + "material": [ "veggy" ], + "vitamins": [ [ "vitA", 6 ], [ "vitC", 3 ], [ "iron", 3 ], [ "veggy_allergen", 1 ] ], "spoils_in": "2 days", "container": "can_medium", "quench": 5, @@ -230,8 +233,8 @@ "weight": "178 g", "color": "yellow", "symbol": "%", - "material": "veggy", - "vitamins": [ [ "vitA", 6 ], [ "vitC", 3 ], [ "iron", 3 ] ], + "material": [ "veggy" ], + "vitamins": [ [ "vitA", 6 ], [ "vitC", 3 ], [ "iron", 3 ], [ "veggy_allergen", 1 ] ], "spoils_in": "2 days", "container": "bowl_plastic", "calories": 120, @@ -251,7 +254,7 @@ "symbol": "%", "quench": -1, "calories": 47, - "vitamins": [ [ "iron", 3 ] ], + "vitamins": [ [ "iron", 3 ], [ "veggy_allergen", 1 ] ], "description": "This yellow cornmeal is useful for baking.", "price": "450 cent", "price_postapoc": "25 cent", @@ -271,7 +274,7 @@ "symbol": "%", "healthy": 1, "calories": 295, - "vitamins": [ [ "vitC", 3 ], [ "calcium", 8 ], [ "iron", 32 ] ], + "vitamins": [ [ "vitC", 3 ], [ "calcium", 8 ], [ "iron", 32 ], [ "veggy_allergen", 1 ] ], "description": "Slow-cooked beans with vegetables. Tasty and very filling.", "price": "7 USD", "price_postapoc": "1 USD", @@ -295,13 +298,13 @@ "description": "Dehydrated long-grain rice. Tasty and nutritious when cooked, virtually inedible when dry.", "price": "5 USD", "price_postapoc": "3 USD", - "material": "veggy", + "material": [ "veggy" ], "primary_material": "dried_vegetable", "volume": "250 ml", "cooks_like": "rice_cooked", "milling": { "into": "flour", "conversion_rate": 3 }, "charges": 3, - "vitamins": [ [ "iron", 3 ] ], + "vitamins": [ [ "iron", 3 ], [ "veggy_allergen", 1 ] ], "fun": -15, "flags": [ "NUTRIENT_OVERRIDE" ] }, @@ -338,11 +341,11 @@ "description": "Delicious fried rice with vegetables. Tasty and very filling.", "price": "7 USD", "price_postapoc": "150 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 5, - "vitamins": [ [ "vitA", 2 ], [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitA", 2 ], [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 3 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -362,7 +365,7 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 2, - "vitamins": [ [ "vitC", 14 ], [ "calcium", 4 ], [ "iron", 16 ] ] + "vitamins": [ [ "vitC", 14 ], [ "calcium", 4 ], [ "iron", 16 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -378,11 +381,11 @@ "description": "Delicious tofu fried rice with vegetables. Tasty and very filling.", "price": "6 USD", "price_postapoc": "150 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], "fun": 5, - "vitamins": [ [ "calcium", 17 ], [ "iron", 16 ], [ "vitC", 84 ], [ "vitA", 61 ] ] + "vitamins": [ [ "calcium", 17 ], [ "iron", 16 ], [ "vitC", 84 ], [ "vitA", 61 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -399,11 +402,11 @@ "description": "A tofu stirfry with rice and a sweet bold flavor sure to be on your mind through these dark days.", "price": "12 USD", "price_postapoc": "2 USD", - "material": "veggy", + "material": [ "veggy" ], "volume": "1 L", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], "fun": 19, - "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ], [ "iron", 5 ], [ "vitC", 24 ] ] + "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ], [ "iron", 5 ], [ "vitC", 24 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -424,7 +427,7 @@ "//": "one bean + one rice + one veggy", "flags": [ "EATEN_HOT" ], "fun": 4, - "vitamins": [ [ "vitC", 28 ], [ "calcium", 8 ], [ "iron", 32 ] ] + "vitamins": [ [ "vitC", 28 ], [ "calcium", 8 ], [ "iron", 32 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -440,11 +443,11 @@ "description": "A delicious baked potato. Got any sour cream?", "price": "150 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], "fun": 3, - "vitamins": [ [ "vitA", 1 ], [ "vitC", 9 ], [ "calcium", 13 ], [ "iron", 8 ] ] + "vitamins": [ [ "vitA", 1 ], [ "vitC", 9 ], [ "calcium", 13 ], [ "iron", 8 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -458,10 +461,11 @@ "description": "This is a simple dish made by cooking the pumpkin pulp and then mashing.", "price": "50 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "delete": { "flags": [ "RAW" ] }, - "charges": 1 + "charges": 1, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -484,7 +488,7 @@ "charges": 8, "flags": [ "EATEN_HOT" ], "fun": 3, - "vitamins": [ [ "vitA", 5 ], [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 14 ] ] + "vitamins": [ [ "vitA", 5 ], [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 14 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -505,7 +509,7 @@ "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 10, - "vitamins": [ [ "vitA", 7 ], [ "vitC", 20 ], [ "calcium", 30 ], [ "iron", 20 ] ] + "vitamins": [ [ "vitA", 7 ], [ "vitC", 20 ], [ "calcium", 30 ], [ "iron", 20 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -526,7 +530,7 @@ "volume": "250 ml", "charges": 4, "phase": "liquid", - "vitamins": [ [ "vitA", 7 ], [ "calcium", 11 ], [ "iron", 3 ] ], + "vitamins": [ [ "vitA", 7 ], [ "calcium", 11 ], [ "iron", 3 ], [ "veggy_allergen", 1 ], [ "nut_allergen", 1 ] ], "fun": 4 }, { @@ -544,9 +548,9 @@ "description": "This mushy pile of vegetable matter was boiled and canned in an earlier life. Better eat it before it oozes through your fingers.", "price": "250 cent", "price_postapoc": "150 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", - "vitamins": [ [ "vitA", 73 ], [ "vitC", 11 ], [ "calcium", 5 ], [ "iron", 9 ] ] + "vitamins": [ [ "vitA", 73 ], [ "vitC", 11 ], [ "calcium", 5 ], [ "iron", 9 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -564,9 +568,9 @@ "description": "Vegetable chunks pickled in a salt bath. Goes well with burgers, if only you can find one.", "price": "5 USD", "price_postapoc": "1 USD", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", - "vitamins": [ [ "vitA", 46 ], [ "vitC", 7 ], [ "calcium", 5 ], [ "iron", 9 ] ] + "vitamins": [ [ "vitA", 46 ], [ "vitC", 7 ], [ "calcium", 5 ], [ "iron", 9 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -587,7 +591,7 @@ "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 15, - "vitamins": [ [ "calcium", 10 ], [ "iron", 10 ] ] + "vitamins": [ [ "calcium", 10 ], [ "iron", 10 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ], [ "nut_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -600,9 +604,10 @@ "description": "A pickled cucumber. Rather sour, but tastes good and lasts for a long time.", "price": "250 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", - "fun": 5 + "fun": 5, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -619,12 +624,12 @@ "description": "This is a delicious sautee of lovely diced onions and sauerkraut. The smell alone is enough to make your mouth water.", "price": "5 USD", "price_postapoc": "1 USD", - "material": "veggy", + "material": [ "veggy" ], "//": "assumes the sauerkraut and onions cook down to half their raw values. vitamins and calories are the two added together", "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 5, - "vitamins": [ [ "vitC", 99 ], [ "calcium", 21 ], [ "iron", 2 ] ] + "vitamins": [ [ "vitC", 99 ], [ "calcium", 21 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -650,11 +655,12 @@ "description": "Dehydrated vegetable flakes. With proper storage, this dried food will remain edible for an incredibly long time.", "price": "9 USD", "price_postapoc": "1 USD", - "material": "veggy", + "material": [ "veggy" ], "primary_material": "dried_vegetable", "volume": "250 ml", "charges": 2, - "delete": { "flags": [ "RAW" ] } + "delete": { "flags": [ "RAW" ] }, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -685,10 +691,10 @@ "description": "Salad with all kind of vegetables.", "price": "350 cent", "price_postapoc": "1 USD", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "fun": 1, - "vitamins": [ [ "vitC", 30 ], [ "calcium", 6 ], [ "iron", 10 ] ] + "vitamins": [ [ "vitC", 30 ], [ "calcium", 6 ], [ "iron", 10 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -758,11 +764,11 @@ "description": "A serving of sticky vinegared rice commonly used in sushi.", "price": "1 USD", "price_postapoc": "4 USD", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "charges": 4, "fun": 3, - "vitamins": [ ] + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -779,11 +785,11 @@ "description": "A triangular block of tasty sushi rice with a healthy green vegetable folded around it.", "price": "210 cent", "price_postapoc": "1 USD", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "charges": 2, "fun": 8, - "vitamins": [ ] + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -800,10 +806,10 @@ "description": "Delicious chopped vegetables wrapped in tasty sushi rice and rolled up in a healthy green vegetable.", "price": "290 cent", "price_postapoc": "150 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", "fun": 12, - "vitamins": [ [ "vitA", 28 ], [ "vitC", 80 ], [ "calcium", 2 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 28 ], [ "vitC", 80 ], [ "calcium", 2 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -832,9 +838,9 @@ "description": "This crunchy, sour topping made from lettuce or cabbage is perfect for your hot dogs and hamburgers, or, if you're desperate, straight to your stomach.", "price": "450 cent", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "250 ml", - "vitamins": [ [ "vitC", 85 ], [ "calcium", 17 ] ], + "vitamins": [ [ "vitC", 85 ], [ "calcium", 17 ], [ "veggy_allergen", 1 ] ], "fun": -2 }, { @@ -852,9 +858,9 @@ "description": "A less prickly version of cactus pads.", "price": "1 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "500 ml", - "vitamins": [ [ "vitA", 27 ], [ "vitC", 27 ], [ "calcium", 48 ], [ "iron", 9 ] ], + "vitamins": [ [ "vitA", 27 ], [ "vitC", 27 ], [ "calcium", 48 ], [ "iron", 9 ], [ "veggy_allergen", 1 ] ], "fun": 3 }, { @@ -872,11 +878,11 @@ "description": "Boiled fiddleheads. Not bad, but would be better sauteed in butter.", "price": "80 cent", "price_postapoc": "25 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "120 ml", "fun": 1, "healthy": 1, - "vitamins": [ [ "vitC", 6 ], [ "vitA", 10 ], [ "calcium", 4 ] ] + "vitamins": [ [ "vitC", 6 ], [ "vitA", 10 ], [ "calcium", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -892,11 +898,11 @@ "description": "Fiddleheads sauteed in fat. Tender and delicious.", "price": "4 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "volume": "240 ml", "fun": 5, "healthy": 1, - "vitamins": [ [ "vitC", 32 ], [ "vitA", 40 ], [ "calcium", 4 ] ] + "vitamins": [ [ "vitC", 32 ], [ "vitA", 40 ], [ "calcium", 4 ], [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -905,9 +911,10 @@ "copy-from": "sausage", "calories": 56, "healthy": 1, - "material": "veggy", + "material": [ "veggy" ], "description": "A plant based sausage that has been cured and smoked for long term storage.", - "fun": 4 + "fun": 4, + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -934,11 +941,11 @@ "description": "Roasted edamame, a heart healthy snack.", "price": "10 cent", "price_postapoc": "6 USD", - "material": "bean", + "material": [ "bean" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE", "EATEN_HOT" ], "charges": 4, - "vitamins": [ [ "calcium", 8 ], [ "iron", 4 ] ], + "vitamins": [ [ "calcium", 8 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ], "fun": 4 }, { @@ -955,11 +962,11 @@ "description": "Roasted soybeans, often called soy nuts.", "price": "10 cent", "price_postapoc": "5 USD", - "material": "bean", + "material": [ "bean" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE", "EATEN_HOT" ], "charges": 4, - "vitamins": [ [ "calcium", 8 ], [ "iron", 4 ] ], + "vitamins": [ [ "calcium", 8 ], [ "iron", 4 ], [ "veggy_allergen", 1 ] ], "fun": 4 }, { @@ -979,9 +986,9 @@ "quench": -2, "description": "A spicy pickled veggie made of variable ingredients. Before the Cataclysm, it was traditionally stored in a dedicated refrigerator, but it's actually a preserved food.", "price": "2 USD", - "material": "veggy", + "material": [ "veggy" ], "charges": 4, - "vitamins": [ [ "vitC", 48 ], [ "calcium", 7 ], [ "iron", 2 ] ], + "vitamins": [ [ "vitC", 48 ], [ "calcium", 7 ], [ "iron", 2 ], [ "veggy_allergen", 1 ] ], "fun": 2 }, { @@ -1018,7 +1025,7 @@ "type": "COMESTIBLE", "name": { "str_sp": "tofu kimchi" }, "description": "Soft, boiled tofu served with spicy, stir-fried kimchi. The mild tofu complements the bold flavors of the kimchi for a balanced taste.", - "material": "veggy", + "material": [ "veggy" ], "weight": "160 g", "volume": "180 ml", "color": "white", @@ -1030,6 +1037,7 @@ "charges": 2, "fun": 6, "comestible_type": "FOOD", - "flags": [ "EATEN_HOT" ] + "flags": [ "EATEN_HOT" ], + "vitamins": [ [ "veggy_allergen", 1 ] ] } ] diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index 07ee57cd51d9..33ac14d167e9 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -14,10 +14,10 @@ "description": "Whole-grain wheat cereal. It's surprisingly good, and allegedly good for your heart.", "price": "3 USD", "price_postapoc": "6 USD", - "material": "wheat", + "material": [ "wheat" ], "volume": "1 L", "charges": 12, - "vitamins": [ [ "vitC", 7 ], [ "calcium", 2 ], [ "iron", 9 ] ], + "vitamins": [ [ "vitC", 7 ], [ "calcium", 2 ], [ "iron", 9 ], [ "wheat_allergen", 1 ] ], "fun": 8 }, { @@ -34,11 +34,11 @@ "description": "Raw wheat, not very tasty.", "price": "120 cent", "price_postapoc": "1 USD", - "material": "wheat", + "material": [ "wheat" ], "milling": { "into": "flour", "conversion_rate": 15 }, "volume": "250 ml", "flags": [ "RAW" ], - "vitamins": [ [ "calcium", 4 ], [ "iron", 40 ] ], + "vitamins": [ [ "calcium", 4 ], [ "iron", 40 ], [ "wheat_allergen", 1 ] ], "fun": -10 }, { @@ -59,7 +59,7 @@ "material": [ "wheat" ], "volume": "250 ml", "flags": [ "EATEN_HOT" ], - "vitamins": [ [ "calcium", 5 ], [ "iron", 34 ] ], + "vitamins": [ [ "calcium", 5 ], [ "iron", 34 ], [ "wheat_allergen", 1 ] ], "fun": -1 }, { @@ -75,10 +75,10 @@ "description": "A type of pasta usually used when preparing spaghetti. It could be eaten raw if you're desperate, but is much better cooked.", "price": "120 cent", "price_postapoc": "1 USD", - "material": "wheat", + "material": [ "wheat" ], "volume": "62 ml", "flags": [ "RAW" ], - "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ] ], + "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ], [ "wheat_allergen", 1 ] ], "fun": -8 }, { @@ -94,10 +94,10 @@ "description": "A pasta sheet used in making lasagne. It could be eaten raw if you're desperate, but is much better cooked.", "price": "120 cent", "price_postapoc": "1 USD", - "material": "wheat", + "material": [ "wheat" ], "volume": "62 ml", "flags": [ "RAW" ], - "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ] ], + "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ], [ "wheat_allergen", 1 ] ], "fun": -8 }, { @@ -115,10 +115,10 @@ "description": "Fresh wet noodles. Fairly bland, but fills you up.", "price": "20 cent", "price_postapoc": "50 cent", - "material": "wheat", + "material": [ "wheat" ], "volume": "250 ml", "flags": [ "EATEN_HOT", "TRADER_AVOID" ], - "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ] ] + "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -133,10 +133,10 @@ "description": "It could be eaten raw if you're desperate, but is much better cooked.", "price": "150 cent", "price_postapoc": "1 USD", - "material": "wheat", + "material": [ "wheat" ], "flags": [ "RAW" ], "volume": "62 ml", - "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ] ], + "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ], [ "wheat_allergen", 1 ] ], "fun": -6 }, { @@ -158,7 +158,7 @@ "volume": "250 ml", "flags": [ "EATEN_HOT", "TRADER_AVOID" ], "fun": 5, - "vitamins": [ [ "calcium", 10 ], [ "iron", 11 ] ] + "vitamins": [ [ "calcium", 10 ], [ "iron", 11 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -178,7 +178,7 @@ "volume": "250 ml", "flags": [ "RAW" ], "charges": 10, - "vitamins": [ [ "iron", 3 ] ], + "vitamins": [ [ "iron", 3 ], [ "wheat_allergen", 1 ] ], "fun": -5 }, { @@ -195,12 +195,12 @@ "description": "Dry flakes of flattened grain. Tasty and nutritious when cooked, it also doubles as food for horses while dry.", "price": "75 USD", "price_postapoc": "50 cent", - "material": "wheat", + "material": [ "wheat" ], "volume": "250 ml", "cooks_like": "oatmeal_cooked", "flags": [ "NUTRIENT_OVERRIDE", "RAW" ], "charges": 10, - "vitamins": [ [ "iron", 2 ] ], + "vitamins": [ [ "iron", 2 ], [ "wheat_allergen", 1 ] ], "fun": -2 }, { @@ -217,11 +217,11 @@ "description": "Raw oats.", "price": "120 cent", "price_postapoc": "1 USD", - "material": "wheat", + "material": [ "wheat" ], "volume": "250 ml", "milling": { "into": "flour", "conversion_rate": 4 }, "flags": [ "RAW" ], - "vitamins": [ [ "calcium", 3 ], [ "iron", 20 ] ], + "vitamins": [ [ "calcium", 3 ], [ "iron", 20 ], [ "wheat_allergen", 1 ] ], "fun": -10 }, { @@ -238,11 +238,11 @@ "description": "A filling and nutritious New England classic that has sustained pioneers and captains of industry alike.", "price": "5 USD", "price_postapoc": "50 cent", - "material": "wheat", + "material": [ "wheat" ], "volume": "250 ml", "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], "fun": 2, - "vitamins": [ [ "calcium", 1 ], [ "iron", 12 ] ] + "vitamins": [ [ "calcium", 1 ], [ "iron", 12 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -259,12 +259,12 @@ "description": "A filling and nutritious New England classic that has been improved with the addition of extra wholesome ingredients.", "price": "550 cent", "price_postapoc": "75 cent", - "material": "wheat", + "material": [ "wheat" ], "volume": "375 ml", "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 3, - "vitamins": [ [ "vitA", 1 ], [ "vitC", 30 ], [ "calcium", 1 ], [ "iron", 1 ] ] + "vitamins": [ [ "vitA", 1 ], [ "vitC", 30 ], [ "calcium", 1 ], [ "iron", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -286,7 +286,7 @@ "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 3, - "vitamins": [ [ "vitA", 1 ], [ "calcium", 6 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 1 ], [ "calcium", 6 ], [ "iron", 4 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -350,7 +350,14 @@ "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 8, - "vitamins": [ [ "vitA", 4 ], [ "calcium", 3 ], [ "iron", 5 ] ] + "vitamins": [ + [ "vitA", 4 ], + [ "calcium", 3 ], + [ "iron", 5 ], + [ "wheat_allergen", 1 ], + [ "egg_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -370,7 +377,7 @@ "volume": "250 ml", "flags": [ "EATEN_HOT" ], "fun": 5, - "vitamins": [ [ "vitA", 3 ], [ "calcium", 15 ], [ "iron", 9 ] ] + "vitamins": [ [ "vitA", 3 ], [ "calcium", 15 ], [ "iron", 9 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -419,7 +426,15 @@ "volume": "375 ml", "flags": [ "EATEN_HOT" ], "fun": 6, - "vitamins": [ [ "vitA", 6 ], [ "vitC", 120 ], [ "calcium", 2 ], [ "iron", 2 ] ] + "vitamins": [ + [ "vitA", 6 ], + [ "vitC", 120 ], + [ "calcium", 2 ], + [ "iron", 2 ], + [ "wheat_allergen", 1 ], + [ "fruit_allergen", 1 ], + [ "milk_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -435,10 +450,10 @@ "description": "Dry and salty, these crackers will leave you quite thirsty.", "price": "110 cent", "price_postapoc": "6 USD", - "material": "wheat", + "material": [ "wheat" ], "volume": "1 L", "charges": 8, - "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ] ], + "vitamins": [ [ "calcium", 5 ], [ "iron", 12 ], [ "wheat_allergen", 1 ] ], "fun": 2 }, { @@ -491,7 +506,7 @@ "flags": [ "EATEN_HOT" ], "fun": 3, "//": "these vitamins are only for pies that may spawn. generally they will be inherited from the fruit used.", - "vitamins": [ [ "vitA", 3 ], [ "vitC", 6 ], [ "calcium", 1 ], [ "iron", 3 ] ] + "vitamins": [ [ "vitA", 3 ], [ "vitC", 6 ], [ "calcium", 1 ], [ "iron", 3 ], [ "wheat_allergen", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -513,7 +528,7 @@ "charges": 4, "flags": [ "EATEN_HOT" ], "fun": 10, - "vitamins": [ [ "vitA", 12 ], [ "vitC", 4 ], [ "calcium", 25 ], [ "iron", 23 ] ] + "vitamins": [ [ "vitA", 12 ], [ "vitC", 4 ], [ "calcium", 25 ], [ "iron", 23 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -562,7 +577,7 @@ "primary_material": "wheat", "volume": "250 ml", "charges": 4, - "vitamins": [ [ "calcium", 2 ], [ "iron", 7 ] ], + "vitamins": [ [ "calcium", 2 ], [ "iron", 7 ], [ "wheat_allergen", 1 ], [ "fruit_allergen", 1 ] ], "fun": 3 }, { @@ -587,7 +602,7 @@ "charges": 8, "flags": [ "EATEN_HOT" ], "fun": 6, - "vitamins": [ [ "vitA", 2 ], [ "calcium", 4 ], [ "iron", 8 ] ] + "vitamins": [ [ "vitA", 2 ], [ "calcium", 4 ], [ "iron", 8 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -603,9 +618,9 @@ "description": "So-called ramen noodles. Can be eaten raw.", "price": "2 USD", "price_postapoc": "1 USD", - "material": "wheat", + "material": [ "wheat" ], "volume": "250 ml", - "vitamins": [ [ "calcium", 1 ], [ "iron", 18 ] ] + "vitamins": [ [ "calcium", 1 ], [ "iron", 18 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -626,7 +641,7 @@ "volume": "250 ml", "stack_size": 1, "fun": 9, - "vitamins": [ [ "vitC", 2 ], [ "calcium", 6 ], [ "iron", 8 ] ] + "vitamins": [ [ "vitC", 2 ], [ "calcium", 6 ], [ "iron", 8 ], [ "wheat_allergen", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -649,7 +664,7 @@ "charges": 6, "flags": [ "EATEN_HOT" ], "fun": 6, - "vitamins": [ [ "vitA", 8 ], [ "calcium", 2 ], [ "iron", 4 ] ] + "vitamins": [ [ "vitA", 8 ], [ "calcium", 2 ], [ "iron", 4 ], [ "wheat_allergen", 1 ], [ "milk_allergen", 1 ] ] }, { "id": "sponge_cake", @@ -663,13 +678,13 @@ "price": "50 USD", "price_postapoc": "3 USD", "charges": 4, - "material": "wheat", + "material": [ "wheat" ], "symbol": "%", "color": "brown", "calories": 278, "fun": 4, "spoils_in": "14 days", - "vitamins": [ [ "vitA", 8 ], [ "calcium", 2 ], [ "iron", 5 ] ], + "vitamins": [ [ "vitA", 8 ], [ "calcium", 2 ], [ "iron", 5 ], [ "wheat_allergen", 1 ] ], "flags": [ "EATEN_HOT" ] }, { @@ -718,6 +733,7 @@ "calories": 300, "quench": 4, "fun": 6, - "flags": [ "EATEN_COLD" ] + "flags": [ "EATEN_COLD" ], + "vitamins": [ [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] } ] diff --git a/data/json/items/corpses/corpses.json b/data/json/items/corpses/corpses.json index 488d06f6c729..bec37092261a 100644 --- a/data/json/items/corpses/corpses.json +++ b/data/json/items/corpses/corpses.json @@ -25,7 +25,7 @@ "name": { "str": "desiccated corpse" }, "description": "A dead body, badly mangled and desiccated. It seems whatever killed him did so with a gigantic claw.", "category": "other", - "material": "hflesh", + "material": [ "hflesh" ], "price": "0 cent", "volume": "7500 ml", "flags": [ "TRADER_AVOID" ] @@ -36,7 +36,7 @@ "copy-from": "corpse", "name": { "str": "corpse" }, "description": "A dead human body.", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -45,7 +45,7 @@ "name": { "str": "corpse" }, "description": "A dead body of a middle-aged man.", "looks_like": "corpse", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -56,7 +56,7 @@ "looks_like": "corpse", "volume": "40 L", "weight": "52 kg", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -67,7 +67,7 @@ "looks_like": "corpse", "volume": "30 L", "weight": "30 kg", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -78,7 +78,7 @@ "looks_like": "corpse", "volume": "30 L", "weight": "30 kg", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -89,7 +89,7 @@ "looks_like": "corpse", "volume": "30 L", "weight": "30 kg", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -100,7 +100,7 @@ "looks_like": "corpse", "volume": "30 L", "weight": "30 kg", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -112,7 +112,7 @@ "looks_like": "corpse", "volume": "40 L", "weight": "52 kg", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -121,7 +121,7 @@ "name": { "str": "corpse" }, "description": "A dead body, coated in congealed blood.", "looks_like": "corpse", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -130,7 +130,7 @@ "name": { "str": "corpse" }, "description": "A dead body with a frightful grimace. He appears to have been horribly mangled prior to his death.", "looks_like": "corpse", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -139,7 +139,7 @@ "name": { "str": "corpse" }, "description": "An awful, almost unidentifiable mass of charred flesh.", "looks_like": "corpse", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -148,7 +148,7 @@ "name": { "str": "corpse" }, "description": "A dead body with a gaping stab wound in its back.", "looks_like": "corpse", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -159,7 +159,7 @@ "looks_like": "corpse", "volume": "40 L", "weight": "52 kg", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -170,7 +170,7 @@ "looks_like": "corpse", "volume": "30 L", "weight": "40 kg", - "material": "hflesh" + "material": [ "hflesh" ] }, { "type": "GENERIC", @@ -181,6 +181,6 @@ "looks_like": "corpse", "volume": "57 L", "weight": "78 kg", - "material": "hflesh" + "material": [ "hflesh" ] } ] diff --git a/data/json/items/generic.json b/data/json/items/generic.json index ac7f59d31169..bf4082af0171 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -291,7 +291,7 @@ "description": "Glue made from boiling animal bones. The adhesive isn't strong enough for heavy-duty usages, but it can be used as a varnish or holding together small items.", "price": "18 USD", "price_postapoc": "50 cent", - "material": "bone", + "material": [ "bone" ], "weight": "4500 mg", "volume": "25 ml", "to_hit": -2, @@ -322,7 +322,7 @@ "color": "green", "name": { "str": "fertilizer" }, "description": "A token, representing fertilization of a plant.", - "material": "veggy" + "material": [ "veggy" ] }, { "type": "GENERIC", @@ -370,7 +370,7 @@ "description": "This is a cluster of membranous bubbles, each about the size of a grape, retrieved from inside a mutant insect. They float like tiny helium balloons, and are likely full of a lighter-than-air gas helping the bug to fly.", "price": 0, "stackable": true, - "material": "flesh", + "material": [ "flesh" ], "flags": [ "NO_SALVAGE" ], "weight": "50 g", "volume": "250 ml", @@ -476,7 +476,7 @@ "description": "An unopened biollante flower, brilliant purple in color. It may still have its sap-producing organ intact.", "price": "0 cent", "price_postapoc": "0 cent", - "material": "veggy", + "material": [ "veggy" ], "weight": "60 g", "volume": "250 ml", "to_hit": -3 @@ -757,7 +757,7 @@ "name": { "str": "bone skewer" }, "description": "A thin skewer carved from bone. Can be used to cook food over a fire or as a terrible lockpick.", "category": "other", - "material": "bone", + "material": [ "bone" ], "flags": [ "NO_SALVAGE", "TRADER_AVOID" ], "weight": "10 g", "volume": "25 ml", @@ -2559,7 +2559,7 @@ "description": "A psychoactive plant indigenous to Central Asia and the Indian subcontinent traditionally cultivated for its fiber, oil, for medicinal purposes, and for use as a recreational drug. It requires further processing to be useful.", "price": "20 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "weight": "400 g", "volume": "1 L" }, @@ -2574,11 +2574,12 @@ "looks_like": "wild_herbs", "price": "3 USD", "price_postapoc": "50 cent", - "material": "veggy", + "material": [ "veggy" ], "weight": "100 g", "flags": [ "SMOKABLE" ], "volume": "250 ml", - "smoking_result": "tobacco" + "smoking_result": "tobacco", + "vitamins": [ [ "veggy_allergen", 1 ] ] }, { "id": "cash_card", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 5f778553f823..8bd00880e74b 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -299,7 +299,7 @@ "price_postapoc": "0 cent", "bashing": 4, "cutting": 20, - "material": "bone", + "material": [ "bone" ], "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ], "flags": [ "STAB", "SHEATH_KNIFE", "FRAGILE_MELEE" ] }, diff --git a/data/json/items/tool/fishing.json b/data/json/items/tool/fishing.json index c485e1a6fc1b..aae4d54be298 100644 --- a/data/json/items/tool/fishing.json +++ b/data/json/items/tool/fishing.json @@ -54,7 +54,7 @@ "price": "25 cent", "price_postapoc": "25 cent", "cutting": 3, - "material": "bone", + "material": [ "bone" ], "symbol": ",", "color": "white" }, diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 4426c7f40b56..a6c0b64f1595 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -99,7 +99,7 @@ "price": "1 USD", "price_postapoc": "50 cent", "to_hit": -2, - "material": "veggy", + "material": [ "veggy" ], "symbol": ",", "color": "white", "initial_charges": 100, @@ -125,7 +125,7 @@ "price": 0, "price_postapoc": 0, "to_hit": -2, - "material": "veggy", + "material": [ "veggy" ], "symbol": ",", "color": "white", "initial_charges": 100, diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index 1397752a2355..25deb4b2844c 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -269,7 +269,7 @@ "price": "3 kUSD", "price_postapoc": "10 cent", "bashing": 6, - "material": "bone", + "material": [ "bone" ], "symbol": ";", "color": "white" }, @@ -561,7 +561,7 @@ "price": "40 USD", "price_postapoc": "1 USD", "to_hit": -1, - "material": "flesh", + "material": [ "flesh" ], "symbol": "*", "color": "red", "initial_charges": 3, diff --git a/data/json/items/tool/musical_instruments.json b/data/json/items/tool/musical_instruments.json index 55a3da11c554..b4581a5f9f71 100644 --- a/data/json/items/tool/musical_instruments.json +++ b/data/json/items/tool/musical_instruments.json @@ -41,7 +41,7 @@ "price": "50 USD", "price_postapoc": "1 USD", "bashing": 2, - "material": "bone", + "material": [ "bone" ], "symbol": "-", "color": "white", "initial_charges": 1, diff --git a/data/json/items/tool/tailoring.json b/data/json/items/tool/tailoring.json index 3c882122e3fa..6c825bed98fd 100644 --- a/data/json/items/tool/tailoring.json +++ b/data/json/items/tool/tailoring.json @@ -12,7 +12,7 @@ "to_hit": -1, "bashing": 2, "cutting": 5, - "material": "bone", + "material": [ "bone" ], "symbol": ";", "color": "yellow", "qualities": [ [ "LEATHER_AWL", 1 ] ], @@ -59,7 +59,7 @@ "volume": "250 ml", "price": "0 cent", "price_postapoc": "10 cent", - "material": "bone", + "material": [ "bone" ], "symbol": ";", "color": "white", "ammo": "thread", diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json index 0866c0f1d3ec..dc8bf0dcd91b 100644 --- a/data/json/obsoletion/items.json +++ b/data/json/obsoletion/items.json @@ -2854,7 +2854,8 @@ "weight": "180 g", "charges": 6, "calories": 400, - "flags": [ "EATEN_HOT" ] + "flags": [ "EATEN_HOT" ], + "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -2927,7 +2928,7 @@ "healthy": -25, "fun": -25, "use_action": "POISON", - "vitamins": [ ] + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "id": "magnetron", @@ -3117,13 +3118,14 @@ "calories": 132, "description": "Milk with natural rennet added. Used for making cheese if left in a fermenting vat for some time.", "price": "10 cent", - "material": "milk", + "material": [ "milk" ], "volume": "250 ml", "price_postapoc": "10 cent", "phase": "liquid", "fun": -12, "flags": [ "NUTRIENT_OVERRIDE" ], - "brewable": { "time": "4 hours", "results": [ "milk_curdled" ] } + "brewable": { "time": "4 hours", "results": [ "milk_curdled" ] }, + "vitamins": [ [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -3143,7 +3145,8 @@ "material": [ "milk" ], "volume": "250 ml", "phase": "liquid", - "fun": -4 + "fun": -4, + "vitamins": [ [ "milk_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -3160,10 +3163,10 @@ "price": "70 cent", "price_postapoc": "150 cent", "looks_like": "milk", - "material": "milk", + "material": [ "milk" ], "volume": "250 ml", "phase": "liquid", - "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ] ], + "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ], [ "milk_allergen", 1 ] ], "flags": [ "NUTRIENT_OVERRIDE" ], "fun": 1 }, @@ -4762,8 +4765,9 @@ "quench": -1, "healthy": 1, "description": "This is a serving of crisply brined and canned lobster. Tasty and nutritious.", - "material": "flesh", - "fun": 7 + "material": [ "flesh" ], + "fun": 7, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -4776,10 +4780,11 @@ "description": "lobster slices cured in brine. Salty but tasty in a pinch.", "price": "5 USD", "price_postapoc": "3 USD", - "material": "flesh", + "material": [ "flesh" ], "delete": { "flags": [ "NUTRIENT_OVERRIDE" ] }, "primary_material": "cured_meat", - "fun": 2 + "fun": 2, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -4810,7 +4815,7 @@ "material": [ "flesh", "wheat" ], "volume": "750 ml", "fun": 18, - "vitamins": [ [ "vitA", 8 ], [ "vitC", 10 ], [ "calcium", 6 ], [ "iron", 15 ] ], + "vitamins": [ [ "vitA", 8 ], [ "vitC", 10 ], [ "calcium", 6 ], [ "iron", 15 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ], "description": "A delicious authentic lobster roll." }, { @@ -4829,12 +4834,12 @@ "description": "A nutritious and delicious hearty lobster soup.", "price": "4 USD", "price_postapoc": "1 USD", - "material": "flesh", + "material": [ "flesh" ], "volume": "500 ml", "charges": 2, "phase": "liquid", "flags": [ "EATEN_HOT", "USE_EAT_VERB" ], - "vitamins": [ [ "vitA", 8 ], [ "vitC", 10 ], [ "calcium", 6 ], [ "iron", 15 ], [ "vitB", 20 ] ], + "vitamins": [ [ "vitA", 8 ], [ "vitC", 10 ], [ "calcium", 6 ], [ "iron", 15 ], [ "vitB", 20 ], [ "meat_allergen", 1 ] ], "fun": 4 }, { @@ -4854,7 +4859,7 @@ "material": [ "flesh", "wheat" ], "volume": "750 ml", "fun": 14, - "vitamins": [ [ "vitA", 4 ], [ "vitC", 5 ], [ "calcium", 12 ], [ "iron", 24 ] ] + "vitamins": [ [ "vitA", 4 ], [ "vitC", 5 ], [ "calcium", 12 ], [ "iron", 24 ], [ "meat_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -4877,7 +4882,16 @@ "charges": 2, "flags": [ "EATEN_HOT" ], "fun": 5, - "vitamins": [ [ "vitA", 8 ], [ "vitC", 10 ], [ "calcium", 7 ], [ "iron", 18 ], [ "vitB", 20 ] ] + "vitamins": [ + [ "vitA", 8 ], + [ "vitC", 10 ], + [ "calcium", 7 ], + [ "iron", 18 ], + [ "vitB", 20 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ], + [ "wheat_allergen", 1 ] + ] }, { "type": "COMESTIBLE", @@ -4891,7 +4905,7 @@ "material": [ "wheat", "veggy" ], "flags": [ "EATEN_COLD" ], "fun": 8, - "vitamins": [ [ "vitC", 9 ], [ "calcium", 16 ], [ "iron", 30 ] ] + "vitamins": [ [ "vitC", 9 ], [ "calcium", 16 ], [ "iron", 30 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, { "id": "buckle_steel", diff --git a/data/json/vitamin.json b/data/json/vitamin.json index c21a7c87a7ba..225dd5ca1730 100644 --- a/data/json/vitamin.json +++ b/data/json/vitamin.json @@ -74,5 +74,104 @@ "rate": "4 h", "flags": [ "NO_DISPLAY" ], "disease_excess": [ [ 10, 19 ], [ 20, 29 ], [ 30, 40 ] ] + }, + { + "id": "human_flesh_vitamin", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Consumed human flesh" }, + "min": 0, + "max": 10000, + "rate": "1 h" + }, + { + "id": "meat_allergen", + "//": "used so allergies and restrictions could be inherited in cooking process", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Meat" }, + "min": 0, + "max": 1, + "rate": "1 h" + }, + { + "id": "veggy_allergen", + "//": "used so allergies and restrictions could be inherited in cooking process", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Veggy" }, + "min": 0, + "max": 1, + "rate": "1 h" + }, + { + "id": "wheat_allergen", + "//": "used so allergies and restrictions could be inherited in cooking process", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Wheat" }, + "min": 0, + "max": 1, + "rate": "1 h" + }, + { + "id": "egg_allergen", + "//": "used so allergies and restrictions could be inherited in cooking process", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Egg" }, + "min": 0, + "max": 1, + "rate": "1 h" + }, + { + "id": "fruit_allergen", + "//": "used so allergies and restrictions could be inherited in cooking process", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Fruit" }, + "min": 0, + "max": 1, + "rate": "1 h" + }, + { + "id": "junk_allergen", + "//": "used so allergies and restrictions could be inherited in cooking process", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Junk" }, + "min": 0, + "max": 1, + "rate": "1 h" + }, + { + "id": "nut_allergen", + "//": "used so allergies and restrictions could be inherited in cooking process", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Nut" }, + "min": 0, + "max": 1, + "rate": "1 h" + }, + { + "id": "bread_allergen", + "//": "used so allergies and restrictions could be inherited in cooking process", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Bread" }, + "min": 0, + "max": 1, + "rate": "1 h" + }, + { + "id": "milk_allergen", + "//": "used so allergies and restrictions could be inherited in cooking process", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Milk" }, + "min": 0, + "max": 1, + "rate": "1 h" } ] diff --git a/data/mods/Aftershock/items/comestibles/cheap_food.json b/data/mods/Aftershock/items/comestibles/cheap_food.json index 4318ef1ddb5e..1af2170cf6b4 100644 --- a/data/mods/Aftershock/items/comestibles/cheap_food.json +++ b/data/mods/Aftershock/items/comestibles/cheap_food.json @@ -127,7 +127,7 @@ "charges": 3, "description": "Smooth crackers colored grayish-green. Used to be perfectly edible seaweed, or so the wrapper claims.", "fun": 2, - "vitamins": [ [ "calcium", 5 ], [ "iron", 5 ], [ "vitC", 10 ], [ "bad_food", 1 ] ] + "vitamins": [ [ "calcium", 5 ], [ "iron", 5 ], [ "vitC", 10 ], [ "bad_food", 1 ], [ "veggy_allergen", 1 ] ] }, { "id": "afs_beefsim", @@ -142,7 +142,15 @@ "description": "Soy or pureed rat? Better not to know.\n(But its probably both.) ", "fun": 0, "charges": 2, - "vitamins": [ [ "calcium", 5 ], [ "iron", 5 ], [ "vitC", 10 ], [ "vitB", 10 ], [ "bad_food", 1 ] ] + "vitamins": [ + [ "calcium", 5 ], + [ "iron", 5 ], + [ "vitC", 10 ], + [ "vitB", 10 ], + [ "bad_food", 1 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ] + ] }, { "id": "afs_soup_27", @@ -156,7 +164,16 @@ "healthy": 3, "description": "Yellow chunks float on creamy liquid, like flotsam on a filthy summer pond. Branding implies at least 26 other flavors, but you have neither seen or heard about any of them.", "fun": 0, - "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ], [ "vitC", 5 ], [ "vitB", 10 ], [ "vitA", 5 ], [ "bad_food", 1 ] ] + "vitamins": [ + [ "calcium", 1 ], + [ "iron", 10 ], + [ "vitC", 5 ], + [ "vitB", 10 ], + [ "vitA", 5 ], + [ "bad_food", 1 ], + [ "meat_allergen", 1 ], + [ "veggy_allergen", 1 ] + ] }, { "id": "afs_caffex", diff --git a/data/mods/Aftershock/items/frankenstein_items.json b/data/mods/Aftershock/items/frankenstein_items.json index d83a98757796..ebbd360c4ab8 100644 --- a/data/mods/Aftershock/items/frankenstein_items.json +++ b/data/mods/Aftershock/items/frankenstein_items.json @@ -9,7 +9,7 @@ "price": "6 kUSD", "to_hit": -3, "bashing": 8, - "material": "flesh", + "material": [ "flesh" ], "symbol": ";", "color": "green", "use_action": { diff --git a/data/mods/CrazyCataclysm/crazy_comestibles.json b/data/mods/CrazyCataclysm/crazy_comestibles.json index a9530cc0fff6..477f0e27691e 100644 --- a/data/mods/CrazyCataclysm/crazy_comestibles.json +++ b/data/mods/CrazyCataclysm/crazy_comestibles.json @@ -15,7 +15,8 @@ "charges": 4, "stack_size": 20, "fun": 10, - "flags": [ "MYCUS_OK", "FUNGAL_VECTOR" ] + "flags": [ "MYCUS_OK", "FUNGAL_VECTOR" ], + "vitamins": [ [ "wheat_allergen", 1 ], [ "fruit_allergen", 1 ] ] }, { "type": "recipe", diff --git a/data/mods/DinoMod/items/egg.json b/data/mods/DinoMod/items/egg.json index ff9fd66c80f5..9935b08a95c3 100644 --- a/data/mods/DinoMod/items/egg.json +++ b/data/mods/DinoMod/items/egg.json @@ -19,7 +19,8 @@ "stack_size": 4, "fun": -6, "rot_spawn": "GROUP_EGG_DINO", - "rot_spawn_chance": 70 + "rot_spawn_chance": 70, + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -36,7 +37,8 @@ "description": "Pale, round egg laid by a smaller dinosaur.", "material": [ "egg" ], "volume": "50 ml", - "rot_spawn": "GROUP_EGG_DINO_SMALL" + "rot_spawn": "GROUP_EGG_DINO_SMALL", + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -51,7 +53,8 @@ "description": "Pale, round egg laid by a larger dinosaur.", "material": [ "egg" ], "volume": "13600 ml", - "rot_spawn": "GROUP_EGG_DINO_LARGE" + "rot_spawn": "GROUP_EGG_DINO_LARGE", + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -73,7 +76,8 @@ "stack_size": 4, "fun": -6, "rot_spawn": "GROUP_EGG_THEROPOD", - "rot_spawn_chance": 70 + "rot_spawn_chance": 70, + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -84,7 +88,8 @@ "comestible_type": "FOOD", "description": "Pale, football-shaped egg laid by a smaller dinosaur.", "material": [ "egg" ], - "rot_spawn": "GROUP_EGG_THEROPOD_SMALL" + "rot_spawn": "GROUP_EGG_THEROPOD_SMALL", + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -98,7 +103,8 @@ "description": "Pale, football-shaped egg laid by a larger dinosaur.", "material": [ "egg" ], "volume": "13600 ml", - "rot_spawn": "GROUP_EGG_THEROPOD_LARGE" + "rot_spawn": "GROUP_EGG_THEROPOD_LARGE", + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -744,7 +750,8 @@ "material": [ "egg" ], "fun": 2, "rot_spawn": "GROUP_NULL", - "rot_spawn_chance": 0 + "rot_spawn_chance": 0, + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -760,7 +767,8 @@ "material": [ "egg" ], "fun": 10, "rot_spawn": "GROUP_NULL", - "rot_spawn_chance": 0 + "rot_spawn_chance": 0, + "vitamins": [ [ "egg_allergen", 1 ] ] }, { "type": "COMESTIBLE", @@ -776,6 +784,7 @@ "material": [ "egg" ], "fun": 20, "rot_spawn": "GROUP_NULL", - "rot_spawn_chance": 0 + "rot_spawn_chance": 0, + "vitamins": [ [ "egg_allergen", 1 ] ] } ] diff --git a/data/mods/Magiclysm/items/black_dragon_items.json b/data/mods/Magiclysm/items/black_dragon_items.json index 0fb801a45a10..b80a88d6db0f 100644 --- a/data/mods/Magiclysm/items/black_dragon_items.json +++ b/data/mods/Magiclysm/items/black_dragon_items.json @@ -28,7 +28,7 @@ "price": "500 USD", "material": [ "black_dragon_hide", "flesh" ], "flags": [ "NO_SALVAGE", "TRADER_AVOID" ], - "vitamins": [ ], + "vitamins": [ [ "meat_allergen", 1 ] ], "volume": "4 L", "stack_size": 1 }, diff --git a/data/mods/Magiclysm/items/cast_spell_items.json b/data/mods/Magiclysm/items/cast_spell_items.json index 4e3041c66d85..86536bf26e9f 100644 --- a/data/mods/Magiclysm/items/cast_spell_items.json +++ b/data/mods/Magiclysm/items/cast_spell_items.json @@ -95,7 +95,8 @@ "color": "pink", "stack_size": 1, "spoils_in": "4 days", - "flags": [ "TRADER_AVOID", "INEDIBLE", "NUTRIENT_OVERRIDE" ] + "flags": [ "TRADER_AVOID", "INEDIBLE", "NUTRIENT_OVERRIDE" ], + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "id": "animist_doll_skeleton", @@ -114,7 +115,8 @@ "type": "COMESTIBLE", "category": "weapons", "material": [ "fur", "flesh", "bone" ], - "copy-from": "animist_doll_skeleton" + "copy-from": "animist_doll_skeleton", + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "id": "twisted_restore_potion", diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json index 8099931e0252..ec2c4f8216e5 100644 --- a/data/mods/Magiclysm/items/comestibles.json +++ b/data/mods/Magiclysm/items/comestibles.json @@ -18,7 +18,7 @@ "stack_size": 1, "fun": -18, "rot_spawn": "GROUP_EGG_OWLBEAR", - "vitamins": [ [ "vitA", 360 ], [ "calcium", 120 ], [ "iron", 160 ], [ "vitB", 840 ] ], + "vitamins": [ [ "vitA", 360 ], [ "calcium", 120 ], [ "iron", 160 ], [ "vitB", 840 ], [ "egg_allergen", 1 ] ], "rot_spawn_chance": 80, "//": "Alchemically speaking, I see this egg as having the elements of Growth, Stone, and Egg. Growth would make things grow faster, the simplest example being a magical liquid fertilizer. Stone would be a defensive element, used in creating something like a potion of stoneskin. Egg would be interesting though. What if instead of being imbibed there were potions that instead functioned similarly to the sourdough items, or the blob vehicle parts, in that they take a gestation period and then you could activate them and have a new item pop out. Creatures sure but especially biomancers could have temporarily-lived tools, weapons, and armor." }, diff --git a/data/mods/Magiclysm/items/fuel.json b/data/mods/Magiclysm/items/fuel.json index 2fdc5e86039e..7320e3d93a55 100644 --- a/data/mods/Magiclysm/items/fuel.json +++ b/data/mods/Magiclysm/items/fuel.json @@ -9,7 +9,7 @@ "symbol": "~", "description": "Blood of a dragon, it radiates warmth and looking at it you see moving patterns form and disappear in it as if looking at an actual fire.", "price": "1 kUSD", - "material": "flesh", + "material": [ "flesh" ], "volume": "1 ml", "phase": "liquid", "category": "fuel", @@ -32,7 +32,7 @@ "symbol": "~", "description": "Blood from a blob corrupted creature. The surface of this black sludge undulates slowly as if agitated by a soft breeze.", "price": "0 cent", - "material": "flesh", + "material": [ "flesh" ], "volume": "1 ml", "phase": "liquid", "category": "fuel", @@ -49,7 +49,7 @@ "symbol": "~", "description": "Blood, possibly that of a human. Disgusting!", "price": "0 cent", - "material": "hflesh", + "material": [ "hflesh" ], "volume": "250 ml", "phase": "liquid", "category": "fuel", diff --git a/data/mods/Magiclysm/items/materials.json b/data/mods/Magiclysm/items/materials.json index be2dbad3e0d4..81466a97b9f3 100644 --- a/data/mods/Magiclysm/items/materials.json +++ b/data/mods/Magiclysm/items/materials.json @@ -19,7 +19,8 @@ "material": [ "fur", "flesh" ], "flags": [ "NO_SALVAGE", "TRADER_AVOID" ], "stack_size": 1, - "fun": -24 + "fun": -24, + "vitamins": [ [ "meat_allergen", 1 ] ] }, { "type": "GENERIC", @@ -63,7 +64,7 @@ "description": "A bone from a dragon! Even on its own, these bones make an excellent material for weapons. However, something tells you that the bones hide more secrets than just that.", "price": "0 cent", "price_postapoc": "50 cent", - "material": "bone", + "material": [ "bone" ], "volume": "500 ml" } ] diff --git a/data/mods/Magiclysm/vehicles/summoned_vehicles.json b/data/mods/Magiclysm/vehicles/summoned_vehicles.json index 6c2a1c900358..7c2a0ff89d63 100644 --- a/data/mods/Magiclysm/vehicles/summoned_vehicles.json +++ b/data/mods/Magiclysm/vehicles/summoned_vehicles.json @@ -69,7 +69,7 @@ "volume": "10 ml", "bashing": 1, "phase": "solid", - "material": "flesh", + "material": [ "flesh" ], "flags": [ "PSEUDO", "PERPETUAL" ], "fuel": { "energy": 500 }, "symbol": "?", diff --git a/data/mods/My_Sweet_Cataclysm/items/vanilla_extentions.json b/data/mods/My_Sweet_Cataclysm/items/vanilla_extentions.json index fc336c81f31d..ac9b7cf1c126 100644 --- a/data/mods/My_Sweet_Cataclysm/items/vanilla_extentions.json +++ b/data/mods/My_Sweet_Cataclysm/items/vanilla_extentions.json @@ -9,7 +9,7 @@ "spoils_in": "180 days", "color": "magenta", "comestible_type": "FOOD", - "material": "junk", + "material": [ "junk" ], "description": "The corpse of a necco, now it really looks like a giant necco wafer. Surely a bite wouldn't hurt, right?", "price": "40 USD", "charges": 40, @@ -17,7 +17,8 @@ "healthy": -1, "calories": 220, "stim": 1, - "fun": 4 + "fun": 4, + "vitamins": [ [ "junk_allergen", 1 ] ] }, { "type": "COMESTIBLE", diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json index 7d49b2d80ce8..5d41c47417b4 100644 --- a/data/mods/TEST_DATA/items.json +++ b/data/mods/TEST_DATA/items.json @@ -436,11 +436,11 @@ "calories": 202, "description": "A handful of tasty crunchy nuts from a pinecone.", "price": "136 cent", - "material": "nut", + "material": [ "nut" ], "volume": "250 ml", "flags": [ "NUTRIENT_OVERRIDE" ], "charges": 4, - "vitamins": [ [ "iron", 9 ] ], + "vitamins": [ [ "iron", 9 ], [ "nut_allergen", 1 ] ], "fun": 2 }, { diff --git a/doc/src/content/docs/en/mod/json/reference/items/allergies.md b/doc/src/content/docs/en/mod/json/reference/items/allergies.md new file mode 100644 index 000000000000..b1c5cb622547 --- /dev/null +++ b/doc/src/content/docs/en/mod/json/reference/items/allergies.md @@ -0,0 +1,42 @@ +--- +title: allergies +--- + +## Basic Info + +Allergies are based on the vitamins system for the purpose of inheritability and avoiding a need to +create several variants of items / make tough calls as to the material of foods. + +As an initial measure, these vitamins were applied based on materials to prevent regression and +having to add the vitamins all by hand. However, unless an item has `NUTRIENT_OVERRIDE`, cooking +_should_ correctly reflect what actually went into it. Naturally spawned items will have whatever +their materials would indicate. + +If a food item has veggy allergens in it, a carnivore will be unable to eat it. Vice versa for an +herbivore and something with meat allergens. + +## Current 'allergens': + +- `"egg_allergen"` +- `"fruit_allergen"` +- `"human_flesh_vitamin"` (This one is a special case, as it's instead used for morale maluses / + boons due to Cannibalism) +- `"junk_allergen"` +- `"meat_allergen"` +- `"milk_allergen"` +- `"nut_allergen"` +- `"veggy_allergen"` +- `"wheat_allergen"` (Actually just general bread / baked goods) + +## Current dietary restrictions: + +Full bans: + +- Carnivore: veggy_allergen, fruit_allergen, wheat_allergen, nut_allergen +- Herbivore / Ruminant: meat_allergen, egg_allergen Dislikes: +- Vegetarian +- Anti-plant +- Lactose intolerance +- Fruit intolerance +- Junkfood intolerance +- Grain intolerance diff --git a/src/computer_session.cpp b/src/computer_session.cpp index 4a6ee8193bdb..ece9fae56d74 100644 --- a/src/computer_session.cpp +++ b/src/computer_session.cpp @@ -66,6 +66,8 @@ static const itype_id itype_sewage( "sewage" ); static const itype_id itype_usb_drive( "usb_drive" ); static const itype_id itype_vacutainer( "vacutainer" ); +static const vitamin_id vitamin_human_flesh_vitamin( "human_flesh_vitamin" ); + static const skill_id skill_computer( "computer" ); static const mtype_id mon_manhack( "mon_manhack" ); @@ -773,7 +775,7 @@ void computer_session::action_blood_anal() print_error( _( "USB drive required!" ) ); } } - } else if( blood.has_flag( flag_CANNIBALISM ) ) { // Normal human blood + } else if( blood.has_vitamin( vitamin_human_flesh_vitamin ) ) { // Normal human blood print_line( _( "Result: Human blood, no pathogens found." ) ); } else { // Anything else print_line( _( "Result: Unknown blood type. Test non-conclusive." ) ); diff --git a/src/consumption.cpp b/src/consumption.cpp index 97b3f1dcdb40..df3e274cf3dd 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include "activity_handlers.h" #include "addiction.h" @@ -121,17 +122,27 @@ static const trait_id trait_THRESH_URSINE( "THRESH_URSINE" ); static const trait_id trait_VEGETARIAN( "VEGETARIAN" ); static const trait_id trait_WATERSLEEP( "WATERSLEEP" ); +static const vitamin_id vitamin_egg_allergen( "egg_allergen" ); +static const vitamin_id vitamin_fruit_allergen( "fruit_allergen" ); +static const vitamin_id vitamin_human_flesh_vitamin( "human_flesh_vitamin" ); +static const vitamin_id vitamin_junk_allergen( "junk_allergen" ); +static const vitamin_id vitamin_meat_allergen( "meat_allergen" ); +static const vitamin_id vitamin_milk_allergen( "milk_allergen" ); +static const vitamin_id vitamin_nut_allergen( "nut_allergen" ); +static const vitamin_id vitamin_veggy_allergen( "veggy_allergen" ); +static const vitamin_id vitamin_wheat_allergen( "wheat_allergen" ); + static const trait_flag_str_id trait_flag_CANNIBAL( "CANNIBAL" ); // note: cannot use constants from flag.h (e.g. flag_ALLERGEN_VEGGY) here, as they // might be uninitialized at the time these const arrays are created -static const std::array carnivore_blacklist {{ - flag_id( "ALLERGEN_VEGGY" ), flag_id( "ALLERGEN_FRUIT" ), - flag_id( "ALLERGEN_WHEAT" ), flag_id( "ALLERGEN_NUT" ) +static const std::array carnivore_blacklist {{ + vitamin_veggy_allergen, vitamin_fruit_allergen, + vitamin_wheat_allergen, vitamin_nut_allergen }}; -static const std::array herbivore_blacklist {{ - flag_id( "ALLERGEN_MEAT" ), flag_id( "ALLERGEN_EGG" ) +static const std::array herbivore_blacklist {{ + vitamin_meat_allergen, vitamin_egg_allergen }}; // Defines the maximum volume that a internal furnace can consume @@ -238,7 +249,7 @@ static int compute_default_effective_kcal( const item &comest, const Character & } if( you.has_trait( trait_CARNIVORE ) && comest.has_flag( flag_CARNIVORE_OK ) && - comest.has_any_flag( carnivore_blacklist ) ) { + comest.has_any_vitamin( carnivore_blacklist ) ) { // TODO: Comment pizza scrapping kcal *= 0.5f; } @@ -593,20 +604,20 @@ float Character::metabolic_rate() const morale_type Character::allergy_type( const item &food ) const { - using allergy_tuple = std::tuple; + using allergy_tuple = std::tuple; static const std::array allergy_tuples = {{ - std::make_tuple( trait_VEGETARIAN, flag_ALLERGEN_MEAT, MORALE_VEGETARIAN ), - std::make_tuple( trait_MEATARIAN, flag_ALLERGEN_VEGGY, MORALE_MEATARIAN ), - std::make_tuple( trait_LACTOSE, flag_ALLERGEN_MILK, MORALE_LACTOSE ), - std::make_tuple( trait_ANTIFRUIT, flag_ALLERGEN_FRUIT, MORALE_ANTIFRUIT ), - std::make_tuple( trait_ANTIJUNK, flag_ALLERGEN_JUNK, MORALE_ANTIJUNK ), - std::make_tuple( trait_ANTIWHEAT, flag_ALLERGEN_WHEAT, MORALE_ANTIWHEAT ) + std::make_tuple( trait_VEGETARIAN, vitamin_meat_allergen, MORALE_VEGETARIAN ), + std::make_tuple( trait_MEATARIAN, vitamin_veggy_allergen, MORALE_MEATARIAN ), + std::make_tuple( trait_LACTOSE, vitamin_milk_allergen, MORALE_LACTOSE ), + std::make_tuple( trait_ANTIFRUIT, vitamin_fruit_allergen, MORALE_ANTIFRUIT ), + std::make_tuple( trait_ANTIJUNK, vitamin_junk_allergen, MORALE_ANTIJUNK ), + std::make_tuple( trait_ANTIWHEAT, vitamin_wheat_allergen, MORALE_ANTIWHEAT ) } }; for( const auto &tp : allergy_tuples ) { if( has_trait( std::get<0>( tp ) ) && - food.has_flag( std::get<1>( tp ) ) ) { + food.has_vitamin( std::get<1>( tp ) ) ) { return std::get<2>( tp ); } } @@ -681,13 +692,13 @@ ret_val Character::can_eat( const item &food ) const _( "Ugh, you can't drink that!" ) ); } if( has_trait( trait_CARNIVORE ) && ( compute_effective_nutrients( food ).kcal ) > 0 && - food.has_any_flag( carnivore_blacklist ) && !food.has_flag( flag_CARNIVORE_OK ) ) { + food.has_any_vitamin( carnivore_blacklist ) && !food.has_flag( flag_CARNIVORE_OK ) ) { return ret_val::make_failure( edible_rating::inedible_mutation, _( "Eww. Inedible plant stuff!" ) ); } if( ( has_trait( trait_HERBIVORE ) || has_trait( trait_RUMINANT ) ) && - food.has_any_flag( herbivore_blacklist ) ) { + food.has_any_vitamin( herbivore_blacklist ) ) { // Like non-cannibal, but more strict! return ret_val::make_failure( edible_rating::inedible_mutation, _( "The thought of eating that makes you feel sick." ) ); @@ -730,7 +741,7 @@ ret_val Character::will_eat( const item &food, bool interactive ) } const bool carnivore = has_trait( trait_CARNIVORE ); - if( food.has_flag( flag_CANNIBALISM ) && !has_trait_flag( trait_flag_CANNIBAL ) ) { + if( food.has_vitamin( vitamin_human_flesh_vitamin ) && !has_trait_flag( trait_flag_CANNIBAL ) ) { add_consequence( _( "The thought of eating human flesh makes you feel sick." ), edible_rating::cannibalism ); } @@ -1099,7 +1110,7 @@ void Character::modify_morale( item &food, int nutr ) } } - if( food.has_flag( flag_CANNIBALISM ) ) { + if( food.has_vitamin( vitamin_human_flesh_vitamin ) ) { const bool cannibal = has_trait( trait_CANNIBAL ); const bool psycho = has_trait( trait_PSYCHOPATH ); const bool sapiovore = has_trait( trait_SAPIOVORE ); @@ -1177,7 +1188,7 @@ bool Character::consume_effects( item &food ) return false; } if( ( has_trait( trait_HERBIVORE ) || has_trait( trait_RUMINANT ) ) && - food.has_any_flag( herbivore_blacklist ) ) { + food.has_any_vitamin( herbivore_blacklist ) ) { // No good can come of this. return false; } diff --git a/src/flag.cpp b/src/flag.cpp index a6da7c13ab8d..dbcba091c871 100644 --- a/src/flag.cpp +++ b/src/flag.cpp @@ -51,7 +51,6 @@ const flag_id flag_CABLE_SPOOL( "CABLE_SPOOL" ); const flag_id flag_CAMERA_PRO( "CAMERA_PRO" ); const flag_id flag_CAN_PLANT_UNDERGROUND( "CAN_PLANT_UNDERGROUND" ); const flag_id flag_CANNIBAL( "CANNIBAL" ); -const flag_id flag_CANNIBALISM( "CANNIBALISM" ); const flag_id flag_CANT_HEAL_EVERYONE( "CANT_HEAL_EVERYONE" ); const flag_id flag_CARNIVORE_OK( "CARNIVORE_OK" ); const flag_id flag_CASING( "CASING" ); diff --git a/src/flag.h b/src/flag.h index 2cefe0e21a46..c60b88e26326 100644 --- a/src/flag.h +++ b/src/flag.h @@ -54,7 +54,6 @@ extern const flag_id flag_CABLE_SPOOL; extern const flag_id flag_CAMERA_PRO; extern const flag_id flag_CAN_PLANT_UNDERGROUND; extern const flag_id flag_CANNIBAL; -extern const flag_id flag_CANNIBALISM; extern const flag_id flag_CANT_HEAL_EVERYONE; extern const flag_id flag_CARNIVORE_OK; extern const flag_id flag_CASING; diff --git a/src/item.cpp b/src/item.cpp index 20846663d48f..40b99fd14578 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -176,6 +176,8 @@ static const trait_id trait_SQUEAMISH( "SQUEAMISH" ); static const trait_id trait_TOLERANCE( "TOLERANCE" ); static const trait_id trait_WOOLALLERGY( "WOOLALLERGY" ); +static const vitamin_id vitamin_human_flesh_vitamin( "human_flesh_vitamin" ); + static const std::string flag_FLAMMABLE( "FLAMMABLE" ); static const std::string flag_FLAMMABLE_ASH( "FLAMMABLE_ASH" ); static const std::string flag_DEEP_WATER( "DEEP_WATER" ); @@ -1976,7 +1978,7 @@ void item::food_info( const item *food_item, std::vector &info, _( "* This food will cause an allergic reaction." ) ); } - if( food_item->has_flag( flag_CANNIBALISM ) && + if( food_item->has_vitamin( vitamin_human_flesh_vitamin ) && parts->test( iteminfo_parts::FOOD_CANNIBALISM ) ) { if( !you.has_trait_flag( trait_flag_CANNIBAL ) ) { info.emplace_back( "DESCRIPTION", @@ -5686,6 +5688,27 @@ bool item::has_flag( const flag_id &f ) const return has_own_flag( f ); } +bool item::has_vitamin( const vitamin_id &v ) const +{ + if( !this->is_comestible() ) { + return false; + } + // We need this function to get all vitamins including from inheritance. + // But we don't care about calories, so we can just pass a dummy. + npc dummy; + const nutrients food_item = dummy.compute_effective_nutrients( *this ); + for( auto const& [vit_id, amount] : food_item.vitamins ) { + if( vit_id == v ) { + if( amount > 0 ) { + return true; + } else { + break; + } + } + } + return false; +} + void item::set_flag( const flag_id &flag ) { if( flag.is_valid() ) { @@ -10413,6 +10436,11 @@ std::string item::type_name( unsigned int quantity ) const ret_name = string_format( cname.name.translated( quantity ), ret_name ); } break; + case condition_type::VITAMIN: + if( has_vitamin( vitamin_id( cname.condition ) ) ) { + ret_name = string_format( cname.name.translated( quantity ), ret_name ); + } + break; case condition_type::COMPONENT_ID: if( component_id_contains( components.as_vector() ) ) { ret_name = string_format( cname.name.translated( quantity ), ret_name ); diff --git a/src/item.h b/src/item.h index 874da6aa4a36..67252694294a 100644 --- a/src/item.h +++ b/src/item.h @@ -1517,6 +1517,9 @@ class item : public location_visitable, public game_object bool has_flag( const flag_id &flag ) const; + /**Does this item have the specified vitamin*/ + bool has_vitamin( const vitamin_id &vitamin ) const; + template().begin() )>> bool has_any_flag( const Container &flags ) const { return std::any_of( flags.begin(), flags.end(), [&]( const T & flag ) { @@ -1524,6 +1527,13 @@ class item : public location_visitable, public game_object } ); } + template().begin() )>> + bool has_any_vitamin( const Container &vitamins ) const { + return std::any_of( vitamins.begin(), vitamins.end(), [&]( const T & vitamin ) { + return has_vitamin( vitamin ); + } ); + } + /** * Checks whether item itself has given flag (doesn't check item type or gunmods). * Essentially get_flags().count(f). diff --git a/src/item_factory.cpp b/src/item_factory.cpp index 45bec0274cb1..7eeff5520d2d 100644 --- a/src/item_factory.cpp +++ b/src/item_factory.cpp @@ -2508,7 +2508,6 @@ void Item_factory::set_allergy_flags( itype &item_template ) static const std::pair all_pairs[] = { // First allergens: // An item is an allergen even if it has trace amounts of allergenic material - std::make_pair( material_id( "hflesh" ), flag_CANNIBALISM ), std::make_pair( material_id( "hflesh" ), flag_ALLERGEN_MEAT ), std::make_pair( material_id( "iflesh" ), flag_ALLERGEN_MEAT ), @@ -2545,6 +2544,7 @@ void Item_factory::set_allergy_flags( itype &item_template ) // Migration helper: turns human flesh into generic flesh // Don't call before making sure that the cannibalism flag is set +// Cannibalism is vitamin based now, so **probably** obsolete (if it wasn't already?) void hflesh_to_flesh( itype &item_template ) { auto &mats = item_template.materials; diff --git a/src/itype.cpp b/src/itype.cpp index 5dab8346143e..9c7adc90522f 100644 --- a/src/itype.cpp +++ b/src/itype.cpp @@ -27,6 +27,8 @@ std::string enum_to_string( condition_type data ) switch( data ) { case condition_type::FLAG: return "FLAG"; + case condition_type::VITAMIN: + return "VITAMIN"; case condition_type::COMPONENT_ID: return "COMPONENT_ID"; case condition_type::num_condition_types: diff --git a/src/itype.h b/src/itype.h index 9e9877a869b2..5bd78050e944 100644 --- a/src/itype.h +++ b/src/itype.h @@ -798,8 +798,9 @@ struct islot_artifact { int dream_freq_met; }; -enum condition_type { +enum class condition_type { FLAG, + VITAMIN, COMPONENT_ID, num_condition_types }; diff --git a/tests/char_edible_rating_test.cpp b/tests/char_edible_rating_test.cpp index a277b91bdb88..513bd1b35889 100644 --- a/tests/char_edible_rating_test.cpp +++ b/tests/char_edible_rating_test.cpp @@ -2,6 +2,7 @@ #include #include +#include #include "avatar.h" #include "calendar.h" @@ -12,6 +13,16 @@ #include "state_helpers.h" #include "type_id.h" +static const vitamin_id vitamin_egg_allergen( "egg_allergen" ); +static const vitamin_id vitamin_fruit_allergen( "fruit_allergen" ); +static const vitamin_id vitamin_human_flesh_vitamin( "human_flesh_vitamin" ); +static const vitamin_id vitamin_junk_allergen( "junk_allergen" ); +static const vitamin_id vitamin_meat_allergen( "meat_allergen" ); +static const vitamin_id vitamin_milk_allergen( "milk_allergen" ); +static const vitamin_id vitamin_nut_allergen( "nut_allergen" ); +static const vitamin_id vitamin_veggy_allergen( "veggy_allergen" ); +static const vitamin_id vitamin_wheat_allergen( "wheat_allergen" ); + // Character "edible rating" tests, covering the `can_eat` and `will_eat` functions static void expect_can_eat( avatar &dummy, item &food ) @@ -168,14 +179,14 @@ TEST_CASE( "what herbivores can eat", "[can_eat][edible_rating][herbivore]" ) THEN( "they cannot eat meat" ) { item &meat = *item::spawn_temporary( "meat_cooked" ); - REQUIRE( meat.has_flag( flag_ALLERGEN_MEAT ) ); + REQUIRE( meat.has_vitamin( vitamin_meat_allergen ) ); expect_cannot_eat( dummy, meat, expect_reason, edible_rating::inedible_mutation ); } THEN( "they cannot eat eggs" ) { item &eggs = *item::spawn_temporary( "scrambled_eggs" ); - REQUIRE( eggs.has_flag( flag_ALLERGEN_EGG ) ); + REQUIRE( eggs.has_vitamin( vitamin_egg_allergen ) ); expect_cannot_eat( dummy, eggs, expect_reason, edible_rating::inedible_mutation ); } @@ -195,35 +206,35 @@ TEST_CASE( "what carnivores can eat", "[can_eat][edible_rating][carnivore]" ) THEN( "they cannot eat veggies" ) { item &veggy = *item::spawn_temporary( "veggy" ); - REQUIRE( veggy.has_flag( flag_ALLERGEN_VEGGY ) ); + REQUIRE( veggy.has_vitamin( vitamin_veggy_allergen ) ); expect_cannot_eat( dummy, veggy, expect_reason, edible_rating::inedible_mutation ); } THEN( "they cannot eat fruit" ) { item &apple = *item::spawn_temporary( "apple" ); - REQUIRE( apple.has_flag( flag_ALLERGEN_FRUIT ) ); + REQUIRE( apple.has_vitamin( vitamin_fruit_allergen ) ); expect_cannot_eat( dummy, apple, expect_reason, edible_rating::inedible_mutation ); } THEN( "they cannot eat wheat" ) { item &bread = *item::spawn_temporary( "sourdough_bread" ); - REQUIRE( bread.has_flag( flag_ALLERGEN_WHEAT ) ); + REQUIRE( bread.has_vitamin( vitamin_wheat_allergen ) ); expect_cannot_eat( dummy, bread, expect_reason, edible_rating::inedible_mutation ); } THEN( "they cannot eat nuts" ) { item &nuts = *item::spawn_temporary( "pine_nuts" ); - REQUIRE( nuts.has_flag( flag_ALLERGEN_NUT ) ); + REQUIRE( nuts.has_vitamin( vitamin_nut_allergen ) ); expect_cannot_eat( dummy, nuts, expect_reason, edible_rating::inedible_mutation ); } THEN( "they can eat junk food, but are allergic to it" ) { item &chocolate = *item::spawn_temporary( "chocolate" ); - REQUIRE( chocolate.has_flag( flag_ALLERGEN_JUNK ) ); + REQUIRE( chocolate.has_vitamin( vitamin_junk_allergen ) ); expect_can_eat( dummy, chocolate ); expect_will_eat( dummy, chocolate, "Your stomach won't be happy (allergy).", @@ -335,7 +346,7 @@ TEST_CASE( "can eat with allergies", "[will_eat][edible_rating][allergy]" ) clear_all_state(); avatar dummy = prepare_avatar(); item &fruit = *item::spawn_temporary( "apple" ); - REQUIRE( fruit.has_flag( flag_ALLERGEN_FRUIT ) ); + REQUIRE( fruit.has_vitamin( vitamin_fruit_allergen ) ); GIVEN( "character hates fruit" ) { dummy.toggle_trait( trait_id( "ANTIFRUIT" ) ); @@ -406,7 +417,7 @@ TEST_CASE( "who will eat human flesh", "[will_eat][edible_rating][cannibal]" ) GIVEN( "some human flesh" ) { item &flesh = *item::spawn_temporary( "human_flesh" ); - REQUIRE( flesh.has_flag( flag_CANNIBALISM ) ); + REQUIRE( flesh.has_vitamin( vitamin_human_flesh_vitamin ) ); WHEN( "character is not a cannibal" ) { REQUIRE_FALSE( dummy.has_trait( trait_id( "CANNIBAL" ) ) ); diff --git a/tests/modify_morale_test.cpp b/tests/modify_morale_test.cpp index 53fc1044fc5a..d860fe2f37a8 100644 --- a/tests/modify_morale_test.cpp +++ b/tests/modify_morale_test.cpp @@ -39,6 +39,8 @@ static const trait_id trait_URSINE_EYE( "URSINE_EYE" ); static const trait_id trait_URSINE_FUR( "URSINE_FUR" ); static const trait_id trait_VEGETARIAN( "VEGETARIAN" ); +static const vitamin_id vitamin_human_flesh_vitamin( "human_flesh_vitamin" ); + // Test cases for `Character::modify_morale` defined in `src/consumption.cpp` TEST_CASE( "food enjoyability", "[food][modify_morale][fun]" ) @@ -119,7 +121,7 @@ TEST_CASE( "cannibalism", "[food][modify_morale][cannibal]" ) item::default_charges_tag{} ); item &human = *det; dummy.i_add( std::move( det ) ); - REQUIRE( human.has_flag( flag_CANNIBALISM ) ); + REQUIRE( human.has_vitamin( vitamin_human_flesh_vitamin ) ); GIVEN( "character is not a cannibal or sapiovore" ) { REQUIRE_FALSE( dummy.has_trait( trait_CANNIBAL ) );