From 1a82008bd794846ac2a8a22def2b2b7739b2e7a2 Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Thu, 4 Jul 2019 14:24:57 -0400
Subject: [PATCH 01/13] First potion commits

---
 data/mods/Magiclysm/itemgroups.json           |   9 +-
 data/mods/Magiclysm/items/alchemy_items.json  |  76 +++++++++++++
 data/mods/Magiclysm/items/comestibles.json    |  15 +++
 data/mods/Magiclysm/recipes/magic_tools.json  |  48 ++++++++
 .../Magiclysm/recipes/recipe_potions.json     | 104 ++++++++++++++++++
 5 files changed, 249 insertions(+), 3 deletions(-)
 create mode 100644 data/mods/Magiclysm/recipes/magic_tools.json
 create mode 100644 data/mods/Magiclysm/recipes/recipe_potions.json

diff --git a/data/mods/Magiclysm/itemgroups.json b/data/mods/Magiclysm/itemgroups.json
index eef893f01247e..e819c5c303c37 100644
--- a/data/mods/Magiclysm/itemgroups.json
+++ b/data/mods/Magiclysm/itemgroups.json
@@ -46,7 +46,8 @@
       [ "summon_undead_spellbook", 2 ],
       [ "techno_fundamentals", 6 ],
       [ "techno_em", 5 ],
-      [ "techno_idiots", 3 ]
+      [ "techno_idiots", 3 ],
+      [ "alchemy_basic", 3 ]
     ]
   },
   {
@@ -68,7 +69,8 @@
       [ "summon_undead_spellbook", 1 ],
       [ "techno_fundamentals", 2 ],
       [ "techno_em", 1 ],
-      [ "techno_idiots", 3 ]
+      [ "techno_idiots", 3 ],
+      [ "alchemy_basic", 10 ]
     ]
   },
   {
@@ -162,7 +164,8 @@
       [ "techno_em", 30 ],
       [ "techno_idiots", 60 ],
       [ "translocate_spellbook", 20 ],
-      [ "stat_up_spellbook", 45 ]
+      [ "stat_up_spellbook", 45 ],
+      [ "alchemy_basic", 30 ]
     ]
   },
   {
diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json
index 4f0a407d1cffc..4e6bc455243e4 100644
--- a/data/mods/Magiclysm/items/alchemy_items.json
+++ b/data/mods/Magiclysm/items/alchemy_items.json
@@ -31,5 +31,81 @@
     "to_hit": -2,
     "qualities": [ [ "BUTCHER", -50 ] ],
     "//": "Potion recipes that require a full owlbear egg could also instead require larger amounts of stone shell. Since 1 egg gives 3 shells, you could perhaps have 1 egg be equivalent to 5 or more shells when making potions."
+  },
+  {
+    "id": "copper_infuser",
+    "copy-from": "copper_bracelet",
+    "type": "ARMOR",
+    "qualities": [ [ "MANA_INFUSE", 1 ] ],
+    "name": "copper infusion bracelet",
+    "name_plural": "copper infusion bracelets",
+    "description": "This bracelet has runes engraved on it. You sense a faint air of mysticism when you look at it. It would be useful for imbuing mana into material."
+  },
+  {
+    "id": "copper_circlet",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": "copper circlet",
+    "name_plural": "copper circlets",
+    "description": "A wooden band with copper trimmings to be worn on the head. Touching your temples with it on makes you feel very calm.",
+    "weight": 700,
+    "volume": "600ml",
+    "price": 1500,
+    "price_postapoc": 100,
+    "material": [ "copper", "wood" ],
+    "symbol": "[",
+    "color": "brown",
+    "covers": [ "HEAD" ],
+    "coverage": 5,
+    "encumbrance": 1,
+    "warmth": 0,
+    "material_thickness": 1,
+    "flags": [ "BELTED" ],
+    "qualities": [ [ "MANA_FOCUS", 1 ] ]
+  },
+  {
+    "id": "stone_chisel",
+    "type": "TOOL",
+    "name": "stone chisel",
+    "name_plural": "stone chisels",
+    "looks_like": "chisel",
+    "description": "This is a short stone chisel.  It can be used to engrave on stone, wood, or soft metals.",
+    "weight": 660,
+    "volume": 1,
+    "price": 1600,
+    "to_hit": 2,
+    "bashing": 2,
+    "cutting": 1,
+    "material": "stone",
+    "symbol": ";",
+    "color": "light_gray",
+    "qualities": [ [ "CHISEL", 1 ] ],
+    "flags": [ "BELT_CLIP" ]
+  },
+  {
+    "id": "alchemy_basic",
+    "type": "BOOK",
+    "name": "A Beginner's Guide to Alchemy",
+    "description": "A paperback tome for the art of liquid magic, alcohol not included.",
+    "weight": 1000,
+    "volume": 3,
+    "price": 7900,
+    "bashing": 5,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "white",
+    "skill": "cooking",
+    "required_level": 3,
+    "max_level": 5,
+    "intelligence": 9,
+    "time": "20 m",
+    "fun": 1
+  },
+  {
+  "id": "potion_starter",
+  "copy-from": "mixed_alcohol_strong",
+  "type": "COMESTIBLE",
+  "name": "potion starter",
+  "description": "Strong alcohol, infused with mana and concentrated into a liquid that can stabilize spells into liquid form. You can still drink it, if you want."
   }
 ]
diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json
index b1a3a09cf5dcd..31eabf275dba8 100644
--- a/data/mods/Magiclysm/items/comestibles.json
+++ b/data/mods/Magiclysm/items/comestibles.json
@@ -32,5 +32,20 @@
     "healthy": 3,
     "color": "yellow",
     "description": "The liquid innards of an owlbear egg.  Good eating."
+  },
+  {
+  "id": "hairball",
+  "type": "COMESTIBLE"
+  "material": "fur",
+  "volume": "5ml",
+  "weight": 15,
+  "color": "brown",
+  "symbol": "0",
+  "name": "hairball",
+  "name_plural": "hairballs",
+  "description": "An ugly ball of animal spit and licked-off hairs. Don't swallow it.",
+  "price": 0,
+  "flags": [ "TRADER_AVOID" ],
+  "fun": -20
   }
 ]
diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json
new file mode 100644
index 0000000000000..eff801ace227a
--- /dev/null
+++ b/data/mods/Magiclysm/recipes/magic_tools.json
@@ -0,0 +1,48 @@
+[
+{
+    "type": "recipe",
+    "result": "copper_circlet",
+    "byproducts": [ [ "tinder", 40 ] ],
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_TOOLS",
+    "skill_used": "fabrication",
+    "skills_required": [ "spellcraft", 2 ],
+    "difficulty": 3,
+    "time": "30 m",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
+    "components": [ [
+    [ "scrap_copper", 1 ], [ "copper", 100 ]    
+    ], [ [ "splinter", 3 ] ] ]
+  },
+  {
+  "type": "recipe",
+    "result": "stone_chisel",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 0,
+    "time": "20 m",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ],
+    "components": [ [
+    [ "rock", 1 ], [ "sharp_rock", 1 ] ],
+    [ [ "stick", 1 ], [ "2x4", 1 ] ]
+  },
+  {
+  "type": "recipe",
+    "result": "copper_infuser",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "skills_required": [ "spellcraft", 2 ],
+    "difficulty": 3,
+    "time": "20 m",
+    "book_learn": [ [ "alchemy_basic", 4 ], 
+    "qualities": [ { "id": "CHISEL", "level": 1 } ],
+    "components": [ [
+     [ "copper_bracelet", 1 ] ] ]
+  }
+]
+
diff --git a/data/mods/Magiclysm/recipes/recipe_potions.json b/data/mods/Magiclysm/recipes/recipe_potions.json
new file mode 100644
index 0000000000000..8d78726e76625
--- /dev/null
+++ b/data/mods/Magiclysm/recipes/recipe_potions.json
@@ -0,0 +1,104 @@
+[
+   {
+    "type": "recipe",
+    "result": "potion_starter",
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_POTIONS",
+    "skill_used": "cooking",
+    "skills_required": [ "spellcraft", 2 ],
+    "difficulty": 3,
+    "charges": 7,
+    "time": "120 m",
+    "batch_time_factors": [ 75, 4 ],
+    "book_learn": [ [ "alchemy_basic", 3 ] ],
+    "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
+    "components": [ [
+        [ "gin", 7 ],
+        [ "rum", 7 ],
+        [ "single_malt_whiskey", 7 ],
+        [ "tequila", 7 ],
+        [ "triple_sec", 7 ],
+        [ "vodka", 7 ],
+        [ "whiskey", 7 ],
+        [ "brandy", 7 ],
+        [ "mixed_alcohol_strong",7 ]
+      ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "cats_grace_potion",
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_POTIONS",
+    "skill_used": "cooking",
+    "skills_required": [ "spellcraft", 5 ],
+    "difficulty": 5,
+    "time": "60 m",
+    "batch_time_factors": [ 50, 4 ],
+    "book_learn": [ [ "alchemy_basic", 4 ] ],
+    "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
+    "components": [ [
+    [ "potion_starter", 5 ] ],
+    [ [ "hairball", 2 ] ],
+    [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
+    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "ogres_strength_potion",
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_POTIONS",
+    "skill_used": "cooking",
+    "skills_required": [ "spellcraft", 5 ],
+    "difficulty": 5,
+    "time": "60 m",
+    "batch_time_factors": [ 50, 4 ],
+    "book_learn": [ [ "alchemy_basic", 4 ] ],
+    "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
+    "components": [ [
+    [ "potion_starter", 5 ] ],
+    [ [ "hairball", 2 ] ],
+    [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
+    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "eagles_sight_potion",
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_POTIONS",
+    "skill_used": "cooking",
+    "skills_required": [ "spellcraft", 5 ],
+    "difficulty": 5,
+    "time": "60 m",
+    "batch_time_factors": [ 50, 4 ],
+    "book_learn": [ [ "alchemy_basic", 4 ] ],
+    "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
+    "components": [ [
+    [ "potion_starter", 5 ] ],
+    [ [ "hairball", 2 ] ],
+    [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
+    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "foxs_cunning_potion",
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_POTIONS",
+    "skill_used": "cooking",
+    "skills_required": [ "spellcraft", 5 ],
+    "difficulty": 5,
+    "time": "60 m",
+    "batch_time_factors": [ 50, 4 ],
+    "book_learn": [ [ "alchemy_basic", 4 ] ],
+    "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
+    "components": [ [
+    [ "potion_starter", 5 ] ],
+    [ [ "hairball", 2 ] ],
+    [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
+    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ] ]
+  }
+]
\ No newline at end of file

From 7937535b604029a7b6bf3fb339020c4f42f7a356 Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Thu, 4 Jul 2019 16:17:52 -0400
Subject: [PATCH 02/13] Potion recipes, and harvest for adrenal gland

---
 data/mods/Magiclysm/harvest.json              | 98 ++++++++++++++++++-
 data/mods/Magiclysm/items/alchemy_items.json  |  9 ++
 .../Magiclysm/recipes/recipe_potions.json     | 16 ++-
 3 files changed, 113 insertions(+), 10 deletions(-)

diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json
index d19c727a2ae90..3af3f278da5da 100644
--- a/data/mods/Magiclysm/harvest.json
+++ b/data/mods/Magiclysm/harvest.json
@@ -40,5 +40,101 @@
       { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 },
       { "drop": "feather", "type": "skin", "mass_ratio": 0.005 }
     ]
-  }
+  },
+  {
+    "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.05 },
+      { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "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": "skin", "mass_ratio": 0.00035 }
+    ]
+  },
+  {
+    "id": "mammal_large_fur",
+    "//": "vanilla override, includes adrenal gland",
+    "type": "harvest",
+    "entries": [
+      { "drop": "meat", "type": "flesh", "mass_ratio": 0.32 },
+      { "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": "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", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 2, "type": "offal" }
+    ]
+  },
+  {
+    "id": "mammal_large_leather",
+    "//": "vanilla override, includes adrenal gland",
+    "type": "harvest",
+    "entries": [
+      { "drop": "meat", "type": "flesh", "mass_ratio": 0.32 },
+      { "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": "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", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 2, "type": "offal" }
+    ]
+  },
+  {
+    "id": "mammal_large_wool",
+    "//": "drops large stomach",
+    "type": "harvest",
+    "entries": [
+      { "drop": "meat", "type": "flesh", "mass_ratio": 0.32 },
+      { "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": "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", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 2, "type": "offal" }
+    ]
+  },
+  {
+    "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.32 },
+      { "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": "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", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 2, "type": "offal" }
+    ]
+  },
 ]
diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json
index 4e6bc455243e4..2bba579eaf2ca 100644
--- a/data/mods/Magiclysm/items/alchemy_items.json
+++ b/data/mods/Magiclysm/items/alchemy_items.json
@@ -107,5 +107,14 @@
   "type": "COMESTIBLE",
   "name": "potion starter",
   "description": "Strong alcohol, infused with mana and concentrated into a liquid that can stabilize spells into liquid form. You can still drink it, if you want."
+  },
+  {
+  "id": "adrenal_gland_large",
+  "copy-from": "meat",
+  "name": "large adrenal gland",
+  "name_plural": "large adrenal glands",
+  "description": "An organ located above the kidneys responsible for secretion of adrenaline, cortisol, and aldosterone. This one is huge, whether by nature or mutation.",
+  "delete": { "flags": [ "SMOKABLE" ] },
+  "price": 2000
   }
 ]
diff --git a/data/mods/Magiclysm/recipes/recipe_potions.json b/data/mods/Magiclysm/recipes/recipe_potions.json
index 8d78726e76625..3b8eef312f63d 100644
--- a/data/mods/Magiclysm/recipes/recipe_potions.json
+++ b/data/mods/Magiclysm/recipes/recipe_potions.json
@@ -59,9 +59,8 @@
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
     "components": [ [
     [ "potion_starter", 5 ] ],
-    [ [ "hairball", 2 ] ],
-    [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
-    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ] ]
+    [ [ "sinew", 40 ] ],
+    [ "adrenal_gland_large", 2 ] ]
   },
   {
     "type": "recipe",
@@ -78,9 +77,9 @@
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
     "components": [ [
     [ "potion_starter", 5 ] ],
-    [ [ "hairball", 2 ] ],
-    [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
-    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ] ]
+    [ [ "egg_bird", 5 ], [ "egg_grouse", 5 ], [ "egg_duck", 3 ], [ "egg_crow", 5 ], [ "egg_chicken", 5 ], [ "egg_pheasant", 5 ], [ "egg_cockatrice", 5 ], [ "egg_reptile", 5 ], [ "egg_turkey", 3 ] [ "egg_goose_canadian", 2 ] ],
+    [ [ "feather", 20 ], [ "down_feather", 20 ] ],
+    [ [ "liver", 3 ], [ "veggy_canned", 3 ], [ "veggy_salted", 5 ], [ "carrot", 3 ], [ "irradiated_carrot", 3 ], [ "pumpkin", 4 ], [ "irradiated_pumpkin", 4 ], [ "raw_dandelion", 6 ], [ "zucchini", 4 ], [ "irradiated_zucchini", 4 ], [ "rose_hips", 6 ] ] ]
   },
   {
     "type": "recipe",
@@ -97,8 +96,7 @@
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
     "components": [ [
     [ "potion_starter", 5 ] ],
-    [ [ "hairball", 2 ] ],
-    [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
-    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ] ]
+    [ [ "brain", 2 ], [ "brain_cooked", 2 ], [ "brain_fried", 2 ] ],
+    [ [ "addreall", 10 ], [ "caff_gum", 30 ], [ "chaw", 10 ], [ "cig", 20 ], [ "cigar", 5 ], [ "handrolled_cig", 20 ] ] ]
   }
 ]
\ No newline at end of file

From 83c745c4a82c36938eefa0255e411701216ae681 Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Thu, 4 Jul 2019 21:42:10 -0400
Subject: [PATCH 03/13] Alchemist rune now a craft, Cat's potion fixed

---
 data/mods/Magiclysm/Spells/classless.json     | 20 -------------------
 data/mods/Magiclysm/recipes/magic_tools.json  | 18 ++++++++++++++---
 .../Magiclysm/recipes/recipe_potions.json     |  3 ++-
 data/mods/Magiclysm/traits/classes.json       |  3 ++-
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/data/mods/Magiclysm/Spells/classless.json b/data/mods/Magiclysm/Spells/classless.json
index c40a1ef9246d5..98ec74b25bc6f 100644
--- a/data/mods/Magiclysm/Spells/classless.json
+++ b/data/mods/Magiclysm/Spells/classless.json
@@ -125,26 +125,6 @@
     "max_duration": 50000,
     "duration_increment": 3000
   },
-  {
-    "id": "create_rune_alchemist",
-    "type": "SPELL",
-    "name": "Alchemist Rune",
-    "description": "This ritual creates a small pebble attuned to alchemy itself. This rune can substitute for the eight school runes in basic recipes.",
-    "valid_targets": [ "self" ],
-    "min_damage": 1,
-    "max_damage": 1,
-    "effect": "spawn_item",
-    "effect_str": "rune_alchemist",
-    "base_casting_time": 5000,
-    "base_energy_cost": 500,
-    "min_duration": 1,
-    "max_duration": 2,
-    "duration_increment": 1,
-    "difficulty": 7,
-    "max_level": 1,
-    "energy_source": "MANA",
-    "flags": [ "PERMANENT", "NO_LEGS", "CONCENTRATE" ]
-  },
   {
     "id": "translocate_self",
     "type": "SPELL",
diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json
index eff801ace227a..f69c9df342cde 100644
--- a/data/mods/Magiclysm/recipes/magic_tools.json
+++ b/data/mods/Magiclysm/recipes/magic_tools.json
@@ -33,8 +33,8 @@
   {
   "type": "recipe",
     "result": "copper_infuser",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_TOOLS",
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_TOOLS",
     "skill_used": "fabrication",
     "skills_required": [ "spellcraft", 2 ],
     "difficulty": 3,
@@ -43,6 +43,18 @@
     "qualities": [ { "id": "CHISEL", "level": 1 } ],
     "components": [ [
      [ "copper_bracelet", 1 ] ] ]
-  }
+  },
+  {
+  "type": "recipe",
+    "result": "rune_alchemist",
+    "category": "CC_ENCHANTED",
+    "subcategory": "CSC_ENCHANTED_TOOLS",
+    "skill_used": "fabrication",
+    "skills_required": [ "spellcraft", 4 ],
+    "difficulty": 4,
+    "time": "120m",
+    "autolearn": true,
+    "qualities": [ { "id": "CHISEL", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ]
+   } 
 ]
 
diff --git a/data/mods/Magiclysm/recipes/recipe_potions.json b/data/mods/Magiclysm/recipes/recipe_potions.json
index 3b8eef312f63d..e9a98d42a29a8 100644
--- a/data/mods/Magiclysm/recipes/recipe_potions.json
+++ b/data/mods/Magiclysm/recipes/recipe_potions.json
@@ -42,7 +42,8 @@
     [ "potion_starter", 5 ] ],
     [ [ "hairball", 2 ] ],
     [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
-    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ] ]
+    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ],
+    [ [ "adderall", 10 ], [ "meth", 6 ], [ "prozac", 15 ] ] ]
   },
   {
     "type": "recipe",
diff --git a/data/mods/Magiclysm/traits/classes.json b/data/mods/Magiclysm/traits/classes.json
index 71ac24e3edaac..62f2da7591ea2 100644
--- a/data/mods/Magiclysm/traits/classes.json
+++ b/data/mods/Magiclysm/traits/classes.json
@@ -8,7 +8,8 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "cancels": [ "ANIMIST" ]
+    "cancels": [ "ANIMIST" ],
+    "spell_learned": [ [ "create_rune_magus", 1 ] ]
   },
   {
     "type": "mutation",

From e6b327fbf7ee3bbba0399636adf79e0c2a8c5e3e Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Thu, 4 Jul 2019 21:43:33 -0400
Subject: [PATCH 04/13] Alchemist rune craft difficulty adjustment

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

diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json
index f69c9df342cde..9328cbe93e1df 100644
--- a/data/mods/Magiclysm/recipes/magic_tools.json
+++ b/data/mods/Magiclysm/recipes/magic_tools.json
@@ -50,8 +50,8 @@
     "category": "CC_ENCHANTED",
     "subcategory": "CSC_ENCHANTED_TOOLS",
     "skill_used": "fabrication",
-    "skills_required": [ "spellcraft", 4 ],
-    "difficulty": 4,
+    "skills_required": [ "spellcraft", 5 ],
+    "difficulty": 2,
     "time": "120m",
     "autolearn": true,
     "qualities": [ { "id": "CHISEL", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ]

From a0b695c0d682efec166c25850959407ae59c3e1f Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Thu, 4 Jul 2019 22:14:52 -0400
Subject: [PATCH 05/13] Alchemist rune craft diff. adjustment 2

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

diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json
index 9328cbe93e1df..df0124efb3173 100644
--- a/data/mods/Magiclysm/recipes/magic_tools.json
+++ b/data/mods/Magiclysm/recipes/magic_tools.json
@@ -50,7 +50,7 @@
     "category": "CC_ENCHANTED",
     "subcategory": "CSC_ENCHANTED_TOOLS",
     "skill_used": "fabrication",
-    "skills_required": [ "spellcraft", 5 ],
+    "skills_required": [ "spellcraft", 4 ],
     "difficulty": 2,
     "time": "120m",
     "autolearn": true,

From c5e5cb1cc2b8aaab16658b8bfd539fb809f39954 Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Fri, 5 Jul 2019 00:19:07 -0400
Subject: [PATCH 06/13] Typos, harvesting, and rune fix

---
 data/mods/Magiclysm/harvest.json              | 12 +++++-----
 data/mods/Magiclysm/items/alchemy_items.json  |  1 +
 data/mods/Magiclysm/items/comestibles.json    | 10 +++++---
 data/mods/Magiclysm/recipes/magic_tools.json  |  7 +++---
 .../Magiclysm/recipes/recipe_potions.json     | 10 ++++----
 data/mods/Magiclysm/traits/classes.json       | 23 ++++++++++++-------
 6 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/data/mods/Magiclysm/harvest.json b/data/mods/Magiclysm/harvest.json
index 3af3f278da5da..7f0de2a567612 100644
--- a/data/mods/Magiclysm/harvest.json
+++ b/data/mods/Magiclysm/harvest.json
@@ -55,7 +55,7 @@
       { "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": "skin", "mass_ratio": 0.00035 }
+      { "drop": "hairball", "type": "bionic", "max": 3 }
     ]
   },
   {
@@ -75,7 +75,7 @@
       { "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", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 2, "type": "offal" }
+      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
     ]
   },
   {
@@ -95,7 +95,7 @@
       { "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", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 2, "type": "offal" }
+      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
     ]
   },
   {
@@ -115,7 +115,7 @@
       { "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", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 2, "type": "offal" }
+      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
     ]
   },
   {
@@ -134,7 +134,7 @@
       { "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", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 2, "type": "offal" }
+      { "drop": "adrenal_gland_large", "type": "bionic", "max": 2 }
     ]
-  },
+  }
 ]
diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json
index 2bba579eaf2ca..ceb223a3a34a0 100644
--- a/data/mods/Magiclysm/items/alchemy_items.json
+++ b/data/mods/Magiclysm/items/alchemy_items.json
@@ -111,6 +111,7 @@
   {
   "id": "adrenal_gland_large",
   "copy-from": "meat",
+  "type": "COMESTIBLE",
   "name": "large adrenal gland",
   "name_plural": "large adrenal glands",
   "description": "An organ located above the kidneys responsible for secretion of adrenaline, cortisol, and aldosterone. This one is huge, whether by nature or mutation.",
diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json
index 31eabf275dba8..baaefa683721a 100644
--- a/data/mods/Magiclysm/items/comestibles.json
+++ b/data/mods/Magiclysm/items/comestibles.json
@@ -35,8 +35,12 @@
   },
   {
   "id": "hairball",
-  "type": "COMESTIBLE"
-  "material": "fur",
+  "type": "COMESTIBLE",
+  "comestible_type": "MED",
+  "healthy": -1,
+  "stack_size": 1,
+  "material": [ "fur", "water" ],
+  "primary_material": "fur",
   "volume": "5ml",
   "weight": 15,
   "color": "brown",
@@ -45,7 +49,7 @@
   "name_plural": "hairballs",
   "description": "An ugly ball of animal spit and licked-off hairs. Don't swallow it.",
   "price": 0,
-  "flags": [ "TRADER_AVOID" ],
+  "flags": [ "TRADER_AVOID", "EDIBLE_FROZEN" ],
   "fun": -20
   }
 ]
diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json
index df0124efb3173..41efd6e0395c9 100644
--- a/data/mods/Magiclysm/recipes/magic_tools.json
+++ b/data/mods/Magiclysm/recipes/magic_tools.json
@@ -28,7 +28,7 @@
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ],
     "components": [ [
     [ "rock", 1 ], [ "sharp_rock", 1 ] ],
-    [ [ "stick", 1 ], [ "2x4", 1 ] ]
+    [ [ "stick", 1 ], [ "2x4", 1 ] ] ]
   },
   {
   "type": "recipe",
@@ -39,7 +39,7 @@
     "skills_required": [ "spellcraft", 2 ],
     "difficulty": 3,
     "time": "20 m",
-    "book_learn": [ [ "alchemy_basic", 4 ], 
+    "book_learn": [ [ "alchemy_basic", 4 ] ], 
     "qualities": [ { "id": "CHISEL", "level": 1 } ],
     "components": [ [
      [ "copper_bracelet", 1 ] ] ]
@@ -54,7 +54,8 @@
     "difficulty": 2,
     "time": "120m",
     "autolearn": true,
-    "qualities": [ { "id": "CHISEL", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ]
+    "qualities": [ { "id": "CHISEL", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
+    "components" : [ [ [ "pebble", 1 ] ] ]
    } 
 ]
 
diff --git a/data/mods/Magiclysm/recipes/recipe_potions.json b/data/mods/Magiclysm/recipes/recipe_potions.json
index e9a98d42a29a8..ec9238183469e 100644
--- a/data/mods/Magiclysm/recipes/recipe_potions.json
+++ b/data/mods/Magiclysm/recipes/recipe_potions.json
@@ -42,7 +42,7 @@
     [ "potion_starter", 5 ] ],
     [ [ "hairball", 2 ] ],
     [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
-    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "canned_herring", 1 ], [ "lutefisk", 1 ] ],
+    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "lutefisk", 1 ] ],
     [ [ "adderall", 10 ], [ "meth", 6 ], [ "prozac", 15 ] ] ]
   },
   {
@@ -61,7 +61,7 @@
     "components": [ [
     [ "potion_starter", 5 ] ],
     [ [ "sinew", 40 ] ],
-    [ "adrenal_gland_large", 2 ] ]
+    [ [ "adrenal_gland_large", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -78,7 +78,7 @@
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
     "components": [ [
     [ "potion_starter", 5 ] ],
-    [ [ "egg_bird", 5 ], [ "egg_grouse", 5 ], [ "egg_duck", 3 ], [ "egg_crow", 5 ], [ "egg_chicken", 5 ], [ "egg_pheasant", 5 ], [ "egg_cockatrice", 5 ], [ "egg_reptile", 5 ], [ "egg_turkey", 3 ] [ "egg_goose_canadian", 2 ] ],
+    [ [ "egg_bird", 5 ], [ "egg_grouse", 5 ], [ "egg_duck", 3 ], [ "egg_crow", 5 ], [ "egg_chicken", 5 ], [ "egg_pheasant", 5 ], [ "egg_cockatrice", 5 ], [ "egg_reptile", 5 ], [ "egg_turkey", 3 ], [ "egg_goose_canadian", 2 ] ],
     [ [ "feather", 20 ], [ "down_feather", 20 ] ],
     [ [ "liver", 3 ], [ "veggy_canned", 3 ], [ "veggy_salted", 5 ], [ "carrot", 3 ], [ "irradiated_carrot", 3 ], [ "pumpkin", 4 ], [ "irradiated_pumpkin", 4 ], [ "raw_dandelion", 6 ], [ "zucchini", 4 ], [ "irradiated_zucchini", 4 ], [ "rose_hips", 6 ] ] ]
   },
@@ -97,7 +97,7 @@
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
     "components": [ [
     [ "potion_starter", 5 ] ],
-    [ [ "brain", 2 ], [ "brain_cooked", 2 ], [ "brain_fried", 2 ] ],
-    [ [ "addreall", 10 ], [ "caff_gum", 30 ], [ "chaw", 10 ], [ "cig", 20 ], [ "cigar", 5 ], [ "handrolled_cig", 20 ] ] ]
+    [ [ "brain", 2 ], [ "brain_cooked", 2 ] ],
+    [ [ "adderall", 10 ], [ "caff_gum", 30 ], [ "chaw", 10 ], [ "cig", 20 ], [ "cigar", 5 ], [ "handrolled_cig", 20 ] ] ]
   }
 ]
\ No newline at end of file
diff --git a/data/mods/Magiclysm/traits/classes.json b/data/mods/Magiclysm/traits/classes.json
index 62f2da7591ea2..17a88db05ecc7 100644
--- a/data/mods/Magiclysm/traits/classes.json
+++ b/data/mods/Magiclysm/traits/classes.json
@@ -9,7 +9,7 @@
     "purifiable": false,
     "valid": false,
     "cancels": [ "ANIMIST" ],
-    "spell_learned": [ [ "create_rune_magus", 1 ] ]
+    "spells_learned": [ [ "create_rune_magus", 1 ] ]
   },
   {
     "type": "mutation",
@@ -20,7 +20,8 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "cancels": [ "MAGUS" ]
+    "cancels": [ "MAGUS" ],
+    "spells_learned": [ [ "create_rune_animist", 1 ] ]
   },
   {
     "type": "mutation",
@@ -31,7 +32,8 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "cancels": [ "STORMSHAPER" ]
+    "cancels": [ "STORMSHAPER" ],
+    "spells_learned": [ [ "create_rune_kelvinist", 1 ] ]
   },
   {
     "type": "mutation",
@@ -42,7 +44,8 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "cancels": [ "KELVINIST" ]
+    "cancels": [ "KELVINIST" ],
+    "spells_learned": [ [ "create_rune_stormshaper", 1 ] ]
   },
   {
     "type": "mutation",
@@ -53,7 +56,8 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "cancels": [ "EARTHSHAPER" ]
+    "cancels": [ "EARTHSHAPER" ],
+    "spells_learned": [ [ "create_rune_technomancer", 1 ] ]
   },
   {
     "type": "mutation",
@@ -64,7 +68,8 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "cancels": [ "TECHNOMANCER" ]
+    "cancels": [ "TECHNOMANCER" ],
+    "spells_learned": [ [ "create_rune_earthshaper", 1 ] ]
   },
   {
     "type": "mutation",
@@ -75,7 +80,8 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "cancels": [ "DRUID" ]
+    "cancels": [ "DRUID" ],
+    "spells_learned": [ [ "create_rune_biomancer", 1 ] ]
   },
   {
     "type": "mutation",
@@ -86,6 +92,7 @@
     "starting_trait": false,
     "purifiable": false,
     "valid": false,
-    "cancels": [ "BIOMANCER" ]
+    "cancels": [ "BIOMANCER" ],
+    "spells_learned": [ [ "create_rune_druid", 1 ] ]
   }
 ]

From 9accb915b0332159a3961839793dafb35b4040cb Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Fri, 5 Jul 2019 00:25:16 -0400
Subject: [PATCH 07/13] Linting

---
 data/mods/Magiclysm/items/alchemy_items.json  | 26 +++---
 data/mods/Magiclysm/items/comestibles.json    | 34 +++----
 data/mods/Magiclysm/recipes/magic_tools.json  | 26 ++----
 .../Magiclysm/recipes/recipe_potions.json     | 91 ++++++++++++++-----
 4 files changed, 107 insertions(+), 70 deletions(-)

diff --git a/data/mods/Magiclysm/items/alchemy_items.json b/data/mods/Magiclysm/items/alchemy_items.json
index ceb223a3a34a0..b91f241b3e021 100644
--- a/data/mods/Magiclysm/items/alchemy_items.json
+++ b/data/mods/Magiclysm/items/alchemy_items.json
@@ -102,20 +102,20 @@
     "fun": 1
   },
   {
-  "id": "potion_starter",
-  "copy-from": "mixed_alcohol_strong",
-  "type": "COMESTIBLE",
-  "name": "potion starter",
-  "description": "Strong alcohol, infused with mana and concentrated into a liquid that can stabilize spells into liquid form. You can still drink it, if you want."
+    "id": "potion_starter",
+    "copy-from": "mixed_alcohol_strong",
+    "type": "COMESTIBLE",
+    "name": "potion starter",
+    "description": "Strong alcohol, infused with mana and concentrated into a liquid that can stabilize spells into liquid form. You can still drink it, if you want."
   },
   {
-  "id": "adrenal_gland_large",
-  "copy-from": "meat",
-  "type": "COMESTIBLE",
-  "name": "large adrenal gland",
-  "name_plural": "large adrenal glands",
-  "description": "An organ located above the kidneys responsible for secretion of adrenaline, cortisol, and aldosterone. This one is huge, whether by nature or mutation.",
-  "delete": { "flags": [ "SMOKABLE" ] },
-  "price": 2000
+    "id": "adrenal_gland_large",
+    "copy-from": "meat",
+    "type": "COMESTIBLE",
+    "name": "large adrenal gland",
+    "name_plural": "large adrenal glands",
+    "description": "An organ located above the kidneys responsible for secretion of adrenaline, cortisol, and aldosterone. This one is huge, whether by nature or mutation.",
+    "delete": { "flags": [ "SMOKABLE" ] },
+    "price": 2000
   }
 ]
diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json
index baaefa683721a..6bcbb16cc147f 100644
--- a/data/mods/Magiclysm/items/comestibles.json
+++ b/data/mods/Magiclysm/items/comestibles.json
@@ -34,22 +34,22 @@
     "description": "The liquid innards of an owlbear egg.  Good eating."
   },
   {
-  "id": "hairball",
-  "type": "COMESTIBLE",
-  "comestible_type": "MED",
-  "healthy": -1,
-  "stack_size": 1,
-  "material": [ "fur", "water" ],
-  "primary_material": "fur",
-  "volume": "5ml",
-  "weight": 15,
-  "color": "brown",
-  "symbol": "0",
-  "name": "hairball",
-  "name_plural": "hairballs",
-  "description": "An ugly ball of animal spit and licked-off hairs. Don't swallow it.",
-  "price": 0,
-  "flags": [ "TRADER_AVOID", "EDIBLE_FROZEN" ],
-  "fun": -20
+    "id": "hairball",
+    "type": "COMESTIBLE",
+    "comestible_type": "MED",
+    "healthy": -1,
+    "stack_size": 1,
+    "material": [ "fur", "water" ],
+    "primary_material": "fur",
+    "volume": "5ml",
+    "weight": 15,
+    "color": "brown",
+    "symbol": "0",
+    "name": "hairball",
+    "name_plural": "hairballs",
+    "description": "An ugly ball of animal spit and licked-off hairs. Don't swallow it.",
+    "price": 0,
+    "flags": [ "TRADER_AVOID", "EDIBLE_FROZEN" ],
+    "fun": -20
   }
 ]
diff --git a/data/mods/Magiclysm/recipes/magic_tools.json b/data/mods/Magiclysm/recipes/magic_tools.json
index 41efd6e0395c9..27ee31c86c44b 100644
--- a/data/mods/Magiclysm/recipes/magic_tools.json
+++ b/data/mods/Magiclysm/recipes/magic_tools.json
@@ -1,5 +1,5 @@
 [
-{
+  {
     "type": "recipe",
     "result": "copper_circlet",
     "byproducts": [ [ "tinder", 40 ] ],
@@ -12,12 +12,10 @@
     "autolearn": true,
     "qualities": [ { "id": "HAMMER_FINE", "level": 1 }, { "id": "CUT_FINE", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [ [
-    [ "scrap_copper", 1 ], [ "copper", 100 ]    
-    ], [ [ "splinter", 3 ] ] ]
+    "components": [ [ [ "scrap_copper", 1 ], [ "copper", 100 ] ], [ [ "splinter", 3 ] ] ]
   },
   {
-  "type": "recipe",
+    "type": "recipe",
     "result": "stone_chisel",
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_TOOLS",
@@ -26,12 +24,10 @@
     "time": "20 m",
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ],
-    "components": [ [
-    [ "rock", 1 ], [ "sharp_rock", 1 ] ],
-    [ [ "stick", 1 ], [ "2x4", 1 ] ] ]
+    "components": [ [ [ "rock", 1 ], [ "sharp_rock", 1 ] ], [ [ "stick", 1 ], [ "2x4", 1 ] ] ]
   },
   {
-  "type": "recipe",
+    "type": "recipe",
     "result": "copper_infuser",
     "category": "CC_ENCHANTED",
     "subcategory": "CSC_ENCHANTED_TOOLS",
@@ -39,13 +35,12 @@
     "skills_required": [ "spellcraft", 2 ],
     "difficulty": 3,
     "time": "20 m",
-    "book_learn": [ [ "alchemy_basic", 4 ] ], 
+    "book_learn": [ [ "alchemy_basic", 4 ] ],
     "qualities": [ { "id": "CHISEL", "level": 1 } ],
-    "components": [ [
-     [ "copper_bracelet", 1 ] ] ]
+    "components": [ [ [ "copper_bracelet", 1 ] ] ]
   },
   {
-  "type": "recipe",
+    "type": "recipe",
     "result": "rune_alchemist",
     "category": "CC_ENCHANTED",
     "subcategory": "CSC_ENCHANTED_TOOLS",
@@ -55,7 +50,6 @@
     "time": "120m",
     "autolearn": true,
     "qualities": [ { "id": "CHISEL", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
-    "components" : [ [ [ "pebble", 1 ] ] ]
-   } 
+    "components": [ [ [ "pebble", 1 ] ] ]
+  }
 ]
-
diff --git a/data/mods/Magiclysm/recipes/recipe_potions.json b/data/mods/Magiclysm/recipes/recipe_potions.json
index ec9238183469e..bdb0c23665e0d 100644
--- a/data/mods/Magiclysm/recipes/recipe_potions.json
+++ b/data/mods/Magiclysm/recipes/recipe_potions.json
@@ -1,5 +1,5 @@
 [
-   {
+  {
     "type": "recipe",
     "result": "potion_starter",
     "category": "CC_ENCHANTED",
@@ -13,7 +13,8 @@
     "book_learn": [ [ "alchemy_basic", 3 ] ],
     "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [ [
+    "components": [
+      [
         [ "gin", 7 ],
         [ "rum", 7 ],
         [ "single_malt_whiskey", 7 ],
@@ -22,8 +23,9 @@
         [ "vodka", 7 ],
         [ "whiskey", 7 ],
         [ "brandy", 7 ],
-        [ "mixed_alcohol_strong",7 ]
-      ] ]
+        [ "mixed_alcohol_strong", 7 ]
+      ]
+    ]
   },
   {
     "type": "recipe",
@@ -38,12 +40,24 @@
     "book_learn": [ [ "alchemy_basic", 4 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
-    "components": [ [
-    [ "potion_starter", 5 ] ],
-    [ [ "hairball", 2 ] ],
-    [ [ "catfood", 1 ], [ "fish", 1 ], [ "salted_fish", 1 ], [ "fish_cooked", 1 ],[ "fish_smoked", 1 ],[ "dry_fish", 1 ], [ "rehydrated_fish", 1 ], [ "fish_canned", 1 ],
-    [ "fish_pickled", 1 ], [ "fish_fried", 1 ], [ "lutefisk", 1 ] ],
-    [ [ "adderall", 10 ], [ "meth", 6 ], [ "prozac", 15 ] ] ]
+    "components": [
+      [ [ "potion_starter", 5 ] ],
+      [ [ "hairball", 2 ] ],
+      [
+        [ "catfood", 1 ],
+        [ "fish", 1 ],
+        [ "salted_fish", 1 ],
+        [ "fish_cooked", 1 ],
+        [ "fish_smoked", 1 ],
+        [ "dry_fish", 1 ],
+        [ "rehydrated_fish", 1 ],
+        [ "fish_canned", 1 ],
+        [ "fish_pickled", 1 ],
+        [ "fish_fried", 1 ],
+        [ "lutefisk", 1 ]
+      ],
+      [ [ "adderall", 10 ], [ "meth", 6 ], [ "prozac", 15 ] ]
+    ]
   },
   {
     "type": "recipe",
@@ -58,10 +72,7 @@
     "book_learn": [ [ "alchemy_basic", 4 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
-    "components": [ [
-    [ "potion_starter", 5 ] ],
-    [ [ "sinew", 40 ] ],
-    [ [ "adrenal_gland_large", 2 ] ] ]
+    "components": [ [ [ "potion_starter", 5 ] ], [ [ "sinew", 40 ] ], [ [ "adrenal_gland_large", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -76,11 +87,35 @@
     "book_learn": [ [ "alchemy_basic", 4 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
-    "components": [ [
-    [ "potion_starter", 5 ] ],
-    [ [ "egg_bird", 5 ], [ "egg_grouse", 5 ], [ "egg_duck", 3 ], [ "egg_crow", 5 ], [ "egg_chicken", 5 ], [ "egg_pheasant", 5 ], [ "egg_cockatrice", 5 ], [ "egg_reptile", 5 ], [ "egg_turkey", 3 ], [ "egg_goose_canadian", 2 ] ],
-    [ [ "feather", 20 ], [ "down_feather", 20 ] ],
-    [ [ "liver", 3 ], [ "veggy_canned", 3 ], [ "veggy_salted", 5 ], [ "carrot", 3 ], [ "irradiated_carrot", 3 ], [ "pumpkin", 4 ], [ "irradiated_pumpkin", 4 ], [ "raw_dandelion", 6 ], [ "zucchini", 4 ], [ "irradiated_zucchini", 4 ], [ "rose_hips", 6 ] ] ]
+    "components": [
+      [ [ "potion_starter", 5 ] ],
+      [
+        [ "egg_bird", 5 ],
+        [ "egg_grouse", 5 ],
+        [ "egg_duck", 3 ],
+        [ "egg_crow", 5 ],
+        [ "egg_chicken", 5 ],
+        [ "egg_pheasant", 5 ],
+        [ "egg_cockatrice", 5 ],
+        [ "egg_reptile", 5 ],
+        [ "egg_turkey", 3 ],
+        [ "egg_goose_canadian", 2 ]
+      ],
+      [ [ "feather", 20 ], [ "down_feather", 20 ] ],
+      [
+        [ "liver", 3 ],
+        [ "veggy_canned", 3 ],
+        [ "veggy_salted", 5 ],
+        [ "carrot", 3 ],
+        [ "irradiated_carrot", 3 ],
+        [ "pumpkin", 4 ],
+        [ "irradiated_pumpkin", 4 ],
+        [ "raw_dandelion", 6 ],
+        [ "zucchini", 4 ],
+        [ "irradiated_zucchini", 4 ],
+        [ "rose_hips", 6 ]
+      ]
+    ]
   },
   {
     "type": "recipe",
@@ -95,9 +130,17 @@
     "book_learn": [ [ "alchemy_basic", 4 ] ],
     "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_FOCUS", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "rune_alchemist", -1 ], [ "rune_magus", -1 ] ] ],
-    "components": [ [
-    [ "potion_starter", 5 ] ],
-    [ [ "brain", 2 ], [ "brain_cooked", 2 ] ],
-    [ [ "adderall", 10 ], [ "caff_gum", 30 ], [ "chaw", 10 ], [ "cig", 20 ], [ "cigar", 5 ], [ "handrolled_cig", 20 ] ] ]
+    "components": [
+      [ [ "potion_starter", 5 ] ],
+      [ [ "brain", 2 ], [ "brain_cooked", 2 ] ],
+      [
+        [ "adderall", 10 ],
+        [ "caff_gum", 30 ],
+        [ "chaw", 10 ],
+        [ "cig", 20 ],
+        [ "cigar", 5 ],
+        [ "handrolled_cig", 20 ]
+      ]
+    ]
   }
-]
\ No newline at end of file
+]

From fa82fb0291783e680bf2f9e7bc490d243522b3bd Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Fri, 5 Jul 2019 08:20:12 -0400
Subject: [PATCH 08/13] Potion starter now uses hard_liquor requirement

---
 data/mods/Magiclysm/recipes/recipe_potions.json | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/data/mods/Magiclysm/recipes/recipe_potions.json b/data/mods/Magiclysm/recipes/recipe_potions.json
index bdb0c23665e0d..31f4170a00d6c 100644
--- a/data/mods/Magiclysm/recipes/recipe_potions.json
+++ b/data/mods/Magiclysm/recipes/recipe_potions.json
@@ -13,19 +13,7 @@
     "book_learn": [ [ "alchemy_basic", 3 ] ],
     "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "CONCENTRATE", "level": 1 }, { "id": "MANA_INFUSE", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [
-      [
-        [ "gin", 7 ],
-        [ "rum", 7 ],
-        [ "single_malt_whiskey", 7 ],
-        [ "tequila", 7 ],
-        [ "triple_sec", 7 ],
-        [ "vodka", 7 ],
-        [ "whiskey", 7 ],
-        [ "brandy", 7 ],
-        [ "mixed_alcohol_strong", 7 ]
-      ]
-    ]
+    "using": [ [ "hard_liquor", 7 ] ]
   },
   {
     "type": "recipe",

From e8b888ff0ed2f4d86109bd95044d107228ec546a Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Fri, 5 Jul 2019 08:23:50 -0400
Subject: [PATCH 09/13] No reptile eggs for bird potions

---
 data/mods/Magiclysm/recipes/recipe_potions.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/mods/Magiclysm/recipes/recipe_potions.json b/data/mods/Magiclysm/recipes/recipe_potions.json
index 31f4170a00d6c..1cd2c9b7072c8 100644
--- a/data/mods/Magiclysm/recipes/recipe_potions.json
+++ b/data/mods/Magiclysm/recipes/recipe_potions.json
@@ -85,7 +85,6 @@
         [ "egg_chicken", 5 ],
         [ "egg_pheasant", 5 ],
         [ "egg_cockatrice", 5 ],
-        [ "egg_reptile", 5 ],
         [ "egg_turkey", 3 ],
         [ "egg_goose_canadian", 2 ]
       ],

From de1777f1b075a44dd6b58eb55d505a7a5247b398 Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Fri, 5 Jul 2019 09:03:48 -0400
Subject: [PATCH 10/13] Hairball size increased

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

diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json
index 6bcbb16cc147f..70575f9a2ff38 100644
--- a/data/mods/Magiclysm/items/comestibles.json
+++ b/data/mods/Magiclysm/items/comestibles.json
@@ -41,13 +41,13 @@
     "stack_size": 1,
     "material": [ "fur", "water" ],
     "primary_material": "fur",
-    "volume": "5ml",
+    "volume": "35ml",
     "weight": 15,
     "color": "brown",
     "symbol": "0",
     "name": "hairball",
     "name_plural": "hairballs",
-    "description": "An ugly ball of animal spit and licked-off hairs. Don't swallow it.",
+    "description": "A large, ugly ball of animal spit and licked-off hairs. Don't swallow it.",
     "price": 0,
     "flags": [ "TRADER_AVOID", "EDIBLE_FROZEN" ],
     "fun": -20

From ad57f2c10aa807fb9efc29b0b1404dcbe2cd2ac3 Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Fri, 5 Jul 2019 09:04:15 -0400
Subject: [PATCH 11/13] Missing 0

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

diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json
index 70575f9a2ff38..015bb62f965e1 100644
--- a/data/mods/Magiclysm/items/comestibles.json
+++ b/data/mods/Magiclysm/items/comestibles.json
@@ -41,13 +41,13 @@
     "stack_size": 1,
     "material": [ "fur", "water" ],
     "primary_material": "fur",
-    "volume": "35ml",
+    "volume": "350ml",
     "weight": 15,
     "color": "brown",
     "symbol": "0",
     "name": "hairball",
     "name_plural": "hairballs",
-    "description": "A large, ugly ball of animal spit and licked-off hairs. Don't swallow it.",
+    "description": "A big ugly ball of animal spit and licked-off hairs. Don't swallow it.",
     "price": 0,
     "flags": [ "TRADER_AVOID", "EDIBLE_FROZEN" ],
     "fun": -20

From 8bc98198b697112b5fa3bf274f220a614e96903b Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Fri, 5 Jul 2019 09:11:34 -0400
Subject: [PATCH 12/13] Update data/mods/Magiclysm/items/comestibles.json

GitHub desktop won't push chance to hairball volume

From f27d97ae9fabf989160ebdb2bf98937aae02708e Mon Sep 17 00:00:00 2001
From: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
Date: Fri, 5 Jul 2019 09:13:08 -0400
Subject: [PATCH 13/13] Typo

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

diff --git a/data/mods/Magiclysm/items/comestibles.json b/data/mods/Magiclysm/items/comestibles.json
index 015bb62f965e1..f7f231a41868c 100644
--- a/data/mods/Magiclysm/items/comestibles.json
+++ b/data/mods/Magiclysm/items/comestibles.json
@@ -47,7 +47,7 @@
     "symbol": "0",
     "name": "hairball",
     "name_plural": "hairballs",
-    "description": "A big ugly ball of animal spit and licked-off hairs. Don't swallow it.",
+    "description": "A big, ugly ball of animal spit and licked-off hairs. Don't swallow it.",
     "price": 0,
     "flags": [ "TRADER_AVOID", "EDIBLE_FROZEN" ],
     "fun": -20