Add regular hearts to the game and make them obtainable through butchery

data/json/items/comestibles/carnivore.json

@@ -1038,6 +1038,91 @@
     "snippet_category": "cooked_mutant_lung_desc",
     "delete": { "flags": [ "RAW" ] }
   },
+  {
+    "id": "heart",
+    "type": "COMESTIBLE",
+    "copy-from": "flesh",
+    "looks_like": "offal",
+    "name": { "str": "piece of raw heart", "str_pl": "pieces of raw heart" },
+    "description": "A portion of an animal's heart.  It's tough but not that chewy, and it spoils very quickly.",
+    "weight": "55 g",
+    "volume": "50 ml",
+    "color": "pink",
+    "spoils_in": "1 day",
+    "price_postapoc": "6 cent",
+    "fun": -10,
+    "calories": 50,
+    "vitamins": [ [ "vitC", 0 ], [ "calcium", 3 ], [ "iron", 14 ], [ "meat_allergen", 1 ] ],
+    "extend": { "flags": [ "PREDATOR_FUN" ] }
+  },
+  {
+    "id": "human_heart",
+    "type": "COMESTIBLE",
+    "copy-from": "heart",
+    "looks_like": "heart",
+    "name": { "str": "piece of raw human heart", "str_pl": "pieces of raw human heart" },
+    "description": "A portion of heart from a human.  It's tough but not that chewy, and it spoils very quickly.  It appears to have been extracted too crudely to ever be useful as a transplant.",
+    "material": [ "hflesh" ],
+    "vitamins": [ [ "vitC", 0 ], [ "calcium", 3 ], [ "iron", 14 ], [ "meat_allergen", 1 ], [ "human_flesh_vitamin", 1 ] ]
+  },
+  {
+    "id": "demihuman_heart",
+    "type": "COMESTIBLE",
+    "copy-from": "heart",
+    "looks_like": "heart",
+    "name": { "str": "piece of raw demihuman heart", "str_pl": "pieces of raw demihuman heart" },
+    "description": "A portion of heart from a demihuman being.  It's tough but not that chewy, and it spoils very quickly.",
+    "extend": { "flags": [ "STRICT_HUMANITARIANISM" ] }
+  },
+  {
+    "id": "heart_cooked",
+    "type": "COMESTIBLE",
+    "copy-from": "heart",
+    "fun": -5,
+    "looks_like": "offal_cooked",
+    "name": { "str": "cooked piece of heart", "str_pl": "cooked pieces of heart" },
+    "description": "A roasted piece of heart.  It doesn't look any tastier than it did raw, but any parasites are all cooked out.",
+    "parasites": 0,
+    "extend": { "flags": [ "EATEN_HOT" ] },
+    "delete": { "flags": [ "RAW" ] }
+  },
+  {
+    "id": "mutant_heart",
+    "type": "COMESTIBLE",
+    "copy-from": "heart",
+    "name": { "str": "piece of raw mutant heart", "str_pl": "pieces of raw mutant heart" },
+    "snippet_category": "mutant_heart_desc",
+    "fun": -15,
+    "proportional": { "price_postapoc": 0.5 },
+    "extend": { "flags": [ "BAD_TASTE" ] },
+    "vitamins": [ [ "vitC", 0 ], [ "calcium", 3 ], [ "iron", 14 ], [ "mutant_toxin", 10 ], [ "meat_allergen", 1 ] ]
+  },
+  {
+    "id": "mutant_human_heart",
+    "type": "COMESTIBLE",
+    "copy-from": "heart",
+    "name": { "str": "piece of raw mutant humanoid heart", "str_pl": "pieces of raw mutant humanoid heart" },
+    "snippet_category": "mutant_heart_desc",
+    "fun": -15,
+    "proportional": { "price_postapoc": 0.5 },
+    "extend": { "flags": [ "BAD_TASTE" ] },
+    "vitamins": [
+      [ "vitC", 0 ],
+      [ "calcium", 3 ],
+      [ "iron", 14 ],
+      [ "mutant_toxin", 10 ],
+      [ "meat_allergen", 1 ],
+      [ "human_flesh_vitamin", 1 ]
+    ]
+  },
+  {
+    "id": "mutant_heart_cooked",
+    "type": "COMESTIBLE",
+    "copy-from": "heart_cooked",
+    "name": { "str": "cooked piece of mutant heart", "str_pl": "cooked pieces of mutant heart" },
+    "snippet_category": "cooked_mutant_heart_desc",
+    "delete": { "flags": [ "RAW" ] }
+  },
   {
     "id": "mutant_bug_lungs",
     "type": "COMESTIBLE",

data/json/items/comestibles/offal_dishes.json

@@ -66,6 +66,54 @@
       [ "milk_allergen", 1 ]
     ]
   },
+  {
+    "id": "fried_heart",
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "name": { "str_sp": "fried heart" },
+    "symbol": "%",
+    "looks_like": "meat_cooked",
+    "description": "Tasty deep-fried heart, retaining most of its texture and gaining that delicious fried taste.",
+    "price_postapoc": "50 cent",
+    "material": [ "flesh", "wheat", "milk" ],
+    "primary_material": "flesh",
+    "color": "brown",
+    "weight": "91 g",
+    "volume": "83 ml",
+    "spoils_in": "3 days",
+    "calories": 201,
+    "fun": 6,
+    "quench": -4,
+    "flags": [ "EATEN_HOT" ],
+    "vitamins": [
+      [ "vitC", 0 ],
+      [ "calcium", 2 ],
+      [ "iron", 9 ],
+      [ "meat_allergen", 1 ],
+      [ "wheat_allergen", 1 ],
+      [ "milk_allergen", 1 ]
+    ]
+  },
+  {
+    "id": "stuffed_heart",
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "name": { "str_sp": "stuffed heart" },
+    "symbol": "%",
+    "looks_like": "offal_cooked",
+    "fun": 7,
+    "description": "Chunks of heart filled with vegetables and spices.",
+    "price_postapoc": "41 cent",
+    "material": [ "flesh", "wheat", "veggy" ],
+    "primary_material": "flesh",
+    "color": "brown",
+    "spoils_in": "1 days",
+    "volume": "81 ml",
+    "weight": "89 g",
+    "calories": 400,
+    "flags": [ "EATEN_HOT" ],
+    "vitamins": [ [ "meat_allergen", 1 ], [ "veggy_allergen", 1 ] ]
+  },
   {
     "id": "humble_pie",
     "type": "COMESTIBLE",
@@ -221,6 +269,15 @@
     "sealed": true,
     "container": "can_food"
   },
+  {
+    "id": "canned_heart",
+    "type": "COMESTIBLE",
+    "copy-from": "heart_cooked",
+    "name": { "str_sp": "canned heart" },
+    "description": "Chunks of heart preserved in a can.",
+    "sealed": true,
+    "container": "can_food"
+  },
   {
     "id": "lung_provence",
     "type": "COMESTIBLE",

data/json/recipes/food/canned.json

@@ -822,6 +822,52 @@
       [ [ "liver", 48 ], [ "human_liver", 48 ], [ "demihuman_liver", 48 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "result": "canned_heart",
+    "id_suffix": "jarred",
+    "byproducts": [ [ "water_clean", 2 ] ],
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 5,
+    "time": "30 m",
+    "batch_time_factors": [ 83, 5 ],
+    "using": [ [ "canning_high_heat", 1, "LIST" ] ],
+    "//1": "pressure canning is measured in 0.5 liter quantities, so 1u of canning_high_heat.",
+    "book_learn": [ [ "cookbook", 6 ], [ "manual_canning", 4 ] ],
+    "container": "jar_glass_sealed",
+    "charges": 8,
+    "components": [
+      [ [ "water_clean", 1 ] ],
+      [ [ "jar_glass_sealed", 1 ] ],
+      [ [ "heart", 8 ], [ "human_heart", 8 ], [ "demihuman_heart", 8 ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "result": "canned_heart",
+    "id_suffix": "jarred_3l",
+    "byproducts": [ [ "water_clean", 12 ] ],
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 5,
+    "time": "60 m",
+    "batch_time_factors": [ 83, 5 ],
+    "using": [ [ "canning_high_heat", 6, "LIST" ] ],
+    "//1": "pressure canning is measured in 0.5 liter quantities, so 6u of canning_high_heat.",
+    "book_learn": [ [ "cookbook", 6 ], [ "manual_canning", 4 ] ],
+    "container": "jar_3l_glass_sealed",
+    "charges": 48,
+    "components": [
+      [ [ "water_clean", 6 ] ],
+      [ [ "jar_3l_glass_sealed", 1 ] ],
+      [ [ "heart", 48 ], [ "human_heart", 48 ], [ "demihuman_heart", 48 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "activity_level": "NO_EXERCISE",

data/json/recipes/food/offal_dishes.json

@@ -45,6 +45,25 @@
     "//": "raw lung weighs 56g, per scrap of meat standard this is 4u heat",
     "components": [ [ [ "mutant_lung", 1 ], [ "mutant_bug_lungs", 1 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "copy-from": "brain_cooked",
+    "result": "heart_cooked",
+    "qualities": [ { "id": "COOK", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ],
+    "//": "raw heart weighs 45g, per scrap of meat standard this is 4u heat",
+    "components": [ [ [ "heart", 1 ], [ "human_heart", 1 ], [ "demihuman_heart", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "mutant_heart_cooked",
+    "copy-from": "brain_cooked",
+    "qualities": [ { "id": "COOK", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ],
+    "//": "raw heart weighs 45g, per scrap of meat standard this is 4u heat",
+    "components": [ [ [ "mutant_heart", 1 ], [ "mutant_human_heart", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
@@ -193,6 +212,42 @@
     "components": [ [ [ "flour_any", 20, "LIST" ] ], [ [ "meat_offal", 1, "LIST" ] ], [ [ "water_clean", 1 ] ] ],
     "charges": 3
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "fried_heart",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "skills_required": [ "survival", 2 ],
+    "time": "7 m",
+    "book_learn": [ [ "cookbook", 1 ] ],
+    "difficulty": 3,
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 11, "LIST" ] ] ],
+    "components": [ [ [ "meat_heart", 1, "LIST" ] ], [ [ "batter", 3, "LIST" ] ], [ [ "fry_oil", 1, "LIST" ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "stuffed_heart",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "155 m",
+    "batch_time_factors": [ 85, 4 ],
+    "book_learn": [ [ "offalcooking", 2 ] ],
+    "qualities": [ { "id": "COOK", "level": 3 }, { "id": "CUT", "level": 2 } ],
+    "tools": [ [ [ "surface_heat", 40, "LIST" ] ] ],
+    "components": [
+      [ [ "meat_heart", 4, "LIST" ] ],
+      [ [ "veggy_any_fresh_uncooked", 2, "LIST" ] ],
+      [ [ "any_bread", 2, "LIST" ] ],
+      [ [ "salt", 6 ] ],
+      [ [ "pepper", 6 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

data/json/requirements/cooking_components.json

@@ -439,6 +439,7 @@
     "//": "Anything you might consider offal or intestines.",
     "components": [
       [
+        [ "meat_heart", 4, "LIST" ],
         [ "meat_lung", 4, "LIST" ],
         [ "meat_liver", 4, "LIST" ],
         [ "meat_kidney", 4, "LIST" ],
@@ -493,6 +494,13 @@
     "//": "Anything you might consider raw lung.  About 250mL of lungs.",
     "components": [ [ [ "lung", 1 ], [ "human_lung", 1 ], [ "demihuman_lung", 1 ], [ "mutant_bug_lungs", 1 ], [ "mutant_lung", 1 ] ] ]
   },
+  {
+    "id": "meat_heart",
+    "type": "requirement",
+    "components": [
+      [ [ "heart", 1 ], [ "human_heart", 1 ], [ "demihuman_heart", 1 ], [ "mutant_heart", 1 ], [ "mutant_human_heart", 1 ] ]
+    ]
+  },
   {
     "id": "meat_liver",
     "type": "requirement",

data/json/snippets/mutant_anatomy.json

@@ -223,6 +223,50 @@
       }
     ]
   },
+  {
+    "type": "snippet",
+    "category": "mutant_heart_desc",
+    "text": [
+      {
+        "id": "mutant_heart_1",
+        "text": "A chunk of heart from a mutated animal.  Patches of hair and bits of bones are present all over and inside it, making it resemble a giant teratoma.  Despite this, it appears to have functioned as a heart."
+      },
+      {
+        "id": "mutant_heart_2",
+        "text": "A chunk of heart from a mutated animal.  The ventricles are filled with acidic fluids and bits of half-digested food, with the nearby veins and arteries being lined with mucus.  Looking at this macabre fusion of the circulatory and digestive systems, you wonder how such a thing could ever get food to reach the heart without clogging the arteries."
+      },
+      {
+        "id": "mutant_heart_3",
+        "text": "A chunk of heart from a mutated animal.  This cancerous, gangrenous mass of flesh still beats, leaking out more of the foul fluids it used to push through a body.  Beating isn't the only thing it continues to do, as you witness what kept this heart beating: the gangrene eating the cancer as the cancer grows back all over the gangrene, in a sickening ouroboros."
+      },
+      {
+        "id": "mutant_heart_4",
+        "text": "A chunk of heart from a mutated animal.  Despite its stone-like exterior, its inner flesh is much closer to mucus in all aspects.  Upon closer examination, this heart appears vestigial, as the inner flesh turns out to be blood, slowly moving on its own volition."
+      }
+    ]
+  },
+  {
+    "type": "snippet",
+    "category": "cooked_mutant_heart_desc",
+    "text": [
+      {
+        "id": "cooked_mutant_heart_1",
+        "text": "A cooked chunk of heart from a mutated animal.  The removal of most fluid pockets has made what remains of this heart resemble to a mass of tough leather-like scraps, with a far fouler taste."
+      },
+      {
+        "id": "cooked_mutant_heart_2",
+        "text": "A cooked chunk of heart from a mutated animal.  The heat has turned this heart white and mushy, with a taste and texture reminiscent of eating wet ashes."
+      },
+      {
+        "id": "cooked_mutant_heart_3",
+        "text": "A cooked chunk of heart from a mutated animal.  It has partially melted as it cooked, making it gelatinous yet sinewy, as if the taste and odor weren't enough of a deterrent."
+      },
+      {
+        "id": "cooked_mutant_heart_4",
+        "text": "A cooked chunk of heart from a mutated animal.  Most of it has softened under the heat, giving it a rubbery texture and a taste of cold grease, but the core became akin to a meaty jawbreaker with an unsettling but not revolting taste."
+      }
+    ]
+  },
   {
     "type": "snippet",
     "category": "mutant_kidney_desc",

data/mods/Aftershock/mobs/harvest.json

@@ -22,8 +22,9 @@
     "type": "harvest",
     "entries": [
       { "drop": "meat", "type": "flesh", "mass_ratio": 0.3 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.03 },
+      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.02 },
       { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "heart", "type": "offal", "mass_ratio": 0.01 },
       { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
       { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
       { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 },