Incorporate human meat and fat into existing recipes, remove dedicated recipes

data/json/flags.json

@@ -729,5 +729,11 @@
     "context": [ "COMESTIBLE" ],
     "//": "Decreases calories as they appear in JSON def by 25%. This penalty is removed if the item is used in a recipe that requires heating.",
     "info": "This food is <info>raw</info>, and will be <good>more nutritious</good> if cooked."
+  },
+  {
+    "id": "CANNIBALISM",
+    "type": "json_flag",
+    "context": [ "COMESTIBLE" ],
+    "craft_inherit": true
   }
 ]

data/json/itemgroups/food_service.json

@@ -113,8 +113,7 @@
       { "item": "pickle", "prob": 5, "charges": 6, "container-item": "jar_glass_sealed" },
       [ "pickle", 5 ],
       [ "cheeseburger", 10 ],
-      [ "hamburger", 7 ],
-      [ "bobburger", 1 ],
+      [ "hamburger", 8 ],
       [ "sloppyjoe", 6 ],
       [ "fries", 10 ],
       [ "cheese_fries", 7 ],
@@ -191,7 +190,7 @@
   {
     "id": "pizza_display",
     "type": "item_group",
-    "items": [ [ "pizza_human", 2 ], [ "pizza_meat", 48 ], [ "pizza_veggy", 50 ] ]
+    "items": [ [ "pizza_meat", 50 ], [ "pizza_veggy", 50 ] ]
   },
   {
     "id": "pizza_kitchen",

data/json/itemgroups/item_groups.json

@@ -599,7 +599,6 @@
       { "item": "apple_canned", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "can_tomato", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
-      { "item": "human_pickled", "prob": 1, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "meat_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "veggy_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
       { "item": "fish_pickled", "prob": 4, "charges": 12, "container-item": "jar_3l_glass_sealed" },
@@ -1225,7 +1224,6 @@
       [ "fish_sandwich", 8 ],
       [ "tofu_rice", 4 ],
       [ "sloppyjoe", 8 ],
-      [ "bobburger", 1 ],
       [ "bacon", 25 ],
       [ "cheese", 30 ],
       [ "restaurantmap", 5 ],
@@ -2636,9 +2634,6 @@
       [ "knife_trench", 14 ],
       [ "switchblade", 15 ],
       [ "bondage_mask", 1 ],
-      [ "pie_human", 5 ],
-      [ "bobburger", 5 ],
-      [ "cheeseburgerhuman", 5 ],
       [ "survnote", 5 ],
       [ "thermos", 25 ]
     ]

data/json/itemgroups/locations.json

@@ -346,8 +346,7 @@
       [ "ketchup", 3 ],
       { "item": "pickle", "prob": 5, "charges": 6, "container-item": "jar_glass_sealed" },
       [ "cheeseburger", 10 ],
-      [ "hamburger", 7 ],
-      [ "bobburger", 1 ],
+      [ "hamburger", 8 ],
       [ "sloppyjoe", 6 ],
       [ "hotdogs_frozen", 6 ]
     ]

data/json/items/comestibles/carnivore.json

@@ -90,8 +90,7 @@
     "name": "human flesh",
     "name_plural": "human fleshes",
     "description": "Freshly butchered from a human body.",
-    "material": "hflesh",
-    "smoking_result": "human_smoked"
+    "material": "hflesh"
   },
   {
     "id": "human_cooked",
@@ -169,8 +168,7 @@
     "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 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",
-    "smoking_result": "human_smoked"
+    "material": "hflesh"
   },
   {
     "id": "mutant_human_cooked",
@@ -342,7 +340,10 @@
     "type": "COMESTIBLE",
     "name": "meat jerky",
     "name_plural": "meat jerky",
-    "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "monster jerky", "str_pl": "monster jerky" } } ],
+    "conditional_names": [
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "jerk jerky", "str_pl": "jerk jerky" } },
+      { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "monster jerky", "str_pl": "monster jerky" } }
+    ],
     "description": "Salty dried meat that lasts for a long time, but will make you thirsty.",
     "primary_material": "cured_meat",
     "weight": "85 g",
@@ -377,34 +378,15 @@
     "proportional": { "price": 2, "volume": 0.28, "weight": 0.28 },
     "delete": { "flags": [ "RAW" ] }
   },
-  {
-    "id": "jerky_human",
-    "copy-from": "human_flesh",
-    "type": "COMESTIBLE",
-    "name": "jerk jerky",
-    "name_plural": "jerk jerky",
-    "description": "Salty dried human flesh that lasts for a long time, but will make you thirsty.",
-    "primary_material": "cured_meat",
-    "color": "brown",
-    "spoils_in": "24 days",
-    "healthy": 0,
-    "volume": "250 ml",
-    "charges": 2,
-    "parasites": 0,
-    "quench": -5,
-    "fun": 4,
-    "calories": 348,
-    "weight": "85 g",
-    "vitamins": [ [ "vitA", 0 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 1 ], [ "vitB", 8 ] ],
-    "proportional": { "price": 0.44 },
-    "delete": { "flags": [ "RAW" ] }
-  },
   {
     "id": "meat_smoked",
     "copy-from": "meat_cooked",
     "type": "COMESTIBLE",
     "name": "smoked meat",
-    "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } } ],
+    "conditional_names": [
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "smoked sucker", "str_pl": "smoked sucker" } },
+      { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } }
+    ],
     "description": "Tasty meat that has been heavily smoked for preservation.  It could be further smoked to dehydrate it completely.",
     "color": "brown",
     "spoils_in": "24 days",
@@ -426,19 +408,6 @@
     "flags": [ "EATEN_HOT", "SMOKED", "SMOKABLE" ],
     "smoking_result": "dry_fish"
   },
-  {
-    "id": "human_smoked",
-    "copy-from": "human_cooked",
-    "type": "COMESTIBLE",
-    "name": "smoked sucker",
-    "description": "A heavily smoked portion of human flesh.  Lasts for a long time and tastes pretty good, if you like that sort of thing.",
-    "color": "brown",
-    "spoils_in": "24 days",
-    "quench": -1,
-    "fun": 5,
-    "flags": [ "EATEN_HOT", "SMOKED", "SMOKABLE" ],
-    "smoking_result": "dry_hflesh"
-  },
   {
     "id": "lung",
     "type": "COMESTIBLE",
@@ -754,7 +723,7 @@
     "copy-from": "bone",
     "name": "human bone",
     "description": "A bone from a human being.  Could be used to make some stuff, if you're feeling sufficiently ghoulish.",
-    "//": "Not for use in normal food recipes."
+    "flags": [ "CANNIBALISM" ]
   },
   {
     "type": "COMESTIBLE",

data/json/items/comestibles/junkfood.json

@@ -732,6 +732,7 @@
     "name": "meat nachos",
     "name_plural": "meat nachos",
     "conditional_names": [
+      { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "niño nachos", "str_pl": "niño nachos" } },
       {
         "type": "COMPONENT_ID",
         "condition": "mutant",
@@ -755,31 +756,17 @@
     "fun": 16,
     "vitamins": [ [ "vitC", 5 ], [ "calcium", 2 ], [ "iron", 24 ], [ "vitB", 259 ] ]
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "nachoshf",
-    "copy-from": "nachosm",
-    "name": "niño nachos",
-    "name_plural": "niño nachos",
-    "description": "Salted chips made from corn tortillas, with human flesh.  Some cheese might make it even better.",
-    "material": [ "junk", "hflesh" ]
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "nachoshc",
-    "copy-from": "nachosmc",
-    "name": "niño nachos with cheese",
-    "name_plural": "niño nachos with cheese",
-    "description": "Salted chips made from corn tortillas with human flesh and smothered in cheese.  Delicious.",
-    "material": [ "hflesh", "milk", "junk" ],
-    "primary_material": "processed_food"
-  },
   {
     "type": "COMESTIBLE",
     "id": "nachosmc",
     "name": "meat nachos with cheese",
     "name_plural": "meat nachos with cheese",
     "conditional_names": [
+      {
+        "type": "FLAG",
+        "condition": "CANNIBALISM",
+        "name": { "str": "niño nachos with cheese", "str_pl": "niño nachos with cheese" }
+      },
       {
         "type": "COMPONENT_ID",
         "condition": "mutant",
@@ -929,15 +916,6 @@
     "fun": 15,
     "vitamins": [ [ "vitA", 7 ], [ "vitC", 46 ], [ "calcium", 14 ], [ "iron", 21 ] ]
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "chilidogs_human",
-    "copy-from": "chilidogs",
-    "name": "cheater chili dogs",
-    "name_plural": "cheater chili dogs",
-    "description": "A hot dog, served with chili con cabron as a topping.  Delightful.",
-    "material": [ "hflesh", "junk", "wheat" ]
-  },
   {
     "type": "COMESTIBLE",
     "id": "corndogs_frozen",