Merge pull request #72224 from RenechCDDA/cannibalism_as_a_vitamin

Cannibalism checks as a vitamin
CleverRaven · Mar 20, 2024 · e3cebbc · e3cebbc
2 parents 496d3ec + 539c7db
commit e3cebbc
Show file tree

Hide file tree

Showing 26 changed files with 133 additions and 95 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -1207,7 +1207,7 @@
   {
     "id": "CANNIBALISM",
     "type": "json_flag",
-    "craft_inherit": true
+    "//": "Obsoleted!"
   },
   {
     "id": "STRICT_HUMANITARIANISM",

diff --git a/data/json/itemgroups/SUS/lodge.json b/data/json/itemgroups/SUS/lodge.json
@@ -63,15 +63,10 @@
     "subtype": "collection",
     "entries": [
       { "item": "machete", "prob": 20 },
-      {
-        "item": "meat_salted",
-        "components": [ "human_flesh", "salt" ],
-        "custom-flags": [ "CANNIBALISM" ],
-        "prob": 30
-      },
+      { "item": "meat_salted", "components": [ "human_flesh", "salt" ], "prob": 30 },
       { "group": "preserved_food", "prob": 20 },
       { "group": "dry_goods", "prob": 30 },
-      { "item": "meat_smoked", "components": [ "human_flesh" ], "custom-flags": [ "CANNIBALISM" ], "prob": 60 },
+      { "item": "meat_smoked", "components": [ "human_flesh" ], "prob": 60 },
       { "group": "pantry", "prob": 10 }
     ]
   }

diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -236,6 +236,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 ] ],
     "delete": { "flags": [ "PREDATOR_FUN" ] }
   },
   {
@@ -387,6 +388,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 ] ],
     "material": [ "hflesh" ]
   },
   {
@@ -694,7 +696,7 @@
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
     "name": { "str_sp": "roasted bone marrow" },
-    "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "marvin marrow" } } ],
+    "conditional_names": [ { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "marvin marrow" } } ],
     "description": "Bone marrow, fully cooked to eliminate any parasites.  Tasty!",
     "symbol": "%",
     "color": "red",
@@ -713,7 +715,7 @@
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
     "name": { "str_sp": "roasted pepper bone marrow" },
-    "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "marvin marrow" } } ],
+    "conditional_names": [ { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "marvin marrow" } } ],
     "description": "Bone marrow, fully cooked to eliminate any parasites and properly seasoned with black pepper and salt.  Tasty!",
     "symbol": "%",
     "color": "red",
@@ -843,7 +845,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": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "talking animal jerky" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "mutant", "name": { "str_sp": "monster jerky" } }
     ],
@@ -903,7 +905,7 @@
     "type": "COMESTIBLE",
     "name": { "str_sp": "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": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "smoked Narnian" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "mutant", "name": { "str_sp": "%s, mutant" } }
     ],
@@ -1595,12 +1597,13 @@
     "flags": [ "TRADER_AVOID", "RAW" ]
   },
   {
-    "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" ]
+    "//": "No extend support for vitamins, we need to overwrite",
+    "vitamins": [ [ "calcium", 96 ], [ "human_flesh_vitamin", 100 ] ]
   },
   {
     "type": "GENERIC",
@@ -2008,7 +2011,7 @@
     "type": "COMESTIBLE",
     "name": { "str_sp": "fried meat" },
     "conditional_names": [
-      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "fried fool" } },
+      { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "fried fool" } },
       { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "fried familiar" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "mutant", "name": { "str_sp": "%s, mutant" } }
     ],

diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json
@@ -783,7 +783,7 @@
     "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": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "nibelung nachos" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "mutant", "name": { "str_sp": "nachos con chupacabra" } }
     ],
@@ -810,7 +810,7 @@
     "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": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "nibelung nachos with cheese" } },
       {
         "type": "COMPONENT_ID_SUBSTRING",