From f43f7cd1c7847f51ac189095a4f9b7961a18fdba Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Tue, 3 Sep 2024 19:57:27 +0800
Subject: [PATCH 01/15] fix the heart issue

---
 data/mods/Magiclysm/harvest.json | 321 +++++++++----------------------
 1 file changed, 90 insertions(+), 231 deletions(-)

diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json
index 81bcfa5253c30..9f1a279170537 100644
--- a/data/mods/Magiclysm/harvest.json
+++ b/data/mods/Magiclysm/harvest.json
@@ -1,78 +1,53 @@
 [
   {
     "id": "owlbear",
-    "//": "identical to mammal_large_fur except that half the fur has been replaced with feathers",
+    "//": "identical to mutant_mammal_large_fur except that half the fur has been replaced with feathers",
     "type": "harvest",
-    "entries": [
-      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "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 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "owlbear_stone", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.015 },
-      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "feather", "type": "skin", "mass_ratio": 0.005 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "mutant_mammal_large_fur",
+    "delete": { "entries": [ { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 } ] },
+    "extend": {
+      "entries": [
+        { "drop": "owlbear_stone", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+        { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.015 },
+        { "drop": "feather", "type": "skin", "mass_ratio": 0.005 },
+        { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
+      ]
+    }
   },
   {
     "id": "owlbear_cub",
     "//": "drops regular stomach",
     "type": "harvest",
-    "entries": [
-      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.3 },
-      { "drop": "mutant_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 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "owlbear_stone", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.015 },
-      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "feather", "type": "skin", "mass_ratio": 0.005 }
-    ]
+    "copy-from": "mutant_mammal_fur",
+    "delete": { "entries": [ { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 } ] },
+    "extend": {
+      "entries": [
+        { "drop": "owlbear_stone", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+        { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.015 },
+        { "drop": "feather", "type": "skin", "mass_ratio": 0.005 }
+      ]
+    }
   },
   {
     "id": "bulette",
-    "//": "drops large stomach",
     "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "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 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bulette_plate", "scale_num": [ 2, 5 ], "max": 1, "type": "skin" },
-      { "drop": "bulette_pearl", "scale_num": [ 1, 4 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "mammal_large_leather",
+    "extend": {
+      "entries": [
+        { "drop": "bulette_plate", "scale_num": [ 2, 5 ], "max": 1, "type": "skin" },
+        { "drop": "bulette_pearl", "scale_num": [ 1, 4 ], "max": 1, "type": "offal" },
+        { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
+      ]
+    }
   },
   {
     "id": "demon_spider",
+    "//": "Maybe demon blood in future.  But for now, tainted will do.",
     "type": "harvest",
     "entries": [
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 },
       { "drop": "meat", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "demon_chitin_piece", "type": "bone", "mass_ratio": 0.04 },
       { "drop": "demon_chitin_plate", "type": "skin", "mass_ratio": 0.01 },
       { "drop": "demon_spider_fang", "base_num": [ 0, 0 ], "scale_num": [ 0.1, 0.6 ], "max": 2, "type": "flesh" }
@@ -80,197 +55,76 @@
   },
   {
     "id": "mammal_small_fur",
-    "//": "override of vanilla harvest, includes hairballs",
     "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.28 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.04 },
-      { "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": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "hairball", "type": "bionic", "max": 3 }
-    ]
+    "copy-from": "mammal_small_fur",
+    "extend": { "entries": [ { "drop": "hairball", "type": "bionic", "max": 3 } ] }
   },
   {
     "id": "mammal_large_fur",
-    "//": "vanilla override, includes adrenal gland",
     "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "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 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "mammal_large_fur",
+    "extend": { "entries": [ { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 } ] }
   },
   {
     "id": "mammal_large_leather",
-    "//": "vanilla override, includes adrenal gland",
     "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
-      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "heart", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
-      { "drop": "sweetbread", "type": "flesh", "mass_ratio": 0.002 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "mammal_large_leather",
+    "extend": { "entries": [ { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 } ] }
   },
   {
     "id": "mutant_mammal_large_leather",
-    "//": "drops large stomach",
     "type": "harvest",
-    "entries": [
-      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "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 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "mutant_mammal_large_leather",
+    "extend": { "entries": [ { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 } ] }
   },
   {
     "id": "mammal_large_wool",
-    "//": "drops large stomach",
     "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "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 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "wool_staple", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "mammal_large_wool",
+    "extend": { "entries": [ { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 } ] }
   },
   {
     "id": "mammal_small_parabolan_wool",
-    "//": "does not drop stomach or other small organs",
     "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.28 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.04 },
-      { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
-      { "drop": "heart", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
-      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "parabolan_wool_staple", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
-    ]
+    "copy-from": "mammal_small_wool",
+    "delete": { "entries": [ { "drop": "wool_staple", "type": "skin", "mass_ratio": 0.02 } ] },
+    "extend": { "entries": [ { "drop": "parabolan_wool_staple", "type": "skin", "mass_ratio": 0.02 } ] }
   },
   {
     "id": "mammal_large_parabolan_wool",
-    "//": "drops large stomach",
     "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "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 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "parabolan_wool_staple", "type": "skin", "mass_ratio": 0.05 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "mammal_large_wool",
+    "delete": { "entries": [ { "drop": "wool_staple", "type": "skin", "mass_ratio": 0.21 } ] },
+    "extend": {
+      "entries": [
+        { "drop": "parabolan_wool_staple", "type": "skin", "mass_ratio": 0.05 },
+        { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
+      ]
+    }
   },
   {
     "id": "human_large_leather",
     "type": "harvest",
-    "entries": [
-      { "drop": "mutant_human_flesh", "type": "flesh", "mass_ratio": 0.34 },
-      { "drop": "hstomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "raw_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "mutant_human_fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "human_large_fur",
+    "delete": { "entries": [ { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 } ] },
+    "extend": {
+      "entries": [
+        { "drop": "raw_hleather", "type": "skin", "mass_ratio": 0.02 },
+        { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
+      ]
+    }
   },
   {
     "id": "animal_large_noskin",
-    "//": "for those vertebrates that don't have something you can skin off of them",
     "type": "harvest",
-    "entries": [
-      { "drop": "meat", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "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 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "animal_large_noskin",
+    "extend": { "entries": [ { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 } ] }
   },
   {
     "id": "mutant_animal_large_noskin",
-    "//": "for those vertebrates that don't have something you can skin off of them",
     "type": "harvest",
-    "entries": [
-      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "mutant_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "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 },
-      { "drop": "kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.07 },
-      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
-    ]
+    "copy-from": "mutant_animal_large_noskin",
+    "extend": { "entries": [ { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 } ] }
   },
   {
     "id": "dragon_black",
@@ -299,7 +153,7 @@
   },
   {
     "id": "shrieker",
-    "//": "mainly fungaloid drops with scream mushroom.",
+    "//": "mainly fungaloid drops with scream mushroom",
     "type": "harvest",
     "entries": [
       { "drop": "veggy", "type": "flesh", "mass_ratio": 0.4 },
@@ -320,17 +174,9 @@
   {
     "id": "lizardfolk",
     "type": "harvest",
-    "entries": [
-      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.31 },
-      { "drop": "demihuman_lung", "type": "flesh", "mass_ratio": 0.0035 },
-      { "drop": "demihuman_heart", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "demihuman_liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "demihuman_brain", "type": "flesh", "mass_ratio": 0.005 },
-      { "drop": "demihuman_kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "bone_demihuman", "type": "bone", "mass_ratio": 0.1 }
-    ]
+    "copy-from": "demihuman_large_fur",
+    "delete": { "entries": [ { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 } ] },
+    "extend": { "entries": [ { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 } ] }
   },
   {
     "id": "ravenfolk",
@@ -338,16 +184,20 @@
     "type": "harvest",
     "entries": [
       { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.29 },
-      { "drop": "demihuman_blood", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "demihuman_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "drop": "demihuman_lung", "type": "offal", "mass_ratio": 0.0035 },
-      { "drop": "demihuman_heart", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "demihuman_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "demihuman_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+      { "drop": "demihuman_fat", "type": "flesh", "mass_ratio": 0.18 },
       { "drop": "demihuman_liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "demihuman_brain", "type": "offal", "mass_ratio": 0.003 },
+      { "drop": "demihuman_lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "demihuman_heart", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "demihuman_brain", "type": "flesh", "mass_ratio": 0.005 },
+      { "drop": "demihuman_sweetbread", "type": "flesh", "mass_ratio": 0.002 },
       { "drop": "demihuman_kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "demihuman_fat", "type": "flesh", "mass_ratio": 0.18 },
-      { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.01 },
       { "drop": "bone_demihuman", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "demihuman_marrow", "type": "bone", "mass_ratio": 0.005 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
+      { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.01 },
       { "drop": "feather", "type": "skin", "mass_ratio": 0.02 },
       { "drop": "down_feather", "type": "skin", "mass_ratio": 0.01 }
     ]
@@ -356,13 +206,17 @@
     "id": "ogre",
     "type": "harvest",
     "entries": [
-      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.31 },
+      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.32 },
+      { "drop": "demihuman_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
       { "drop": "demihuman_lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "demihuman_blood", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "demihuman_liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "demihuman_heart", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "demihuman_stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
       { "drop": "demihuman_brain", "type": "flesh", "mass_ratio": 0.0025 },
       { "drop": "demihuman_kidney", "type": "offal", "mass_ratio": 0.002 },
+      { "drop": "demihuman_fat", "type": "flesh", "mass_ratio": 0.18 },
       { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "demihuman_marrow", "type": "bone", "mass_ratio": 0.005 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
       { "drop": "bone_demihuman", "type": "bone", "mass_ratio": 0.1025 }
     ]
@@ -371,14 +225,18 @@
     "id": "orc",
     "type": "harvest",
     "entries": [
-      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.31 },
+      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.32 },
       { "drop": "demihuman_lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "demihuman_blood", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "demihuman_liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "demihuman_heart", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "demihuman_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
       { "drop": "demihuman_brain", "type": "flesh", "mass_ratio": 0.005 },
       { "drop": "demihuman_kidney", "type": "offal", "mass_ratio": 0.002 },
+      { "drop": "demihuman_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
+      { "drop": "demihuman_fat", "type": "flesh", "mass_ratio": 0.18 },
       { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
+      { "drop": "demihuman_marrow", "type": "bone", "mass_ratio": 0.005 },
       { "drop": "bone_demihuman", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
@@ -388,6 +246,7 @@
     "type": "harvest",
     "entries": [
       { "drop": "meat_mutant_tainted", "type": "flesh", "mass_ratio": 0.32 },
+      { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 },
       { "drop": "owlbear_stone", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.15 },
       { "drop": "raw_tainted_fur", "type": "skin", "mass_ratio": 0.015 },

From 3235259f8dd585cd1bb1dfa8b5db5a2f871fd42f Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Tue, 3 Sep 2024 20:08:35 +0800
Subject: [PATCH 02/15] fix orc and ogre

---
 data/mods/Magiclysm/harvest.json | 60 +++++++++++++++-----------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json
index 9f1a279170537..1c546a6dcb784 100644
--- a/data/mods/Magiclysm/harvest.json
+++ b/data/mods/Magiclysm/harvest.json
@@ -175,8 +175,18 @@
     "id": "lizardfolk",
     "type": "harvest",
     "copy-from": "demihuman_large_fur",
-    "delete": { "entries": [ { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 } ] },
-    "extend": { "entries": [ { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 } ] }
+    "delete": {
+      "entries": [
+        { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
+        { "drop": "demihuman_stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }
+      ]
+    }
+    "extend":  {
+      "entries": [
+        { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
+        { "drop": "demihuman_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }
+      ]
+    }
   },
   {
     "id": "ravenfolk",
@@ -205,40 +215,26 @@
   {
     "id": "ogre",
     "type": "harvest",
-    "entries": [
-      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.32 },
-      { "drop": "demihuman_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "drop": "demihuman_lung", "type": "flesh", "mass_ratio": 0.0035 },
-      { "drop": "demihuman_blood", "type": "blood", "mass_ratio": 0.1 },
-      { "drop": "demihuman_liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "demihuman_stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "demihuman_brain", "type": "flesh", "mass_ratio": 0.0025 },
-      { "drop": "demihuman_kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "demihuman_fat", "type": "flesh", "mass_ratio": 0.18 },
-      { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "demihuman_marrow", "type": "bone", "mass_ratio": 0.005 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "bone_demihuman", "type": "bone", "mass_ratio": 0.1025 }
-    ]
+    "copy-from": "demihuman_large_fur",
+    "delete": { "entries": [ { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 } ] },
+    "extend": { "entries": [ { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 } ] }
   },
   {
     "id": "orc",
     "type": "harvest",
-    "entries": [
-      { "drop": "demihuman_flesh", "type": "flesh", "mass_ratio": 0.32 },
-      { "drop": "demihuman_lung", "type": "flesh", "mass_ratio": 0.0035 },
-      { "drop": "demihuman_blood", "type": "blood", "mass_ratio": 0.1 },
-      { "drop": "demihuman_liver", "type": "offal", "mass_ratio": 0.01 },
-      { "drop": "demihuman_meat_scrap", "type": "flesh", "mass_ratio": 0.01 },
-      { "drop": "demihuman_brain", "type": "flesh", "mass_ratio": 0.005 },
-      { "drop": "demihuman_kidney", "type": "offal", "mass_ratio": 0.002 },
-      { "drop": "demihuman_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },
-      { "drop": "demihuman_fat", "type": "flesh", "mass_ratio": 0.18 },
-      { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
-      { "drop": "demihuman_marrow", "type": "bone", "mass_ratio": 0.005 },
-      { "drop": "bone_demihuman", "type": "bone", "mass_ratio": 0.1 }
-    ]
+    "copy-from": "demihuman_large_fur",
+    "delete": {
+      "entries": [
+        { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
+        { "drop": "demihuman_stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }
+      ]
+    }
+    "extend":  {
+      "entries": [
+        { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
+        { "drop": "demihuman_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }
+      ]
+    }
   },
   {
     "id": "zombie_owlbear",

From 52b816aa81807502fbe5502c397c364faf987f45 Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Tue, 3 Sep 2024 20:11:53 +0800
Subject: [PATCH 03/15] add ","

---
 data/mods/Magiclysm/harvest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json
index 1c546a6dcb784..23e8402b63e72 100644
--- a/data/mods/Magiclysm/harvest.json
+++ b/data/mods/Magiclysm/harvest.json
@@ -180,7 +180,7 @@
         { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
         { "drop": "demihuman_stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }
       ]
-    }
+    },
     "extend":  {
       "entries": [
         { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
@@ -228,7 +228,7 @@
         { "drop": "raw_hfur", "type": "skin", "mass_ratio": 0.02 },
         { "drop": "demihuman_stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }
       ]
-    }
+    },
     "extend":  {
       "entries": [
         { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },

From 0edfbc0a6c9ff274a7c865ea4a02747b2ba6cc35 Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Tue, 3 Sep 2024 20:14:15 +0800
Subject: [PATCH 04/15] Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 data/mods/Magiclysm/harvest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json
index 23e8402b63e72..18ad30e32ce46 100644
--- a/data/mods/Magiclysm/harvest.json
+++ b/data/mods/Magiclysm/harvest.json
@@ -181,7 +181,7 @@
         { "drop": "demihuman_stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }
       ]
     },
-    "extend":  {
+    "extend": {
       "entries": [
         { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
         { "drop": "demihuman_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }
@@ -229,7 +229,7 @@
         { "drop": "demihuman_stomach_large", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }
       ]
     },
-    "extend":  {
+    "extend": {
       "entries": [
         { "drop": "raw_demihumanleather", "type": "skin", "mass_ratio": 0.02 },
         { "drop": "demihuman_stomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" }

From 33c73af0f18b256efc7dc5bca1dfbc553c19dce8 Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Wed, 4 Sep 2024 00:28:44 +0800
Subject: [PATCH 05/15] Add harvest first

---
 data/mods/Magiclysm/harvest.json | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json
index 18ad30e32ce46..e30599901f272 100644
--- a/data/mods/Magiclysm/harvest.json
+++ b/data/mods/Magiclysm/harvest.json
@@ -127,7 +127,8 @@
     "extend": { "entries": [ { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 } ] }
   },
   {
-    "id": "dragon_black",
+    "id": "dragon_black_wyrmling",
+    "//": "Not old enough to have enough magic condensed in heart.",
     "type": "harvest",
     "entries": [
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 },
@@ -138,6 +139,18 @@
       { "drop": "bone", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
+  {
+    "id": "dragon_black_young",
+    "type": "harvest",
+    "copy-from": "dragon_black_wyrmling",
+    "extend": { "entries": [ { "drop": "young_dragon_heart_black", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
+  {
+    "id": "dragon_black_adult",
+    "type": "harvest",
+    "copy-from": "dragon_black_wyrmling",
+    "extend": { "entries": [ { "drop": "crystalized_dragon_heart_black", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" } ] }
+  },
   {
     "id": "stirge",
     "//": "mainly arachnid drops with leather and proboscis",

From 9825ed3d47949e493a2c2ece09ed3c0492b179bb Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Wed, 4 Sep 2024 00:35:28 +0800
Subject: [PATCH 06/15] Dragons with heart

---
 data/mods/Magiclysm/monsters/dragon.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/mods/Magiclysm/monsters/dragon.json b/data/mods/Magiclysm/monsters/dragon.json
index 500846c8b5aa7..77010c4420d22 100644
--- a/data/mods/Magiclysm/monsters/dragon.json
+++ b/data/mods/Magiclysm/monsters/dragon.json
@@ -91,7 +91,7 @@
     "vision_day": 30,
     "vision_night": 20,
     "path_settings": { "//min_dist": 8, "avoid_traps": true, "avoid_sharp": true },
-    "harvest": "dragon_black",
+    "harvest": "dragon_black_wyrmling",
     "special_attacks": [
       { "type": "bite", "cooldown": 10 },
       { "id": "scratch", "cooldown": 7 },
@@ -140,6 +140,7 @@
     "melee_dice": 3,
     "melee_dice_sides": 10,
     "melee_damage": [ { "damage_type": "cut", "amount": 16 } ],
+    "harvest": "dragon_black_young",
     "special_attacks": [
       { "type": "bite", "cooldown": 10 },
       { "id": "scratch", "cooldown": 3 },
@@ -178,6 +179,7 @@
     "speed": 100,
     "delete": { "flags": [ "PATH_AVOID_DANGER" ] },
     "emit_fields": [ { "emit_id": "emit_dragon_adult_fright", "delay": "1 s" } ],
+    "harvest": "dragon_black_adult",
     "special_attacks": [
       { "type": "bite", "cooldown": 10 },
       { "id": "scratch", "cooldown": 3 },

From 75585f89a907a0425cbe9066847217bad1798269 Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 01:25:15 +0800
Subject: [PATCH 07/15] Add dragonheart items

---
 data/mods/Magiclysm/items/dragonheart.json | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 data/mods/Magiclysm/items/dragonheart.json

diff --git a/data/mods/Magiclysm/items/dragonheart.json b/data/mods/Magiclysm/items/dragonheart.json
new file mode 100644
index 0000000000000..2d3066d575f1f
--- /dev/null
+++ b/data/mods/Magiclysm/items/dragonheart.json
@@ -0,0 +1,37 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "comestible_type": "FOOD",
+    "id": "young_dragon_heart_black",
+    "name": { "str": "Young black dragon's heart" },
+    "weight": "1100 g",
+    "color": "black_green",
+    "symbol": "%",
+    "healthy": -10,
+    "calories": 347,
+    "description": "A thick, hulking mass of flesh that's easily the size of your head.  You can feel an young dragon's life force still pulsing inside this black heart.  Forbidden to trade by governments around the world before cataclysm, the myth about eating dragon's heart might be true…",
+    "price": "10000000 USD",
+    "price_postapoc": "50 USD",
+    "material": [ "flesh" ],
+    "volume": "1 L",
+    "fun": -10,
+    "vitamins": [ [ "mutagen_black_dragon", 300 ], [ "meat_allergen", 1 ] ],
+    "flags": [ "PREDATOR_FUN" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "crystalized_dragon_heart_black",
+    "name": { "str": "Crystalized black dragon heart" },
+    "//": "The relic_data is just to make it purple.",
+    "weight": "8800 g",
+    "color": "black_green",
+    "symbol": "%",
+    "description": "A huge, heart-shaped black crystal and a dime green light within. After death, adult dragon's heart will be crystalized by their very own essence accumulated through life.  Although enormous draconic magic condensed within, you are not sure there are any archmage still alive can help you unlock its secret...right?",
+    "price": "100000000 USD",
+    "price_postapoc": "5 USD",
+    "material": [ "crystal" ],
+    "volume": "8 L",
+    "relic_data": { "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 0 } ] } ] },
+    "flags": [ "UNBREAKABLE", "GEMSTONE" ]
+  },
+]

From ad5df4db153ecd745b690f8c4525c413e8613ead Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 03:34:27 +0800
Subject: [PATCH 08/15] Better primer recipe using heart

---
 data/mods/Magiclysm/recipes/alchemy.json      |  5 ++-
 data/mods/Magiclysm/recipes/dragon_black.json | 38 +++++++++++++++++--
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/data/mods/Magiclysm/recipes/alchemy.json b/data/mods/Magiclysm/recipes/alchemy.json
index 1e5b76798f875..1e5f0fabc8b3e 100644
--- a/data/mods/Magiclysm/recipes/alchemy.json
+++ b/data/mods/Magiclysm/recipes/alchemy.json
@@ -8,7 +8,8 @@
       { "id": "FINE_DISTILL", "level": 1 },
       { "id": "SEPARATE", "level": 1 },
       { "id": "CONTAIN", "level": 1 },
-      { "id": "MANA_FOCUS", "level": 1 }
+      { "id": "MANA_FOCUS", "level": 1 },
+      { "id": "MAGIC_CAULDRON", "level": 1 }
     ],
     "tools": [ [ [ "food_processor", 40 ] ], [ [ "surface_heat", 20, "LIST" ] ] ],
     "components": [ [ [ "dragon_scale", 4, "LIST" ], [ "meat_dragon", 40 ] ] ],
@@ -34,7 +35,7 @@
       { "id": "SEPARATE", "level": 1 },
       { "id": "CONTAIN", "level": 1 },
       { "id": "MANA_FOCUS", "level": 1 },
-      { "id": "MAGIC_CAULDRON", "level": 1 }
+      [ "id": "MAGIC_MUTAGEN", "level": 2 ]
     ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
     "components": [ [ [ "dragon_scale", 6, "LIST" ], [ "meat_dragon", 60 ] ], [ [ "dragon_blood", 500 ] ] ],
diff --git a/data/mods/Magiclysm/recipes/dragon_black.json b/data/mods/Magiclysm/recipes/dragon_black.json
index b6b72f6f3d563..8d0824eaac4b3 100644
--- a/data/mods/Magiclysm/recipes/dragon_black.json
+++ b/data/mods/Magiclysm/recipes/dragon_black.json
@@ -404,8 +404,13 @@
     "time": "4 h",
     "batch_time_factors": [ 80, 20 ],
     "book_learn": [ [ "black_dragons_historical", 7 ] ],
-    "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
-    "components": [ [ [ "dragon_essence", 5 ] ], [ [ "potion_starter_superior", 1 ] ] ],
+    "qualities": [ 
+      { "id": "CHEM", "level": 1 },
+      { "id": "CONCENTRATE", "level": 1 },
+      { "id": "MANA_INFUSE", "level": 1 },
+      [ "id": "MAGIC_MUTAGEN", "level": 2 ] 
+    ],
+    "components": [ [ [ "dragon_essence", 5 ] ], [ [ "potion_starter_superior", 1 ] ], [ [ "dragon_black_scale", 10 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -420,10 +425,37 @@
     "time": "8 h",
     "batch_time_factors": [ 80, 20 ],
     "book_learn": [ [ "black_dragons_historical", 8 ] ],
-    "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
+    "qualities": [ 
+      { "id": "CHEM", "level": 1 },
+      { "id": "CONCENTRATE", "level": 1 },
+      { "id": "MANA_INFUSE", "level": 1 },
+      [ "id": "MAGIC_MUTAGEN", "level": 2 ] 
+    ],
     "components": [ [ [ "dragon_essence", 5 ] ], [ [ "mutagen_black_dragon", 1 ] ], [ [ "manatouched_serum", 1 ] ] ],
     "flags": [ "SECRET" ]
   },
+  {
+    "type": "recipe",
+    "result": "iv_black_dragon",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_POTIONS",
+    "skill_used": "chemistry",
+    "skills_required": [ "spellcraft", 8 ],
+    "difficulty": 6,
+    "time": "8 h",
+    "batch_time_factors": [ 80, 20 ],
+    "book_learn": [ [ "black_dragons_historical", 8 ] ],
+    "qualities": [ 
+      { "id": "CHEM", "level": 1 },
+      { "id": "CONCENTRATE", "level": 1 },
+      { "id": "MANA_INFUSE", "level": 1 },
+      [ "id": "MAGIC_MUTAGEN", "level": 2 ] 
+    ],
+    "result_mult": 2,
+    "components": [ [ [ "dragon_essence", 5 ] ], [ [ "young_dragon_heart_black", 1 ] ], [ [ "manatouched_serum", 1 ] ] ],
+    "flags": [ "SECRET" ]
+  },
   {
     "result": "backpack_black_dragon_hide",
     "type": "recipe",

From 238d2212c274e95c8571b28248846d600b00f664 Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:58:32 +0800
Subject: [PATCH 09/15] Update dragonheart.json

---
 data/mods/Magiclysm/items/dragonheart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Magiclysm/items/dragonheart.json b/data/mods/Magiclysm/items/dragonheart.json
index 2d3066d575f1f..b65651ef3aaa6 100644
--- a/data/mods/Magiclysm/items/dragonheart.json
+++ b/data/mods/Magiclysm/items/dragonheart.json
@@ -33,5 +33,5 @@
     "volume": "8 L",
     "relic_data": { "passive_effects": [ { "has": "WIELD", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 0 } ] } ] },
     "flags": [ "UNBREAKABLE", "GEMSTONE" ]
-  },
+  }
 ]

From ddcdd9b02505ebed307cda50cf7acda625eefe48 Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:59:29 +0800
Subject: [PATCH 10/15] Update alchemy.json

---
 data/mods/Magiclysm/recipes/alchemy.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Magiclysm/recipes/alchemy.json b/data/mods/Magiclysm/recipes/alchemy.json
index 1e5f0fabc8b3e..fcd59417f3d2f 100644
--- a/data/mods/Magiclysm/recipes/alchemy.json
+++ b/data/mods/Magiclysm/recipes/alchemy.json
@@ -35,7 +35,7 @@
       { "id": "SEPARATE", "level": 1 },
       { "id": "CONTAIN", "level": 1 },
       { "id": "MANA_FOCUS", "level": 1 },
-      [ "id": "MAGIC_MUTAGEN", "level": 2 ]
+      { "id": "MAGIC_MUTAGEN", "level": 2 }
     ],
     "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
     "components": [ [ [ "dragon_scale", 6, "LIST" ], [ "meat_dragon", 60 ] ], [ [ "dragon_blood", 500 ] ] ],

From 58065acdd05a72bba7d795baf72e1dad488c882f Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 10:00:54 +0800
Subject: [PATCH 11/15] Update dragon_black.json

---
 data/mods/Magiclysm/recipes/dragon_black.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/mods/Magiclysm/recipes/dragon_black.json b/data/mods/Magiclysm/recipes/dragon_black.json
index 8d0824eaac4b3..c7ec7edf098e4 100644
--- a/data/mods/Magiclysm/recipes/dragon_black.json
+++ b/data/mods/Magiclysm/recipes/dragon_black.json
@@ -408,7 +408,7 @@
       { "id": "CHEM", "level": 1 },
       { "id": "CONCENTRATE", "level": 1 },
       { "id": "MANA_INFUSE", "level": 1 },
-      [ "id": "MAGIC_MUTAGEN", "level": 2 ] 
+      { "id": "MAGIC_MUTAGEN", "level": 2 }
     ],
     "components": [ [ [ "dragon_essence", 5 ] ], [ [ "potion_starter_superior", 1 ] ], [ [ "dragon_black_scale", 10 ] ] ],
     "flags": [ "SECRET" ]
@@ -429,7 +429,7 @@
       { "id": "CHEM", "level": 1 },
       { "id": "CONCENTRATE", "level": 1 },
       { "id": "MANA_INFUSE", "level": 1 },
-      [ "id": "MAGIC_MUTAGEN", "level": 2 ] 
+      { "id": "MAGIC_MUTAGEN", "level": 2 }
     ],
     "components": [ [ [ "dragon_essence", 5 ] ], [ [ "mutagen_black_dragon", 1 ] ], [ [ "manatouched_serum", 1 ] ] ],
     "flags": [ "SECRET" ]
@@ -450,7 +450,7 @@
       { "id": "CHEM", "level": 1 },
       { "id": "CONCENTRATE", "level": 1 },
       { "id": "MANA_INFUSE", "level": 1 },
-      [ "id": "MAGIC_MUTAGEN", "level": 2 ] 
+      { "id": "MAGIC_MUTAGEN", "level": 2 }
     ],
     "result_mult": 2,
     "components": [ [ [ "dragon_essence", 5 ] ], [ [ "young_dragon_heart_black", 1 ] ], [ [ "manatouched_serum", 1 ] ] ],

From 39d34329c3a13fa39c195f1c41e43b233b362a2a Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 14:11:25 +0800
Subject: [PATCH 12/15] Update dragon_black.json

---
 data/mods/Magiclysm/recipes/dragon_black.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/mods/Magiclysm/recipes/dragon_black.json b/data/mods/Magiclysm/recipes/dragon_black.json
index c7ec7edf098e4..310a633f51373 100644
--- a/data/mods/Magiclysm/recipes/dragon_black.json
+++ b/data/mods/Magiclysm/recipes/dragon_black.json
@@ -416,6 +416,7 @@
   {
     "type": "recipe",
     "result": "iv_black_dragon",
+    "id_suffix": "from black dragon mutagen",
     "activity_level": "MODERATE_EXERCISE",
     "category": "CC_ENCHANTED",
     "subcategory": "CSC_ENCHANTED_POTIONS",
@@ -437,6 +438,7 @@
   {
     "type": "recipe",
     "result": "iv_black_dragon",
+    "id_suffix": "from yonug black dragon's heart",
     "activity_level": "MODERATE_EXERCISE",
     "category": "CC_ENCHANTED",
     "subcategory": "CSC_ENCHANTED_POTIONS",

From 5ee11bdf3bfea9c7143aceec108a9baa7cab57bb Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 14:27:46 +0800
Subject: [PATCH 13/15] Update dragon_black.json

---
 data/mods/Magiclysm/recipes/dragon_black.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/mods/Magiclysm/recipes/dragon_black.json b/data/mods/Magiclysm/recipes/dragon_black.json
index 310a633f51373..df4930113df86 100644
--- a/data/mods/Magiclysm/recipes/dragon_black.json
+++ b/data/mods/Magiclysm/recipes/dragon_black.json
@@ -404,7 +404,7 @@
     "time": "4 h",
     "batch_time_factors": [ 80, 20 ],
     "book_learn": [ [ "black_dragons_historical", 7 ] ],
-    "qualities": [ 
+    "qualities": [
       { "id": "CHEM", "level": 1 },
       { "id": "CONCENTRATE", "level": 1 },
       { "id": "MANA_INFUSE", "level": 1 },
@@ -426,7 +426,7 @@
     "time": "8 h",
     "batch_time_factors": [ 80, 20 ],
     "book_learn": [ [ "black_dragons_historical", 8 ] ],
-    "qualities": [ 
+    "qualities": [
       { "id": "CHEM", "level": 1 },
       { "id": "CONCENTRATE", "level": 1 },
       { "id": "MANA_INFUSE", "level": 1 },
@@ -448,7 +448,7 @@
     "time": "8 h",
     "batch_time_factors": [ 80, 20 ],
     "book_learn": [ [ "black_dragons_historical", 8 ] ],
-    "qualities": [ 
+    "qualities": [
       { "id": "CHEM", "level": 1 },
       { "id": "CONCENTRATE", "level": 1 },
       { "id": "MANA_INFUSE", "level": 1 },

From eec8a5badd151766765ce99c29363d2b176dcb79 Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 16:03:29 +0800
Subject: [PATCH 14/15] space

---
 data/mods/Magiclysm/items/dragonheart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Magiclysm/items/dragonheart.json b/data/mods/Magiclysm/items/dragonheart.json
index b65651ef3aaa6..143ddbffbc54c 100644
--- a/data/mods/Magiclysm/items/dragonheart.json
+++ b/data/mods/Magiclysm/items/dragonheart.json
@@ -26,7 +26,7 @@
     "weight": "8800 g",
     "color": "black_green",
     "symbol": "%",
-    "description": "A huge, heart-shaped black crystal and a dime green light within. After death, adult dragon's heart will be crystalized by their very own essence accumulated through life.  Although enormous draconic magic condensed within, you are not sure there are any archmage still alive can help you unlock its secret...right?",
+    "description": "A huge, heart-shaped black crystal and a dime green light within.  After death, adult dragon's heart will be crystalized by their very own essence accumulated through life.  Although enormous draconic magic condensed within, you are not sure there are any archmage still alive can help you unlock its secret...  right?",
     "price": "100000000 USD",
     "price_postapoc": "5 USD",
     "material": [ "crystal" ],

From 1a20315137636385548e90ba6e326a8ae78d15d7 Mon Sep 17 00:00:00 2001
From: Naadn <97841551+Naadn@users.noreply.github.com>
Date: Fri, 6 Sep 2024 20:09:16 +0800
Subject: [PATCH 15/15] Update dragonheart.json

---
 data/mods/Magiclysm/items/dragonheart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Magiclysm/items/dragonheart.json b/data/mods/Magiclysm/items/dragonheart.json
index 143ddbffbc54c..860e356ffb2ef 100644
--- a/data/mods/Magiclysm/items/dragonheart.json
+++ b/data/mods/Magiclysm/items/dragonheart.json
@@ -26,7 +26,7 @@
     "weight": "8800 g",
     "color": "black_green",
     "symbol": "%",
-    "description": "A huge, heart-shaped black crystal and a dime green light within.  After death, adult dragon's heart will be crystalized by their very own essence accumulated through life.  Although enormous draconic magic condensed within, you are not sure there are any archmage still alive can help you unlock its secret...  right?",
+    "description": "A huge, heart-shaped black crystal and a dime green light within.  After death, adult dragon's heart will be crystalized by their very own essence accumulated through life.  Although enormous draconic magic condensed within, you are not sure there are any archmage still alive can help you unlock its secret… right?",
     "price": "100000000 USD",
     "price_postapoc": "5 USD",
     "material": [ "crystal" ],