Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove vitamin A and B for good #55466

Merged
merged 9 commits into from
Feb 21, 2022
Merged

Remove vitamin A and B for good #55466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4265ea5
Remove mentions of vitA and vitB
Feb 17, 2022
98f204f
Obsolete vitA and vitB
Feb 17, 2022
38c2dfd
Obsolete vitB injection
Feb 17, 2022
bfabe67
Remove vitA and vitB from mods
Feb 17, 2022
2c00407
remove vitA and vitB from code
Feb 17, 2022
d346eb4
remove vitA and vitB from tests
Feb 17, 2022
379d4ad
remove legacy handling of deficiencies
Feb 17, 2022
23dabb4
fixes
Feb 17, 2022
5981319
Fix item info test
Feb 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
[ "antiparasitic", 100 ],
[ "diazepam", 100 ],
[ "calcium_tablet", 100 ],
[ "inj_vitb", 100 ],
[ "inj_iron", 100 ],
[ "prozac", 100 ],
[ "thorazine", 100 ],
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/comestibles/alcohol.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@
"flags": [ "EATEN_COLD" ],
"freezing_point": -34,
"fun": 20,
"vitamins": [ [ "vitA", 2 ], [ "vitC", 118 ], [ "calcium", 2 ], [ "iron", 1 ] ]
"vitamins": [ [ "vitC", 118 ], [ "calcium", 2 ], [ "iron", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1498,7 +1498,7 @@
"charges": 2,
"flags": [ "EATEN_COLD", "EATEN_HOT", "FREEZERBURN" ],
"fun": 20,
"vitamins": [ [ "vitA", 5 ], [ "vitC", 3 ], [ "calcium", 12 ], [ "iron", 2 ] ],
"vitamins": [ [ "vitC", 3 ], [ "calcium", 12 ], [ "iron", 2 ] ],
"freezing_point": -11
},
{
Expand Down Expand Up @@ -1556,7 +1556,7 @@
"flags": [ "EATEN_COLD" ],
"freezing_point": -34,
"fun": 25,
"vitamins": [ [ "vitA", 2 ], [ "vitC", 23 ], [ "calcium", 1 ], [ "iron", 2 ] ]
"vitamins": [ [ "vitC", 23 ], [ "calcium", 1 ], [ "iron", 2 ] ]
},
{
"type": "COMESTIBLE",
Expand Down
30 changes: 10 additions & 20 deletions data/json/items/comestibles/bread.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
"charges": 14,
"flags": [ "EATEN_HOT" ],
"fun": 3,
"vitamins": [ [ "vitA", 1 ], [ "vitB", 3 ], [ "calcium", 2 ], [ "iron", 14 ] ]
"vitamins": [ [ "calcium", 2 ], [ "iron", 14 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -245,15 +245,15 @@
"name": { "str_sp": "buttered toast" },
"copy-from": "toast",
"description": "Toast with butter spread on top to make it taste better.",
"relative": { "calories": 101, "fun": 4, "vitamins": [ [ "vitA", 7 ], [ "vitB", 3 ] ] }
"relative": { "calories": 101, "fun": 4 }
},
{
"type": "COMESTIBLE",
"id": "buttered_toast_wheat_free",
"name": { "str_sp": "wheat-free buttered toast" },
"copy-from": "toast_wheat_free",
"description": "Wheat-free toast with butter spread on top to make it taste better.",
"relative": { "calories": 101, "fun": 4, "vitamins": [ [ "vitA", 7 ], [ "vitB", 3 ] ] }
"relative": { "calories": 101, "fun": 4 }
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -295,41 +295,31 @@
"name": { "str_sp": "toad in a hole" },
"copy-from": "toast",
"description": "A cooked egg served inside a piece of toast.",
"relative": {
"calories": 80,
"fun": 4,
"flags": [ "FREEZERBURN" ],
"vitamins": [ [ "iron", 4 ], [ "vitB", 21 ], [ "vitA", 9 ], [ "calcium", 3 ] ]
}
"relative": { "calories": 80, "fun": 4, "flags": [ "FREEZERBURN" ], "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] }
},
{
"type": "COMESTIBLE",
"id": "toad_in_a_hole_wheat_free",
"name": { "str_sp": "wheat-free toad in a hole" },
"copy-from": "toast_wheat_free",
"description": "A cooked egg served inside a piece of wheat-free toast.",
"relative": {
"calories": 80,
"fun": 4,
"flags": [ "FREEZERBURN" ],
"vitamins": [ [ "iron", 4 ], [ "vitB", 21 ], [ "vitA", 9 ], [ "calcium", 3 ] ]
}
"relative": { "calories": 80, "fun": 4, "flags": [ "FREEZERBURN" ], "vitamins": [ [ "iron", 4 ], [ "calcium", 3 ] ] }
},
{
"type": "COMESTIBLE",
"id": "PBJ_Toast",
"name": { "str_sp": "PBJ Toast" },
"copy-from": "toast_wheat_free",
"description": "A slice of toast with peanut butter and jelly on top of it with added butter for flavor.",
"relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitB", 3 ], [ "vitA", 7 ], [ "vitC", 2 ] ] }
"relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] }
},
{
"type": "COMESTIBLE",
"id": "PBJ_Toast_wheat_free",
"name": { "str_sp": "wheat-free PBJ Toast" },
"copy-from": "toast_wheat_free",
"description": "A slice of wheat-free toast with peanut butter and jelly on top of it with added butter for flavor.",
"relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitB", 3 ], [ "vitA", 7 ], [ "vitC", 2 ] ] }
"relative": { "calories": 326, "fun": 7, "vitamins": [ [ "iron", 6 ], [ "vitC", 2 ] ] }
},
{
"type": "COMESTIBLE",
Expand All @@ -352,7 +342,7 @@
"charges": 6,
"flags": [ "EATEN_HOT" ],
"fun": 2,
"vitamins": [ [ "vitA", 2 ], [ "calcium", 8 ], [ "iron", 6 ] ]
"vitamins": [ [ "calcium", 8 ], [ "iron", 6 ] ]
},
{
"type": "COMESTIBLE",
Expand All @@ -373,7 +363,7 @@
"charges": 6,
"flags": [ "EATEN_HOT" ],
"fun": 2,
"vitamins": [ [ "vitA", 1 ], [ "calcium", 4 ], [ "iron", 7 ] ]
"vitamins": [ [ "calcium", 4 ], [ "iron", 7 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -439,7 +429,7 @@
"charges": 10,
"flags": [ "EATEN_HOT", "EDIBLE_FROZEN" ],
"fun": 3,
"vitamins": [ [ "vitA", 1 ], [ "calcium", 11 ], [ "iron", 9 ] ]
"vitamins": [ [ "calcium", 11 ], [ "iron", 9 ] ]
},
{
"type": "COMESTIBLE",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/brewing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@
"material": [ "veggy" ],
"volume": "250 ml",
"flags": [ "EDIBLE_FROZEN", "RAW" ],
"vitamins": [ [ "vitA", 33 ], [ "vitC", 23 ], [ "calcium", 11 ], [ "iron", 10 ] ],
"vitamins": [ [ "vitC", 23 ], [ "calcium", 11 ], [ "iron", 10 ] ],
"fun": -4
}
]
36 changes: 18 additions & 18 deletions data/json/items/comestibles/carnivore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"spoils_in": "12 hours",
"flags": [ "SMOKABLE", "RAW" ],
"smoking_result": "fish_smoked",
"vitamins": [ [ "vitA", 2 ], [ "vitC", 2 ], [ "calcium", 6 ], [ "iron", 14 ], [ "vitB", 154 ] ],
"vitamins": [ [ "vitC", 2 ], [ "calcium", 6 ], [ "iron", 14 ] ],
"calories": 260
},
{
Expand Down Expand Up @@ -119,7 +119,7 @@
"healthy": -1,
"fun": -10,
"cooks_like": "meat_cooked",
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "vitB", 80 ] ],
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ] ],
"flags": [ "SMOKABLE", "RAW", "PREDATOR_FUN" ],
"smoking_result": "meat_smoked"
},
Expand Down Expand Up @@ -153,7 +153,7 @@
"calories": 1300,
"healthy": -1,
"fun": -10,
"vitamins": [ [ "vitC", 0 ], [ "calcium", 0 ], [ "iron", 0 ], [ "vitB", 0 ] ],
"vitamins": [ [ "vitC", 0 ], [ "calcium", 0 ], [ "iron", 0 ] ],
"flags": [ "SMOKABLE", "RAW", "PREDATOR_FUN" ],
"smoking_result": "meat_smoked"
},
Expand All @@ -170,7 +170,7 @@
"price_postapoc": 300,
"spoils_in": "14 days",
"healthy": -5,
"vitamins": [ [ "vitA", 4 ], [ "vitC", 0 ], [ "calcium", 3 ], [ "iron", 22 ], [ "vitB", 136 ] ],
"vitamins": [ [ "vitC", 0 ], [ "calcium", 3 ], [ "iron", 22 ] ],
"flags": [ "SMOKABLE", "RAW" ],
"smoking_result": "bacon_uncut"
},
Expand All @@ -188,7 +188,7 @@
"spoils_in": "24 days",
"healthy": -1,
"fun": 5,
"vitamins": [ [ "vitA", 4 ], [ "vitC", 0 ], [ "calcium", 3 ], [ "iron", 22 ], [ "vitB", 136 ] ],
"vitamins": [ [ "vitC", 0 ], [ "calcium", 3 ], [ "iron", 22 ] ],
"flags": [ "EATEN_HOT", "SMOKED" ]
},
{
Expand All @@ -205,7 +205,7 @@
"spoils_in": "14 days",
"healthy": -5,
"fun": -15,
"vitamins": [ [ "vitA", 0 ], [ "vitC", 0 ], [ "calcium", 0 ], [ "iron", 0 ], [ "vitB", 0 ] ],
"vitamins": [ [ "vitC", 0 ], [ "calcium", 0 ], [ "iron", 0 ] ],
"flags": [ ],
"use_action": {
"target": "raw_cured_fatty_meat",
Expand All @@ -226,7 +226,7 @@
"cooks_like": "meat_scrap_cooked",
"proportional": { "weight": 0.1, "volume": 0.1, "price": 0.1, "calories": 0.1 },
"delete": { "flags": [ "SMOKABLE" ] },
"vitamins": [ [ "calcium", 0 ], [ "iron", 1 ], [ "vitB", 8 ] ]
"vitamins": [ [ "calcium", 0 ], [ "iron", 1 ] ]
},
{
"id": "mutant_meat",
Expand All @@ -238,7 +238,7 @@
"looks_like": "meat",
"cooks_like": "mutant_meat_cooked",
"proportional": { "price": 0.2, "calories": 0.5 },
"vitamins": [ [ "vitC", 2 ], [ "calcium", 1 ], [ "iron", 6 ], [ "vitB", 40 ], [ "mutant_toxin", 25 ] ],
"vitamins": [ [ "vitC", 2 ], [ "calcium", 1 ], [ "iron", 6 ], [ "mutant_toxin", 25 ] ],
"flags": [ "SMOKABLE", "BAD_TASTE", "RAW", "PREDATOR_FUN" ]
},
{
Expand Down Expand Up @@ -380,7 +380,7 @@
"price_postapoc": 100,
"parasites": 0,
"calories": 402,
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "vitB", 80 ] ],
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ] ],
"flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
},
{
Expand Down Expand Up @@ -449,7 +449,7 @@
"proportional": { "parasites": 2.0 },
"price_postapoc": 25,
"delete": { "flags": [ "SMOKABLE" ] },
"relative": { "vitamins": [ [ "vitA", 5 ], [ "iron", 4 ] ], "fun": -5 }
"relative": { "vitamins": [ [ "iron", 4 ] ], "fun": -5 }
},
{
"id": "offal_cooked",
Expand Down Expand Up @@ -567,7 +567,7 @@
"quench": -5,
"fun": 4,
"calories": 348,
"vitamins": [ [ "vitA", 0 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 26 ], [ "vitB", 35 ] ],
"vitamins": [ [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 26 ] ],
"delete": { "flags": [ "RAW" ] }
},
{
Expand Down Expand Up @@ -636,7 +636,7 @@
"quench": 2,
"fun": -10,
"calories": 50,
"vitamins": [ [ "vitA", 0 ], [ "vitC", 9 ], [ "calcium", 0 ], [ "iron", 14 ], [ "vitB", 22 ] ],
"vitamins": [ [ "vitC", 9 ], [ "calcium", 0 ], [ "iron", 14 ] ],
"extend": { "flags": [ "PREDATOR_FUN" ] }
},
{
Expand Down Expand Up @@ -693,7 +693,7 @@
"price_postapoc": 25,
"quench": -4,
"calories": 92,
"vitamins": [ [ "vitA", 635 ], [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 28 ], [ "vitB", 1632 ] ]
"vitamins": [ [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 28 ] ]
},
{
"id": "liver_cooked",
Expand Down Expand Up @@ -739,7 +739,7 @@
"quench": 10,
"parasites": 15,
"calories": 78,
"vitamins": [ [ "vitA", 0 ], [ "vitC", 3 ], [ "calcium", 0 ], [ "iron", 10 ], [ "vitB", 233 ] ]
"vitamins": [ [ "vitC", 3 ], [ "calcium", 0 ], [ "iron", 10 ] ]
},
{
"id": "brain_cooked",
Expand Down Expand Up @@ -785,7 +785,7 @@
"color": "brown",
"price_postapoc": 25,
"calories": 54,
"vitamins": [ [ "vitA", 0 ], [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 25 ], [ "vitB", 576 ] ]
"vitamins": [ [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 25 ] ]
},
{
"id": "kidney_cooked",
Expand Down Expand Up @@ -833,7 +833,7 @@
"price_postapoc": 25,
"quench": 0,
"calories": 133,
"vitamins": [ [ "vitA", 0 ], [ "vitC", 11 ], [ "calcium", 0 ], [ "iron", 5 ], [ "vitB", 66 ] ]
"vitamins": [ [ "vitC", 11 ], [ "calcium", 0 ], [ "iron", 5 ] ]
},
{
"id": "sweetbread_cooked",
Expand Down Expand Up @@ -1300,7 +1300,7 @@
"description": "The fleshy fronds harvested from an alien plant. Eating these membranous leaves and gut-like stems is likely a terrible idea, and yet they have a paradoxically pleasant and inviting sweet smell. Might be non-vegan.",
"fun": 15,
"stim": 3,
"vitamins": [ [ "vitA", 6 ], [ "vitC", 2 ], [ "calcium", 0 ], [ "iron", 8 ], [ "vitB", 6 ], [ "mutant_toxin", 8 ] ]
"vitamins": [ [ "vitC", 2 ], [ "calcium", 0 ], [ "iron", 8 ], [ "mutant_toxin", 8 ] ]
},
{
"id": "leech_flower",
Expand Down Expand Up @@ -1336,7 +1336,7 @@
"name": { "str": "leech bark", "str_pl": "scraps of leech bark" },
"description": "Dry and tough bark matter harvested from an alien plant. It is slightly translucent, and if placed against the light you can distinguish glistening blue veins running through it.",
"price_postapoc": 10,
"vitamins": [ [ "vitA", 6 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 8 ], [ "vitB", 6 ], [ "mutant_toxin", 12 ] ]
"vitamins": [ [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 8 ], [ "mutant_toxin", 12 ] ]
},
{
"id": "demihuman_stomach",
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/comestibles/cereal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"material": [ "wheat" ],
"flags": [ "EDIBLE_FROZEN", "USE_EAT_VERB" ],
"looks_like": "cereal",
"vitamins": [ [ "vitA", 10 ], [ "vitC", 7 ], [ "calcium", 7 ], [ "iron", 32 ] ],
"vitamins": [ [ "vitC", 7 ], [ "calcium", 7 ], [ "iron", 32 ] ],
"fun": 8
},
{
Expand All @@ -34,7 +34,7 @@
"charges": 6,
"material": [ "foodplace_foodstuff" ],
"looks_like": "cereal",
"vitamins": [ [ "vitA", 5 ], [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 16 ] ],
"vitamins": [ [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 16 ] ],
"fun": 11,
"addiction_potential": 5,
"addiction_type": "caffeine",
Expand All @@ -58,7 +58,7 @@
"description": "This is Foodplace brand \"Carpenter Crunch\" cereal with the iconic \"Breakfast Beaver\" mascot on the box. It tastes kind of like nails.",
"material": [ "foodplace_foodstuff" ],
"charges": 6,
"vitamins": [ [ "vitA", 2 ], [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 50 ] ],
"vitamins": [ [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 50 ] ],
"fun": -1,
"spoils_in": "540 days",
"copy-from": "cereal_tpl"
Expand Down Expand Up @@ -124,7 +124,7 @@
"charges": 4,
"material": [ "junk" ],
"volume": "250 ml",
"vitamins": [ [ "vitA", 21 ], [ "vitC", 17 ], [ "calcium", 13 ], [ "iron", 48 ] ],
"vitamins": [ [ "vitC", 17 ], [ "calcium", 13 ], [ "iron", 48 ] ],
"fun": 10
},
{
Expand All @@ -138,7 +138,7 @@
"price_postapoc": 600,
"charges": 4,
"flags": [ "EDIBLE_FROZEN" ],
"vitamins": [ [ "vitC", 2 ], [ "vitA", 2 ], [ "calcium", 2 ], [ "iron", 9 ] ],
"vitamins": [ [ "vitC", 2 ], [ "calcium", 2 ], [ "iron", 9 ] ],
"copy-from": "cereal_tpl"
},
{
Expand Down
Loading