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

Made human products get human 'vitamin' and vitamin inheritance #75918

Merged
merged 2 commits into from
Aug 25, 2024
Merged

Made human products get human 'vitamin' and vitamin inheritance #75918

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a93ecd5
Made human products get human 'vitamin' and vitamin inheritance
PatrikLundell Aug 24, 2024
398688a
Update data/json/items/comestibles/carnivore.json
PatrikLundell Aug 24, 2024
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
61 changes: 35 additions & 26 deletions data/json/items/comestibles/carnivore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
"description": "The stomach of a human. It is surprisingly durable.",
"material": [ "hflesh" ],
"delete": { "flags": [ "PREDATOR_FUN" ] },
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"id": "hstomach_large",
Expand All @@ -211,7 +211,7 @@
"name": { "str": "chunk of human fat", "str_pl": "chunks of human fat" },
"description": "A chunk of raw fat, harvested from a human body.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand All @@ -222,7 +222,7 @@
"price": "5 USD",
"//": "*May* have been commercially traded.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand All @@ -239,7 +239,7 @@
"name": { "str_sp": "human flesh" },
"description": "A chunk of raw meat, butchered from a human body.",
"material": [ "hflesh" ],
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "human_flesh_vitamin", 100 ], [ "meat_allergen", 1 ] ],
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "human_flesh_vitamin", 1 ], [ "meat_allergen", 1 ] ],
"delete": { "flags": [ "PREDATOR_FUN" ] }
},
{
Expand Down Expand Up @@ -391,7 +391,7 @@
"looks_like": "meat_scrap",
"name": { "str": "scrap of human flesh", "str_pl": "scraps of human flesh" },
"description": "A tiny scrap of raw human flesh.",
"vitamins": [ [ "calcium", 0 ], [ "iron", 1 ], [ "human_flesh_vitamin", 10 ], [ "meat_allergen", 1 ] ],
"vitamins": [ [ "calcium", 0 ], [ "iron", 1 ], [ "human_flesh_vitamin", 1 ], [ "meat_allergen", 1 ] ],
"material": [ "hflesh" ]
},
{
Expand Down Expand Up @@ -453,7 +453,14 @@
"name": { "str_sp": "mutant humanoid meat" },
"description": "Raw meat butchered from the body of a heavily mutated creature that was unsettlingly humanoid in appearance. It has odd bits of fur and other tissue lodged in it that clearly don't belong. You'd have to be crazy or starving to eat this.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [
[ "vitC", 2 ],
[ "calcium", 1 ],
[ "iron", 6 ],
[ "mutant_toxin", 25 ],
[ "meat_allergen", 1 ],
[ "human_flesh_vitamin", 1 ]
]
},
{
"id": "mutant_human_blood",
Expand All @@ -470,7 +477,8 @@
"material": "hblood",
"charges": 1,
"phase": "liquid",
"delete": { "flags": [ "SMOKABLE" ] }
"delete": { "flags": [ "SMOKABLE" ] },
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"id": "mutant_human_cooked",
Expand Down Expand Up @@ -988,7 +996,7 @@
"name": { "str": "piece of raw human lung", "str_pl": "pieces of raw human lung" },
"description": "A portion of lung from a human. It's spongy and pink, and spoils very quickly. It appears to have been extracted too crudely to ever be useful as a transplant.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "vitC", 9 ], [ "calcium", 0 ], [ "iron", 14 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"id": "demihuman_lung",
Expand Down Expand Up @@ -1020,7 +1028,7 @@
"fun": -15,
"proportional": { "price_postapoc": 0.5 },
"extend": { "flags": [ "BAD_TASTE" ] },
"vitamins": [ [ "mutant_toxin", 10 ], [ "meat_allergen", 1 ] ]
"vitamins": [ [ "vitC", 9 ], [ "calcium", 0 ], [ "iron", 14 ], [ "mutant_toxin", 10 ], [ "meat_allergen", 1 ] ]
},
{
"id": "mutant_lung_cooked",
Expand All @@ -1039,7 +1047,7 @@
"description": "You're pretty sure this is lung tissue.",
"looks_like": "lung",
"proportional": { "price_postapoc": 0.1, "calories": 0.65 },
"vitamins": [ [ "mutant_toxin", 25 ], [ "meat_allergen", 1 ] ],
"vitamins": [ [ "vitC", 9 ], [ "calcium", 0 ], [ "iron", 14 ], [ "mutant_toxin", 25 ], [ "meat_allergen", 1 ] ],
"extend": { "flags": [ "BAD_TASTE" ] }
},
{
Expand All @@ -1062,7 +1070,7 @@
"name": { "str": "piece of raw human liver", "str_pl": "pieces of raw human liver" },
"description": "A piece of liver from a human, which appears to have been extracted too crudely to ever be useful as a transplant.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 28 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"id": "demihuman_liver",
Expand Down Expand Up @@ -1094,7 +1102,7 @@
"fun": -15,
"proportional": { "price_postapoc": 0.5 },
"extend": { "flags": [ "BAD_TASTE" ] },
"vitamins": [ [ "mutant_toxin", 40 ], [ "meat_allergen", 1 ] ]
"vitamins": [ [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 28 ], [ "mutant_toxin", 40 ], [ "meat_allergen", 1 ] ]
},
{
"id": "mutant_liver_cooked",
Expand Down Expand Up @@ -1127,7 +1135,7 @@
"name": { "str": "portion of raw human bone marrow", "str_pl": "portions of raw human bone marrow" },
"description": "Soft, spongy marrow tissue from a human bone.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "iron", 17 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"id": "demihuman_marrow",
Expand All @@ -1154,7 +1162,7 @@
"name": { "str": "portion of raw mutant human bone marrow", "str_pl": "portions of raw mutant human bone marrow" },
"description": "Soft, spongy and oddly-colored marrow tissue from the bone of a heavily mutated creature that was unsettlingly humanoid in appearance.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "iron", 17 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"id": "brain",
Expand All @@ -1178,7 +1186,7 @@
"name": { "str": "piece of raw human brain", "str_pl": "pieces of raw human brain" },
"description": "A chunk of brain from a human. Eating this may cause kuru, but you probably won't live long enough to care about that anyway.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "vitC", 3 ], [ "calcium", 0 ], [ "iron", 10 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"id": "demihuman_brain",
Expand Down Expand Up @@ -1212,7 +1220,7 @@
"proportional": { "price_postapoc": 0.5 },
"fun": -20,
"extend": { "flags": [ "BAD_TASTE" ] },
"vitamins": [ [ "mutant_toxin", 50 ], [ "meat_allergen", 1 ] ]
"vitamins": [ [ "vitC", 3 ], [ "calcium", 0 ], [ "iron", 10 ], [ "mutant_toxin", 50 ], [ "meat_allergen", 1 ] ]
PatrikLundell marked this conversation as resolved.
Show resolved Hide resolved
},
{
"id": "mutant_brain_cooked",
Expand Down Expand Up @@ -1243,7 +1251,7 @@
"name": { "str": "piece of raw human kidney", "str_pl": "pieces of raw human kidney" },
"description": "A chunk of kidney from a human, which appears to have been extracted too crudely to ever be useful as a transplant.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 25 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"id": "demihuman_kidney",
Expand Down Expand Up @@ -1276,7 +1284,7 @@
"snippet_category": "mutant_kidney_desc",
"proportional": { "price_postapoc": 0.5 },
"extend": { "flags": [ "BAD_TASTE" ] },
"vitamins": [ [ "mutant_toxin", 25 ], [ "meat_allergen", 1 ] ]
"vitamins": [ [ "vitC", 0 ], [ "calcium", 1 ], [ "iron", 25 ], [ "mutant_toxin", 25 ], [ "meat_allergen", 1 ] ]
},
{
"id": "mutant_kidney_cooked",
Expand Down Expand Up @@ -1308,7 +1316,7 @@
"name": { "str": "piece of raw human sweetbread", "str_pl": "pieces of raw human sweetbread" },
"description": "A piece of the thymus or pancreas of a human, which appears to have been extracted too crudely to ever be useful as a transplant.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "vitC", 11 ], [ "calcium", 0 ], [ "iron", 5 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"id": "demihuman_sweetbread",
Expand Down Expand Up @@ -1349,7 +1357,7 @@
"charges": 1,
"phase": "liquid",
"delete": { "flags": [ "SMOKABLE" ] },
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "calcium", 2 ], [ "iron", 12 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1432,7 +1440,7 @@
"name": { "str": "chunk of mutant humanoid fat", "str_pl": "chunks of mutant humanoid fat" },
"description": "Raw fat butchered from a heavily-mutated humanoid.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand All @@ -1441,7 +1449,7 @@
"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" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1612,7 +1620,7 @@
"name": { "str": "boiled large human stomach" },
"description": "A boiled stomach from a large humanoid creature, nothing else. It looks all but appetizing.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1640,7 +1648,7 @@
"name": { "str": "boiled human stomach" },
"description": "A small boiled stomach from a human, nothing else. It looks all but appetizing.",
"material": [ "hflesh" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1695,7 +1703,7 @@
"name": { "str_sp": "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" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1745,7 +1753,7 @@
"name": { "str_sp": "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" ],
"vitamins": [ [ "meat_allergen", 1 ] ]
"vitamins": [ [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "COMESTIBLE",
Expand Down Expand Up @@ -1925,6 +1933,7 @@
"looks_like": "blood",
"symbol": "~",
"material": "blood",
"extend": { "flags": [ "STRICT_HUMANITARIANISM" ] },
"charges": 1,
"phase": "liquid",
"delete": { "flags": [ "SMOKABLE" ] }
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/resources/bone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"name": { "str": "human bone" },
"description": "A bone from a human being. Could be used to make some stuff, if you're feeling sufficiently ghoulish.",
"//": "No extend support for vitamins, we need to overwrite",
"vitamins": [ [ "calcium", "25588 mg" ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 100 ] ]
"vitamins": [ [ "calcium", "25588 mg" ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
},
{
"type": "GENERIC",
Expand Down
Loading