From f76aa542d32fc11068ad4e96843bf1fc9a9ac4e4 Mon Sep 17 00:00:00 2001
From: KorGgenT <curtis.r.merrill@gmail.com>
Date: Sat, 4 Apr 2020 20:56:37 -0400
Subject: [PATCH] [magiclysm] add mana siphon trait to manatouched

---
 data/mods/Magiclysm/traits/manatouched.json | 70 +++++++++++++++++++--
 data/mods/Magiclysm/traits/mutation.json    |  2 +-
 2 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/data/mods/Magiclysm/traits/manatouched.json b/data/mods/Magiclysm/traits/manatouched.json
index 5bc70ed2af32c..2f85c682c44b0 100644
--- a/data/mods/Magiclysm/traits/manatouched.json
+++ b/data/mods/Magiclysm/traits/manatouched.json
@@ -30,6 +30,7 @@
     "name": { "str": "Mana Solidification" },
     "points": 1,
     "category": [ "MANATOUCHED" ],
+    "threshreq": [ "THRESH_MANA" ],
     "description": "Your internal ley lines have become much easier for you to control, resulting in you being able to naturally create crystallized mana.",
     "spells_learned": [ [ "manatouched_crystal", 5 ] ]
   },
@@ -43,6 +44,7 @@
     "lumination": [ [ "HAND_R", 8 ], [ "HAND_L", 8 ] ],
     "prereqs": [ "MANA_LUM" ],
     "category": [ "MANATOUCHED" ],
+    "threshreq": [ "THRESH_MANA" ],
     "spells_learned": [ [ "manatouched_seeker_bolts", 0 ] ]
   },
   {
@@ -111,6 +113,7 @@
     "bodytemp_modifiers": [ 100, 100 ],
     "description": "Your body discards unusable mana as light and heat, making you glow softly.",
     "category": [ "MANATOUCHED" ],
+    "threshreq": [ "THRESH_MANA" ],
     "lumination": [ [ "TORSO", 8 ] ]
   },
   {
@@ -121,14 +124,71 @@
   },
   {
     "type": "mutation",
-    "id": "FLIMSY2",
-    "copy-from": "FLIMSY2",
+    "id": "ROT2",
+    "copy-from": "ROT2",
     "extend": { "category": [ "MANATOUCHED" ] }
   },
+  {
+    "id": "sp_mana_siphon",
+    "type": "SPELL",
+    "name": "Mana Siphon",
+    "description": "This is the spell portion of the mana siphon series of mutations.  If you have this spell you probably debugged it in.",
+    "valid_targets": [ "self" ],
+    "min_damage": 5,
+    "damage_increment": 5.0,
+    "max_damage": 180,
+    "max_level": 35,
+    "effect": "recover_energy",
+    "effect_str": "MANA",
+    "flags": [ "SILENT", "NO_LEGS", "NO_HANDS" ]
+  },
+  {
+    "type": "enchantment",
+    "id": "ench_mana_siphon_1",
+    "hit_you_effect": [ { "id": "sp_mana_siphon", "hit_self": true, "once_in": 5, "message": "You recover some mana." } ]
+  },
+  {
+    "type": "enchantment",
+    "id": "ench_mana_siphon_2",
+    "hit_you_effect": [ { "id": "sp_mana_siphon", "hit_self": true, "min_level": 3, "once_in": 5, "message": "You recover some mana." } ]
+  },
+  {
+    "type": "enchantment",
+    "id": "ench_mana_siphon_3",
+    "hit_you_effect": [ { "id": "sp_mana_siphon", "hit_self": true, "min_level": 6, "once_in": 5, "message": "You recover some mana." } ]
+  },
   {
     "type": "mutation",
-    "id": "ROT2",
-    "copy-from": "ROT2",
-    "extend": { "category": [ "MANATOUCHED" ] }
+    "id": "MANA_SIPHON_1",
+    "name": { "str": "Mana Siphon" },
+    "points": 1,
+    "description": "Violence excites your ley lines.  Whenever you hit an enemy in melee, you have a chance of regaining some mana.",
+    "category": [ "MANATOUCHED" ],
+    "threshreq": [ "THRESH_MANA" ],
+    "changes_to": [ "MANA_SIPHON_2" ],
+    "enchantments": [ "ench_mana_siphon_1" ]
+  },
+  {
+    "type": "mutation",
+    "id": "MANA_SIPHON_2",
+    "name": { "str": "Mana Drain" },
+    "points": 2,
+    "description": "Violence excites your ley lines.  Whenever you hit an enemy in melee, you have a chance of regaining some mana.",
+    "category": [ "MANATOUCHED" ],
+    "threshreq": [ "THRESH_MANA" ],
+    "prereqs": [ "MANA_SIPHON_1" ],
+    "changes_to": [ "MANA_SIPHON_3" ],
+    "enchantments": [ "ench_mana_siphon_2" ]
+  },
+  {
+    "type": "mutation",
+    "id": "MANA_SIPHON_3",
+    "name": { "str": "Mana Vortex" },
+    "points": 3,
+    "description": "Violence excites your ley lines.  Whenever you hit an enemy in melee, you have a chance of regaining some mana.",
+    "category": [ "MANATOUCHED" ],
+    "threshreq": [ "THRESH_MANA" ],
+    "prereqs": [ "MANA_SIPHON_2" ],
+    "enchantments": [ "ench_mana_siphon_3" ]
   }
 ]
diff --git a/data/mods/Magiclysm/traits/mutation.json b/data/mods/Magiclysm/traits/mutation.json
index 2ae016be1545d..a1c291829cf9a 100644
--- a/data/mods/Magiclysm/traits/mutation.json
+++ b/data/mods/Magiclysm/traits/mutation.json
@@ -128,7 +128,7 @@
     "prereqs": [ "MANA_REGEN2" ],
     "cancels": [ "BAD_MANA_REGEN1", "BAD_MANA_REGEN2", "BAD_MANA_REGEN3" ],
     "types": [ "MANA_REGEN" ],
-    "threshreq": [ "THRESH_PLANT" ],
+    "threshreq": [ "THRESH_PLANT", "THRESH_MANA" ],
     "category": [ "PLANT", "MANATOUCHED" ],
     "flags": [ "NON_THRESH" ],
     "mana_regen_multiplier": 1.5