From a93ecd5d642254e742d2a074d9c97f7492c1da98 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sat, 24 Aug 2024 11:56:57 +0200 Subject: [PATCH 1/2] Made human products get human 'vitamin' and vitamin inheritance --- data/json/items/comestibles/carnivore.json | 61 +++++++++++++--------- data/json/items/resources/bone.json | 2 +- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 1f6b39acb2afb..7300ac62bebe3 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -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", @@ -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", @@ -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", @@ -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" ] } }, { @@ -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" ] }, { @@ -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", @@ -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", @@ -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", @@ -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", @@ -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" ] } }, { @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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 ] ] }, { "id": "mutant_brain_cooked", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -1925,6 +1933,7 @@ "looks_like": "blood", "symbol": "~", "material": "blood", + "extend": { "flags": [ "STRICT_HUMANITARIANISM" ] }, "charges": 1, "phase": "liquid", "delete": { "flags": [ "SMOKABLE" ] } diff --git a/data/json/items/resources/bone.json b/data/json/items/resources/bone.json index d002f41b29c9b..9e3c1051b0a59 100644 --- a/data/json/items/resources/bone.json +++ b/data/json/items/resources/bone.json @@ -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", From 398688af9af92289a699d8bd72022738b87b4c01 Mon Sep 17 00:00:00 2001 From: PatrikLundell Date: Sat, 24 Aug 2024 13:33:56 +0200 Subject: [PATCH 2/2] Update data/json/items/comestibles/carnivore.json Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> --- data/json/items/comestibles/carnivore.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 7300ac62bebe3..5d02f9309ee79 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -1220,7 +1220,7 @@ "proportional": { "price_postapoc": 0.5 }, "fun": -20, "extend": { "flags": [ "BAD_TASTE" ] }, - "vitamins": [ [ "vitC", 3 ], [ "calcium", 0 ], [ "iron", 10 ], [ "mutant_toxin", 50 ], [ "meat_allergen", 1 ] ] + "vitamins": [ [ "vitC", 3 ], [ "iron", 10 ], [ "mutant_toxin", 50 ], [ "meat_allergen", 1 ] ] }, { "id": "mutant_brain_cooked",