From f89ce2132b3f2b1178531a97259b0d0513c4647e Mon Sep 17 00:00:00 2001
From: xiashtra <91220277+xiashtra@users.noreply.github.com>
Date: Tue, 8 Aug 2023 01:34:42 -0400
Subject: [PATCH 1/4] Update BlueMage.json

---
 Definitions/BlueMage.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Definitions/BlueMage.json b/Definitions/BlueMage.json
index 36138c4..5d5fc3a 100644
--- a/Definitions/BlueMage.json
+++ b/Definitions/BlueMage.json
@@ -130,10 +130,14 @@
 { "842" : "Gobskin", "damageshield": { "type": "Potency", "amount": 0 } },
 { "843" : "Magic Hammer", "potency": [ { "type": "damagedonemultiplier", "amount": -10, "limittodamagetype": "magic"} ] },
 { "9C0" : "Chelonian Gate", "potency": [ { "type": "DamageReceivedMultiplier", "amount": -20 }] },
+{ "9C2" : "basic instinct", "potency": [ 
+    { "type": "HealDoneMultiplier", "amount": 100, "limitto": "pom cure,exuviation,stotram,angel's snack,rehydration" },
+    { "type": "damagedonemultiplier", "amount": 100 }
+] },
 { "9C4" : "Dragon Force", "potency": [{"type": "DamageReceivedMultiplier", "amount": -40, "amountbyte": 2}] },
 { "E2F" : "schiltron", "reactiveproc": { "type": "DamageOnDamageReceived", "amount": 0 } },
 { "E34" : "begrimed", "timeproc": { "type": "dot", "potency": "10", "damagetype": "magic", "maxticks": "3" } },
-{ "E35" : "spick-and-span", "timeproc": { "type": "hot", "potency": "0", "maxticks": "5" } },
+{ "E35" : "spick-and-span", "timeproc": { "type": "hot", "potency": "50", "maxticks": "5", "isstacked": true } },
 { "E36" : "force field physical", "potency": [ {"type": "DamageReceivedMultiplier", "amount": -50, "limittodamagetype": "physical"} ] },
 { "E37" : "force field magical", "potency": [ {"type": "DamageReceivedMultiplier", "amount": -50, "limittodamagetype": "magic"} ] },
 { "E39" : "winged redemption", "potency": [ {"type": "damagedonemultiplier", "amount": 100, "limitto": "Conviction Marcato"} ] },

From 585662572d77850985e4e0ec3768060c36ec472b Mon Sep 17 00:00:00 2001
From: xiashtra <91220277+xiashtra@users.noreply.github.com>
Date: Wed, 9 Aug 2023 09:29:52 -0400
Subject: [PATCH 2/4] Update BlueMage.json

---
 Definitions/BlueMage.json | 60 ++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/Definitions/BlueMage.json b/Definitions/BlueMage.json
index 5d5fc3a..e001719 100644
--- a/Definitions/BlueMage.json
+++ b/Definitions/BlueMage.json
@@ -4,7 +4,7 @@
 { "2C78" : "4-tonze weight", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
 { "2C79" : "water cannon", "damage": [ { "potency": 200} ] },
 { "2C7A" : "song of torment", "damage": [ { "potency": 50} ] },
-{ "2C7B" : "high voltage", "damage": [ { "potency": 0} ] },
+{ "2C7B" : "high voltage", "damage": [ { "potency": 90}, { "potency": 180, "targetindex": 0} ] },
 { "2C7D" : "flying frenzy", "damage": [ { "potency": 75}, { "potency": 150, "targetindex": 0} ] },
 { "2C7E" : "aqua breath", "damage": [ { "potency": 70}, { "potency": 140, "targetindex": 0} ] },
 { "2C7F" : "plaincracker", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
@@ -12,19 +12,19 @@
 { "2C83" : "blood drain", "damage": [ { "potency": 50} ] },
 { "2C84" : "bomb toss", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
 { "2C85" : "1000 needles", "damage": [ { "potency": 0} ] },
-{ "2C86" : "drill cannons", "damage": [ { "potency": 0} ] },
+{ "2C86" : "drill cannons", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
 { "2C87" : "the look", "damage": [ { "potency": 110 }, { "potency": 220, "targetindex": 0} ] },
-{ "2C88" : "sharpened knife", "damage": [ { "potency": 0} ] },
+{ "2C88" : "sharpened knife", "damage": [ { "potency": 220} ] },
 { "2C8A" : "flame thrower", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
 { "2C8C" : "glower", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
 { "2C8D" : "missile", "damage": [ { "potency": 0} ] },
 { "2C8E" : "white wind", "heal": [ { "potency": 0} ] },
 { "2C8F" : "final sting", "damage": [ { "potency": 2000} ] },
-{ "2C90" : "self-destruct", "damage": [ { "potency": 0} ] },
+{ "2C90" : "self-destruct", "damage": [ { "potency": 1500} ] },
 { "2C91" : "transfusion", "heal": [ { "potency": 0} ] },
 { "2C95" : "tail screw", "damage": [ { "potency": 0} ] },
 { "2C9B" : "the ram's voice", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
-{ "2C9C" : "the dragon's voice", "damage": [ { "potency": 0} ] },
+{ "2C9C" : "the dragon's voice", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
 { "2C9E" : "ink jet", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
 { "2C9F" : "flying sardine", "damage": [ { "potency": 10} ] },
 { "2CA1" : "fire angon", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
@@ -39,15 +39,15 @@
 { "477A" : "electrogenesis", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
 { "477B" : "kaltstrahl", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
 { "477C" : "Abyssal Transfixion", "damage": [ { "potency": 220} ] },
-{ "477F" : "pom cure 477f", "heal": [ { "potency": 0} ] },
+{ "477F" : "pom cure", "heal": [ { "potency": 100} ] },
 { "4781" : "magic hammer", "damage": [ { "potency": 125}, { "potency": 250, "targetindex": 0} ] },
 { "4784" : "sonic boom", "damage": [ { "potency": 210} ] },
-{ "4786" : "white knight's tour", "damage": [ { "potency": 0} ] },
-{ "4787" : "black knight's tour", "damage": [ { "potency": 0} ] },
+{ "4786" : "white knight's tour", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
+{ "4787" : "black knight's tour", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
 { "4789" : "launcher", "damage": [ { "potency": 0} ] },
 { "478A" : "perpetual ray", "damage": [ { "potency": 220} ] },
 { "478C" : "revenge blast", "damage": [ { "potency": 0} ] },
-{ "478E" : "exuviation", "heal": [ { "potency": 0} ] },
+{ "478E" : "exuviation", "heal": [ { "potency": 50} ] },
 { "478F" : "reflux", "damage": [ { "potency": 220} ] },
 { "4790" : "devour", "damage": [ { "potency": 250} ], "heal": [ { "potency": 0} ] },
 { "4793" : "surpanakha", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
@@ -61,7 +61,7 @@
 { "5AE6" : "saintly beam", "damage": [ { "potency": 0} ] },
 { "5AE7" : "feculent flood", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
 { "5AE8" : "angel's snack", "heal": [ { "potency": 400} ] },
-{ "5AEA" : "divine cataract", "damage": [ { "potency": 0} ] },
+{ "5AEA" : "divine cataract", "damage": [ { "potency": 500} ] },
 { "5AEB" : "the rose of destruction", "damage": [ { "potency": 400} ] },
 { "5AEE" : "blaze", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
 { "5AEF" : "mustard bomb", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
@@ -69,10 +69,10 @@
 { "5AF2" : "hydro pull", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
 { "5AF3" : "malediction of water", "damage": [ { "potency": 100}, { "potency": 200, "targetindex": 0} ] },
 { "5AF4" : "choco meteor", "damage": [ { "potency": 0} ] },
-{ "5AF5" : "matra magic", "damage": [ { "potency": 0} ] },
-{ "5AF6" : "peripheral synthesis", "damage": [ { "potency": 0} ] },
+{ "5AF5" : "matra magic", "damage": [ { "potency": 50} ] },
+{ "5AF6" : "peripheral synthesis", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
 { "5AF7" : "both ends", "damage": [ { "potency": 600} ] },
-{ "5AF9" : "phantom flurry", "damage": [ { "potency": 300}, {"potency":600, "targetindex": 0} ] },
+{ "5AF9" : "phantom flurry", "damage": [ { "potency": 300}, {"potency": 600, "targetindex": 0} ] },
 { "5AFA" : "nightbloom", "damage": [ { "potency": 200}, { "potency": 400, "targetindex": 0} ] },
 { "5B78" : "stotram heal", "heal": [ { "potency": 300} ] },
 { "8703" : "goblin punch", "damage": [ { "potency": 0} ] },
@@ -80,7 +80,7 @@
 { "8706" : "rehydration", "heal": [ { "potency": 600} ] },
 { "8708" : "wild rage", "damage": [ { "potency": 250}, { "potency": 500, "targetindex": 0} ] },
 { "8709" : "peat pelt", "damage": [ { "potency": 50}, { "potency": 100, "targetindex": 0} ] },
-{ "870A" : "deep clean", "damage": [ { "potency": 110}, { "potency": 220, "targetindex": 0} ] },
+{ "870A" : "deep clean", "damage": [ {"potency": 110}, { "potency": 220, "targetindex": 0} ] },
 { "870B" : "ruby dynamics", "damage": [ { "potency": 220} ] },
 { "870C" : "divination rune", "damage": [ { "potency": 100} ] },
 { "870D" : "dimensional shift", "damage": [ { "potency": 0} ] },
@@ -93,17 +93,38 @@
 ],
 
 "statuseffects" : [ 
+{ "84C" : "aetherial mimicry: tank", "potency": [
+    {"type": "DamageAddPotency", "amount": 500, "limitto": "Divine Cataract"},
+    {"type": "DamageAddPotency", "amount": 50, "limitto": "Schiltron"}
+] },
 { "84D": "aetherial mimicry: dps", "multiplier": [
     { "type": "criticalhit", "amount": 20 },
     { "type": "directhit", "amount": 20 }
+],
+    "potency": [ {"type": "DamageAddPotency", "amount": 50, "limitto": "Matra Magic"} ]
+},
+{ "84E" : "aetherial mimicry: healer", "potency": [
+    {"type": "HealDoneMultiplier", "amount": 20},
+    {"type": "HealAddPotency", "amount": 400, "limitto": "Pom Cure"},
+    {"type": "DamageShieldAddPotency", "amount": 150, "limitto": "Gobskin"},
+    {"type": "HealAddPotency", "amount": 250, "limitto": "Exuviation"}
 ] },
 { "6B200": "song of torment", "timeproc": { "type": "dot", "potency": "50", "damagetype": "magic", "maxticks": "10" } },
 { "6BB": "feather rain", "timeproc": { "type": "dot", "potency": "40", "damagetype": "magic", "maxticks": "2" } },
 { "9BF": "angel's snack", "timeproc": { "type": "hot", "potency": "200", "maxticks": "5" } },
 { "9C3": "incendiary burns", "timeproc": { "type": "dot", "potency": "50", "maxticks": "5" } },
+{ "9C5": "lightheaded", "potency": { "type": "damagedonemultiplier", "amount": 82, "limitto": "Peripheral Synthesis" } },
+{ "01": "petrification", "potency": { "type": "damagedonemultiplier", "amount": 200, "limitto": "Drill Cannons" } },
+{ "02": "stun", "potency": { "type": "DamageAddPotency", "amount": 230, "limitto": "Sharpened Knife" } },
+{ "09": "slow", "potency": { "type": "damagedonemultiplier", "amount": 100, "limitto": "Black Knight's Tour" } },
+{ "0D": "bind", "potency": { "type": "damagedonemultiplier", "amount": 100, "limitto": "White Knight's Tour" } },
 { "9C6": "phantom flurry", "timeproc": { "type": "grounddamage", "potency": "200", "maxticks": "6" } },
 { "6B2": "nightbloom", "timeproc": { "type": "dot", "potency": "75", "maxticks": "20" } },
-{ "6C8": "dropsy", "timeproc": { "type": "dot", "potency": "20", "damagetype": "magic", "maxticks": "4" } },
+{ "6C9": "deep freeze", "potency": { "type": "damagedonemultiplier", "amount": 100, "limitto": "The Dragon's Voice" } },
+{ "6C8": "dropsy", "timeproc": { "type": "dot", "potency": "20", "damagetype": "magic", "maxticks": "4" },
+    "potency": { "type": "damagedonemultiplier", "amount": 22, "limitto": "High Voltage" }
+},
+{ "6C9": "toad oil", "potency": { "type": "DamageAddPotency", "amount": 300, "limitto": "Self-destruct" } },
 
 { "6B4" : "boost", "potency": [ {"type": "damagedonemultiplier", "amount": 50, "limittoactioncategory": "spell"} ] },
 { "6B5" : "off-guard", "potency": [ {"type": "DamageReceivedMultiplier", "amount": 5} ] },
@@ -117,7 +138,6 @@
 { "846" : "harmonized", "potency": [ {"type": "damagedonemultiplier", "amount": 80, "limittodamagetype": "Physical", "limittoactioncategory": "spell"} ] },
 { "847" : "cactguard", "potency": [ {"type": "DamageReceivedMultiplier", "amount": -15, "amountbyte": 2} ] },
 { "84B" : "physical attenuation", "potency": [ {"type": "DamageReceivedMultiplier", "amount": 5, "limittodamagetype": "Physical"} ] },
-{ "84E" : "aetherial mimicry: healer", "potency": [ {"type": "HealDoneMultiplier", "amount": 20} ] },
 { "9BC" : "tingling", "potency": [ {"type": "DamageAddPotency", "amount": 100, "limittodamagetype": "Physical"} ] },
 
 { "6B8": "ice spikes", "reactiveproc": { "type": "DamageOnDamageReceived", "amount": 40 } },
@@ -127,7 +147,7 @@
     
 { "6B3" : "Bad Breath", "potency": [ {"type": "damagedonemultiplier", "amount": -10} ] },
 { "12"  : "Bad Breath", "timeproc": { "type": "dot", "potency": "20", "damagetype": "magic", "maxticks": "5" } },
-{ "842" : "Gobskin", "damageshield": { "type": "Potency", "amount": 0 } },
+{ "842" : "Gobskin", "damageshield": { "type": "Potency", "amount": 100 } },
 { "843" : "Magic Hammer", "potency": [ { "type": "damagedonemultiplier", "amount": -10, "limittodamagetype": "magic"} ] },
 { "9C0" : "Chelonian Gate", "potency": [ { "type": "DamageReceivedMultiplier", "amount": -20 }] },
 { "9C2" : "basic instinct", "potency": [ 
@@ -135,9 +155,11 @@
     { "type": "damagedonemultiplier", "amount": 100 }
 ] },
 { "9C4" : "Dragon Force", "potency": [{"type": "DamageReceivedMultiplier", "amount": -40, "amountbyte": 2}] },
-{ "E2F" : "schiltron", "reactiveproc": { "type": "DamageOnDamageReceived", "amount": 0 } },
+{ "E2F" : "schiltron", "reactiveproc": { "type": "DamageOnDamageReceived", "amount": 50 } },
 { "E34" : "begrimed", "timeproc": { "type": "dot", "potency": "10", "damagetype": "magic", "maxticks": "3" } },
-{ "E35" : "spick-and-span", "timeproc": { "type": "hot", "potency": "50", "maxticks": "5", "isstacked": true } },
+{ "E35" : "spick-and-span", 
+    "timeproc": { "type": "hot", "potency": "50", "maxticks": "5" },
+    "potency": [ {"type": "DamageAddPotency", "amount": 50, "isstacked": true, "limitto": "Spick-and-span"} ] },
 { "E36" : "force field physical", "potency": [ {"type": "DamageReceivedMultiplier", "amount": -50, "limittodamagetype": "physical"} ] },
 { "E37" : "force field magical", "potency": [ {"type": "DamageReceivedMultiplier", "amount": -50, "limittodamagetype": "magic"} ] },
 { "E39" : "winged redemption", "potency": [ {"type": "damagedonemultiplier", "amount": 100, "limitto": "Conviction Marcato"} ] },

From 19ecfefcf2c91f755d349a96a5b454a8c42a49a9 Mon Sep 17 00:00:00 2001
From: xiashtra <91220277+xiashtra@users.noreply.github.com>
Date: Wed, 9 Aug 2023 10:01:22 -0400
Subject: [PATCH 3/4] Update BlueMage.json

---
 Definitions/BlueMage.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Definitions/BlueMage.json b/Definitions/BlueMage.json
index e001719..5689594 100644
--- a/Definitions/BlueMage.json
+++ b/Definitions/BlueMage.json
@@ -164,7 +164,7 @@
 { "E37" : "force field magical", "potency": [ {"type": "DamageReceivedMultiplier", "amount": -50, "limittodamagetype": "magic"} ] },
 { "E39" : "winged redemption", "potency": [ {"type": "damagedonemultiplier", "amount": 100, "limitto": "Conviction Marcato"} ] },
 { "E3A" : "candy cane", "potency": [ { "type": "damagedonemultiplier", "amount": -10, "limittodamagetype": "physical"} ] },
-{ "E3B" : "mortal flame", "timeproc": { "type": "dot", "potency": "40", "damagetype": "magic" } },
+{ "E3B" : "mortal flame", "timeproc": { "type": "dot", "potency": "40", "damagetype": "magic", "maxticks": "9999" } },
 { "E3C" : "apokalypsis", "timeproc": { "type": "grounddamage", "potency": "140", "maxticks": "11" } },
 { "E80" : "breath of magic", "timeproc": { "type": "dot", "potency": "120", "damagetype": "magic", "maxticks": "20" } }
 ]

From 8f2e3433504c3fb2f21c50e354d4c7a058157211 Mon Sep 17 00:00:00 2001
From: xiashtra <91220277+xiashtra@users.noreply.github.com>
Date: Mon, 2 Oct 2023 07:28:51 -0400
Subject: [PATCH 4/4] 6.5 spick-and-span bugfix

---
 Definitions/BlueMage.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Definitions/BlueMage.json b/Definitions/BlueMage.json
index 5689594..a9d2ec6 100644
--- a/Definitions/BlueMage.json
+++ b/Definitions/BlueMage.json
@@ -151,7 +151,7 @@
 { "843" : "Magic Hammer", "potency": [ { "type": "damagedonemultiplier", "amount": -10, "limittodamagetype": "magic"} ] },
 { "9C0" : "Chelonian Gate", "potency": [ { "type": "DamageReceivedMultiplier", "amount": -20 }] },
 { "9C2" : "basic instinct", "potency": [ 
-    { "type": "HealDoneMultiplier", "amount": 100, "limitto": "pom cure,exuviation,stotram,angel's snack,rehydration" },
+    { "type": "HealDoneMultiplier", "amount": 100 },
     { "type": "damagedonemultiplier", "amount": 100 }
 ] },
 { "9C4" : "Dragon Force", "potency": [{"type": "DamageReceivedMultiplier", "amount": -40, "amountbyte": 2}] },