Add poultry meat

data/json/harvest.json

@@ -1103,41 +1103,6 @@
       { "drop": "mutant_fat", "type": "offal", "mass_ratio": 0.1 }
     ]
   },
-  {
-    "id": "bird_tiny",
-    "type": "harvest",
-    "entries": [
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.4 },
-      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
-      { "drop": "feather", "type": "skin", "mass_ratio": 0.01 },
-      { "drop": "down_feather", "type": "skin", "mass_ratio": 0.005 }
-    ]
-  },
-  {
-    "id": "bird_small",
-    "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.3 },
-      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.05 },
-      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "feather", "type": "skin", "mass_ratio": 0.01 },
-      { "drop": "down_feather", "type": "skin", "mass_ratio": 0.005 }
-    ]
-  },
-  {
-    "id": "bird_large",
-    "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.3 },
-      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.03 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.18 },
-      { "drop": "feather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "down_feather", "type": "skin", "mass_ratio": 0.01 },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
-    ]
-  },
   {
     "id": "mutant_bird",
     "type": "harvest",
@@ -2764,5 +2729,75 @@
     "//": "Frog legs, but the rest of the frog is mostly inedible",
     "type": "harvest",
     "entries": [ { "drop": "froglegs", "type": "flesh", "scale_num": [ 1, 1 ], "max": 1 } ]
+  },
+  {
+    "id": "bird_tiny",
+    "type": "harvest",
+    "entries": [
+      { "drop": "poultry_scrap", "type": "flesh", "mass_ratio": 0.4 },
+      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "feather", "type": "skin", "mass_ratio": 0.01 },
+      { "drop": "down_feather", "type": "skin", "mass_ratio": 0.005 }
+    ]
+  },
+  {
+    "id": "bird_small",
+    "type": "harvest",
+    "entries": [
+      { "drop": "poultry", "type": "flesh", "mass_ratio": 0.3 },
+      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "poultry_scrap", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "feather", "type": "skin", "mass_ratio": 0.01 },
+      { "drop": "down_feather", "type": "skin", "mass_ratio": 0.005 }
+    ]
+  },
+  {
+    "id": "bird_large",
+    "type": "harvest",
+    "entries": [
+      { "drop": "poultry", "type": "flesh", "mass_ratio": 0.3 },
+      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "poultry_scrap", "type": "flesh", "mass_ratio": 0.03 },
+      { "drop": "fat", "type": "flesh", "mass_ratio": 0.18 },
+      { "drop": "feather", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "down_feather", "type": "skin", "mass_ratio": 0.01 },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
+    ]
+  },
+  {
+    "id": "waterfowl_tiny",
+    "type": "harvest",
+    "entries": [
+      { "drop": "poultry_fatty_scrap", "type": "flesh", "mass_ratio": 0.4 },
+      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "feather", "type": "skin", "mass_ratio": 0.01 },
+      { "drop": "down_feather", "type": "skin", "mass_ratio": 0.005 }
+    ]
+  },
+  {
+    "id": "waterfowl_small",
+    "type": "harvest",
+    "entries": [
+      { "drop": "poultry_fatty", "type": "flesh", "mass_ratio": 0.3 },
+      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "poultry_fatty_scrap", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "feather", "type": "skin", "mass_ratio": 0.01 },
+      { "drop": "down_feather", "type": "skin", "mass_ratio": 0.005 }
+    ]
+  },
+  {
+    "id": "waterfowl_large",
+    "type": "harvest",
+    "entries": [
+      { "drop": "poultry_fatty", "type": "flesh", "mass_ratio": 0.3 },
+      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "poultry_fatty_scrap", "type": "flesh", "mass_ratio": 0.03 },
+      { "drop": "fat", "type": "flesh", "mass_ratio": 0.18 },
+      { "drop": "feather", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "down_feather", "type": "skin", "mass_ratio": 0.01 },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
+    ]
   }
 ]

data/json/items/comestibles/carnivore.json

@@ -236,7 +236,6 @@
     "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" ] }
   },
   {
@@ -388,7 +387,6 @@
     "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" ]
   },
   {
@@ -696,7 +694,7 @@
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
     "name": { "str_sp": "roasted bone marrow" },
-    "conditional_names": [ { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "marvin marrow" } } ],
+    "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "marvin marrow" } } ],
     "description": "Bone marrow, fully cooked to eliminate any parasites.  Tasty!",
     "symbol": "%",
     "color": "red",
@@ -715,7 +713,7 @@
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
     "name": { "str_sp": "roasted pepper bone marrow" },
-    "conditional_names": [ { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "marvin marrow" } } ],
+    "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "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",
@@ -845,7 +843,7 @@
     "type": "COMESTIBLE",
     "name": { "str_sp": "meat jerky" },
     "conditional_names": [
-      { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "jerk jerky" } },
+      { "type": "FLAG", "condition": "CANNIBALISM", "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" } }
     ],
@@ -863,7 +861,8 @@
     "fun": 4,
     "calories": 348,
     "vitamins": [ [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 26 ] ],
-    "delete": { "flags": [ "RAW" ] }
+    "delete": { "flags": [ "RAW" ] },
+    "extend": { "flags": [ "SMOKABLE" ] }
   },
   {
     "id": "salted_fish",
@@ -905,7 +904,7 @@
     "type": "COMESTIBLE",
     "name": { "str_sp": "smoked meat" },
     "conditional_names": [
-      { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "smoked sucker" } },
+      { "type": "FLAG", "condition": "CANNIBALISM", "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" } }
     ],
@@ -1597,13 +1596,12 @@
     "flags": [ "TRADER_AVOID", "RAW" ]
   },
   {
-    "type": "COMESTIBLE",
+    "type": "GENERIC",
     "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.",
-    "//": "No extend support for vitamins, we need to overwrite",
-    "vitamins": [ [ "calcium", 96 ], [ "human_flesh_vitamin", 100 ] ]
+    "flags": [ "CANNIBALISM" ]
   },
   {
     "type": "GENERIC",
@@ -2011,7 +2009,7 @@
     "type": "COMESTIBLE",
     "name": { "str_sp": "fried meat" },
     "conditional_names": [
-      { "type": "VITAMIN", "condition": "human_flesh_vitamin", "name": { "str_sp": "fried fool" } },
+      { "type": "FLAG", "condition": "CANNIBALISM", "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" } }
     ],
@@ -2075,5 +2073,125 @@
     "volume": "250 ml",
     "fun": -10,
     "flags": [ "NO_SALVAGE" ]
+  },
+  {
+    "id": "poultry",
+    "copy-from": "meat",
+    "type": "COMESTIBLE",
+    "name": { "str": "chunk of poultry meat", "str_pl": "chunks of poultry meat" },
+    "description": "A chunk of raw meat from a lean bird.  You could eat it raw, but it carries a risk of bacterial infection.",
+    "weight": "160 g",
+    "calories": 240,
+    "//": "Scaled from 100g boneless chicken thigh according to USDA database",
+    "fun": -20,
+    "vitamins": [ [ "calcium", "9 mg 6 mcg" ], [ "iron", "960 mcg" ] ],
+    "smoking_result": "poultry_smoked"
+  },
+  {
+    "id": "poultry_fatty",
+    "copy-from": "meat",
+    "type": "COMESTIBLE",
+    "name": { "str": "chunk of fatty poultry meat", "str_pl": "chunks of fatty poultry meat" },
+    "description": "A chunk of raw meat from some waterfowl, with delicious layers of fat running throughout.  You could eat it raw, but it carries a risk of bacterial infection.",
+    "weight": "160 g",
+    "calories": 594,
+    "//": "Scaled from 100g skin-on goose according to USDA database",
+    "fun": -20,
+    "vitamins": [ [ "calcium", "19 mg 200 mcg" ], [ "iron", "4 mg" ] ],
+    "smoking_result": "poultry_fatty_smoked"
+  },
+  {
+    "id": "poultry_scrap",
+    "copy-from": "poultry",
+    "type": "COMESTIBLE",
+    "name": { "str": "scrap of poultry", "str_pl": "scraps of poultry" },
+    "description": "A tiny scrap of raw bird meat.  It's not much, but it'll do in a pinch.",
+    "cooks_like": "meat_scrap_cooked",
+    "proportional": { "weight": 0.1, "volume": 0.1, "price_postapoc": 0.1, "calories": 0.1 },
+    "delete": { "flags": [ "SMOKABLE" ] },
+    "vitamins": [ [ "calcium", "900 mcg" ], [ "iron", "96 mcg" ] ]
+  },
+  {
+    "id": "poultry_fatty_scrap",
+    "copy-from": "poultry_fatty",
+    "type": "COMESTIBLE",
+    "name": { "str": "scrap of fatty poultry", "str_pl": "scraps of fatty poultry" },
+    "description": "A tiny scrap of raw fatty bird meat.  It's not much, but it'll do in a pinch.",
+    "cooks_like": "meat_scrap_cooked",
+    "proportional": { "weight": 0.1, "volume": 0.1, "price_postapoc": 0.1, "calories": 0.1 },
+    "delete": { "flags": [ "SMOKABLE" ] },
+    "vitamins": [ [ "calcium", "1900 mcg" ], [ "iron", "400 mcg" ] ]
+  },
+  {
+    "id": "poultry_cooked",
+    "copy-from": "poultry",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "cooked chicken" },
+    "description": "A chunk of cooked bird.  It's filling and nutritious, but unseasoned and a bit bland.",
+    "price": 750,
+    "price_postapoc": 100,
+    "parasites": 0,
+    "calories": 240,
+    "flags": [ "EATEN_HOT" ]
+  },
+  {
+    "id": "poultry_scrap_cooked",
+    "copy-from": "meat_scrap_cooked",
+    "type": "COMESTIBLE",
+    "name": { "str": "cooked scrap of chicken", "str_pl": "cooked scraps of chicken" },
+    "description": "A tiny scrap of cooked bird.  It's not much, but it'll do in a pinch.",
+    "flags": [  ],
+    "calories": 24
+  },
+  {
+    "id": "poultry_pepper",
+    "copy-from": "flesh",
+    "weight": "275 g",
+    "volume": "250 ml",
+    "spoils_in": "1 day",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "cooked pepper chicken" },
+    "description": "A piece of cooked bird, properly seasoned with black pepper and salt.  It's nutritious, yet basic seasoning adds a welcoming taste to this simple dish.",
+    "price": 800,
+    "price_postapoc": 150,
+    "fun": 2,
+    "parasites": 0,
+    "calories": 240,
+    "flags": [ "EATEN_HOT" ]
+  },
+  {
+    "id": "poultry_scrap_pepper",
+    "copy-from": "meat_scrap",
+    "type": "COMESTIBLE",
+    "name": { "str": "cooked pepper scrap of chicken", "str_pl": "cooked pepper scraps of chicken" },
+    "description": "A cooked scrap of bird that has been properly seasoned with pepper and salt.  Yet small, they have a good taste.",
+    "parasites": 0,
+    "fun": 1,
+    "flags": [  ],
+    "calories": 51
+  },
+  {
+    "id": "poultry_smoked",
+    "copy-from": "meat_smoked",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "smoked poultry" },
+    "description": "Strip of bird meat that has been heavily smoked for preservation.  It could be further smoked to dehydrate it completely.",
+    "color": "brown",
+    "calories": 240,
+    "price_postapoc": 200,
+    "flags": [ "EATEN_HOT", "SMOKED", "SMOKABLE" ],
+    "smoking_result": "dry_poultry"
+  },
+  {
+    "id": "poultry_fatty_smoked",
+    "copy-from": "meat_smoked",
+    "type": "COMESTIBLE",
+    "name": { "str_sp": "smoked fatty poultry" },
+    "description": "Strip of fatty waterfowl meat that has been heavily smoked for preservation.  While it certainly lasts longer, it is still full of fat which can easily go rancid.  It is also too fatty to dehydrate properly, it would be best to eat it while it lasts.",
+    "color": "brown",
+    "spoils_in": "17 days",
+    "calories": 594,
+    "price_postapoc": 200,
+    "flags": [ "EATEN_HOT", "SMOKED" ]
   }
 ]