diff --git a/assets/database/db.bin b/assets/database/db.bin
index 4fa3ccf7c8..f2c88ae2ed 100644
Binary files a/assets/database/db.bin and b/assets/database/db.bin differ
diff --git a/assets/database/db.json b/assets/database/db.json
index 3c6e11f21e..ebbc7753e5 100644
--- a/assets/database/db.json
+++ b/assets/database/db.json
@@ -1382,7 +1382,7 @@
 {"id":19335,"name":"Spineshatter","icon":"inv_mace_06","type":13,"weaponType":4,"handType":2,"weaponSpeed":2.6,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":12435,"zoneId":2677}}],"scalingOptions":{"0":{"randPropPoints":22,"weaponDamageMin":49,"weaponDamageMax":93,"stats":{"0":9,"2":16,"30":7},"ilvl":73}}},
 {"id":19336,"name":"Arcane Infused Gem","icon":"spell_nature_wispsplode","type":12,"phase":1,"quality":4,"unique":true,"classAllowlist":[3],"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":12435,"zoneId":2677}}],"scalingOptions":{"0":{"randPropPoints":41,"ilvl":76}}},
 {"id":19337,"name":"The Black Book","icon":"inv_misc_book_06","type":12,"phase":1,"quality":4,"unique":true,"classAllowlist":[9],"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":12435,"zoneId":2677}}],"scalingOptions":{"0":{"randPropPoints":41,"ilvl":76}},"itemEffect":{"buffId":23720,"buffName":"Blessing of the Black Book","effectDurationMs":30000,"scalingOptions":{"0":{"stats":{"7":200,"19":325,"36":1600}}},"onUse":{"cooldownMs":300000,"categoryId":1141,"categoryCooldownMs":30000}}},
-{"id":19339,"name":"Mind Quickening Gem","icon":"spell_nature_wispheal","type":12,"phase":1,"quality":4,"unique":true,"classAllowlist":[8],"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":13020,"zoneId":2677}}],"scalingOptions":{"0":{"randPropPoints":41,"ilvl":76}},"itemEffect":{"buffId":23723,"buffName":"Mind Quickening","effectDurationMs":20000,"scalingOptions":{"0":{"stats":{"16":331}}},"onUse":{"cooldownMs":300000,"categoryId":1141,"categoryCooldownMs":20000}}},
+{"id":19339,"name":"Mind Quickening Gem","icon":"spell_nature_wispheal","type":12,"phase":1,"quality":4,"unique":true,"classAllowlist":[8],"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":13020,"zoneId":2677}}],"scalingOptions":{"0":{"randPropPoints":41,"ilvl":76}},"itemEffect":{"buffId":23723,"buffName":"Mind Quickening","effectDurationMs":20000,"scalingOptions":{"0":{"stats":{"16":330}}},"onUse":{"cooldownMs":300000,"categoryId":1141,"categoryCooldownMs":20000}}},
 {"id":19340,"name":"Rune of Metamorphosis","icon":"inv_misc_rune_06","type":12,"phase":1,"quality":4,"unique":true,"classAllowlist":[11],"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":13020,"zoneId":2677}}],"scalingOptions":{"0":{"randPropPoints":41,"ilvl":76}}},
 {"id":19341,"name":"Lifegiving Gem","icon":"inv_misc_gem_pearl_05","type":12,"phase":1,"quality":4,"unique":true,"classAllowlist":[1],"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":12017,"zoneId":2677}}],"scalingOptions":{"0":{"randPropPoints":41,"ilvl":76}}},
 {"id":19342,"name":"Venomous Totem","icon":"inv_misc_idol_03","type":12,"phase":1,"quality":4,"unique":true,"classAllowlist":[4],"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":12017,"zoneId":2677}}],"scalingOptions":{"0":{"randPropPoints":41,"ilvl":76}}},
@@ -1994,7 +1994,7 @@
 {"id":21470,"name":"Cloak of the Savior","icon":"inv_misc_cape_16","type":4,"armorType":1,"phase":1,"quality":3,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15340,"zoneId":3429}}],"scalingOptions":{"0":{"randPropPoints":24,"stats":{"2":10,"3":11,"6":22,"7":8,"18":10,"36":52},"ilvl":74}}},
 {"id":21471,"name":"Talon of Furious Concentration","icon":"inv_mace_21","type":13,"weaponType":5,"handType":3,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15340,"zoneId":3429}}],"scalingOptions":{"0":{"randPropPoints":28,"stats":{"2":8,"3":8,"6":21,"7":21,"15":14},"ilvl":69}}},
 {"id":21472,"name":"Dustwind Turban","icon":"inv_helmet_62","type":1,"armorType":1,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15340,"zoneId":3429}}],"scalingOptions":{"0":{"randPropPoints":50,"stats":{"2":18,"3":29,"6":31,"7":11,"15":14,"18":15,"36":98},"ilvl":69}}},
-{"id":21473,"name":"Eye of Moam","icon":"inv_misc_eye_01","type":12,"phase":1,"quality":3,"unique":true,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15340,"zoneId":3429}}],"scalingOptions":{"0":{"randPropPoints":32,"ilvl":74}},"itemEffect":{"buffId":26166,"buffName":"Obsidian Insight","effectDurationMs":30000,"scalingOptions":{"0":{"stats":{"7":50}}},"onUse":{"cooldownMs":180000,"categoryId":1141,"categoryCooldownMs":30000}}},
+{"id":21473,"name":"Eye of Moam","icon":"inv_misc_eye_01","type":12,"phase":1,"quality":3,"unique":true,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15340,"zoneId":3429}}],"scalingOptions":{"0":{"randPropPoints":32,"ilvl":74}},"itemEffect":{"buffId":26166,"buffName":"Obsidian Insight","effectDurationMs":30000,"scalingOptions":{"0":{"stats":{"7":50,"17":-100}}},"onUse":{"cooldownMs":180000,"categoryId":1141,"categoryCooldownMs":30000}}},
 {"id":21474,"name":"Chitinous Shoulderguards","icon":"inv_shoulder_29","type":3,"armorType":2,"phase":1,"quality":3,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15340,"zoneId":3429}}],"scalingOptions":{"0":{"randPropPoints":32,"stats":{"0":11,"1":25,"2":7,"36":151},"ilvl":74}}},
 {"id":21475,"name":"Legplates of the Destroyer","icon":"inv_pants_plate_01","type":9,"armorType":4,"phase":1,"quality":3,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15340,"zoneId":3429}}],"scalingOptions":{"0":{"randPropPoints":43,"stats":{"0":19,"1":10,"2":18,"3":18,"6":12,"7":12,"36":670},"ilvl":74}}},
 {"id":21476,"name":"Obsidian Scaled Leggings","icon":"inv_pants_mail_15","type":9,"armorType":3,"phase":1,"quality":3,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15340,"zoneId":3429}}],"scalingOptions":{"0":{"randPropPoints":43,"stats":{"0":16,"1":10,"2":18,"3":18,"6":19,"7":19,"36":377},"ilvl":74}}},
@@ -2098,7 +2098,7 @@
 {"id":21667,"name":"Legplates of Blazing Light","icon":"inv_pants_plate_11","type":9,"armorType":4,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15516,"zoneId":3428}}],"scalingOptions":{"0":{"randPropPoints":55,"stats":{"0":9,"2":17,"3":23,"6":68,"7":23,"15":14,"36":856},"ilvl":76}}},
 {"id":21668,"name":"Scaled Leggings of Qiraji Fury","icon":"inv_pants_mail_15","type":9,"armorType":3,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15516,"zoneId":3428}}],"scalingOptions":{"0":{"randPropPoints":55,"stats":{"2":20,"3":23,"6":36,"7":36,"15":14,"36":482},"ilvl":76}}},
 {"id":21669,"name":"Creeping Vine Helm","icon":"inv_helmet_01","type":1,"armorType":2,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15516,"zoneId":3428}}],"scalingOptions":{"0":{"randPropPoints":55,"stats":{"2":26,"3":23,"6":59,"7":20,"18":17,"36":208},"ilvl":76}}},
-{"id":21670,"name":"Badge of the Swarmguard","icon":"inv_misc_ahnqirajtrinket_04","type":12,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15516,"zoneId":3428}}],"scalingOptions":{"0":{"randPropPoints":41,"ilvl":76}}},
+{"id":21670,"name":"Badge of the Swarmguard","icon":"inv_misc_ahnqirajtrinket_04","type":12,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15516,"zoneId":3428}}],"scalingOptions":{"0":{"randPropPoints":41,"ilvl":76}},"itemEffect":{"buffId":26480,"buffName":"Badge of the Swarmguard","effectDurationMs":30000,"scalingOptions":{"0":{"stats":{"25":-200}}},"onUse":{"cooldownMs":180000,"categoryCooldownMs":-1}}},
 {"id":21671,"name":"Robes of the Battleguard","icon":"inv_chest_cloth_26","type":5,"armorType":1,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15516,"zoneId":3428}}],"scalingOptions":{"0":{"randPropPoints":55,"stats":{"2":23,"3":17,"6":36,"7":36,"17":-20,"18":8,"36":132},"ilvl":76}}},
 {"id":21672,"name":"Gloves of Enforcement","icon":"inv_gauntlets_17","type":7,"armorType":2,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15516,"zoneId":3428}}],"scalingOptions":{"0":{"randPropPoints":41,"stats":{"0":28,"1":20,"2":6,"27":10,"36":160},"ilvl":76}}},
 {"id":21673,"name":"Silithid Claw","icon":"inv_misc_monsterclaw_03","type":13,"weaponType":3,"handType":1,"weaponSpeed":1.6,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":15516,"zoneId":3428}}],"scalingOptions":{"0":{"randPropPoints":23,"weaponDamageMin":30,"weaponDamageMax":57,"stats":{"19":30,"20":30,"23":14},"ilvl":76}}},
@@ -4413,7 +4413,7 @@
 {"id":28108,"name":"Power Infused Mushroom","icon":"inv_mushroom_11","type":12,"phase":1,"quality":3,"scalingOptions":{"0":{"randPropPoints":42,"ilvl":97}}},
 {"id":28109,"name":"Essence Infused Mushroom","icon":"inv_mushroom_11","type":12,"phase":1,"quality":3,"scalingOptions":{"0":{"randPropPoints":42,"ilvl":97}}},
 {"id":28111,"name":"Everlasting Underspore Frond","icon":"inv_misc_herb_11a","phase":1,"quality":3,"scalingOptions":{"0":{"ilvl":100}}},
-{"id":28121,"name":"Icon of Unyielding Courage","icon":"inv_brd_banner","type":12,"phase":1,"quality":3,"unique":true,"expansion":2,"sources":[{"drop":{"difficulty":2,"npcId":17377,"zoneId":3713}}],"scalingOptions":{"0":{"randPropPoints":48,"stats":{"14":30,"22":30,"27":30},"ilvl":115}}},
+{"id":28121,"name":"Icon of Unyielding Courage","icon":"inv_brd_banner","type":12,"phase":1,"quality":3,"unique":true,"expansion":2,"sources":[{"drop":{"difficulty":2,"npcId":17377,"zoneId":3713}}],"scalingOptions":{"0":{"randPropPoints":48,"stats":{"14":30,"22":30,"27":30},"ilvl":115}},"itemEffect":{"buffId":34106,"buffName":"Armor Penetration","effectDurationMs":20000,"scalingOptions":{"0":{"stats":{"25":-600}}},"onUse":{"cooldownMs":120000,"categoryId":1141,"categoryCooldownMs":20000}}},
 {"id":28124,"name":"Liar's Cord","icon":"inv_belt_15","type":8,"armorType":2,"gemSockets":[2,4],"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0],"phase":1,"quality":3,"expansion":2,"sources":[{"drop":{"difficulty":2,"npcId":17991,"zoneId":3717}}],"scalingOptions":{"0":{"randPropPoints":48,"stats":{"2":24,"15":18,"19":34,"20":34,"23":18,"28":18,"36":164},"ilvl":115}}},
 {"id":28126,"name":"Gladiator's Dragonhide Gloves","icon":"inv_gauntlets_28","type":7,"armorType":2,"phase":1,"quality":4,"classAllowlist":[11],"setName":"Gladiator's Sanctuary","setId":584,"scalingOptions":{"0":{"randPropPoints":57,"stats":{"0":30,"1":19,"2":33,"3":18,"6":13,"7":5,"36":243,"37":40},"ilvl":123}}},
 {"id":28127,"name":"Gladiator's Dragonhide Helm","icon":"inv_helmet_30","type":1,"armorType":2,"gemSockets":[1,4],"phase":1,"quality":4,"classAllowlist":[11],"setName":"Gladiator's Sanctuary","setId":584,"scalingOptions":{"0":{"randPropPoints":76,"stats":{"0":33,"1":20,"2":45,"3":19,"6":46,"7":16,"36":316,"37":40},"ilvl":123}}},
@@ -5842,7 +5842,7 @@
 {"id":30447,"name":"Tome of Fiery Redemption","icon":"inv_misc_book_07","type":12,"phase":1,"quality":4,"classAllowlist":[2],"expansion":2,"sources":[{"drop":{"difficulty":1,"npcId":19514,"zoneId":3845}}],"scalingOptions":{"0":{"randPropPoints":59,"ilvl":128}},"itemEffect":{"buffId":37198,"buffName":"Blessing of Righteousness","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"6":290,"7":290}}},"proc":{"icdMs":45000}}},
 {"id":30448,"name":"Talon of Al'ar","icon":"spell_fire_soulburn","type":12,"phase":1,"quality":4,"classAllowlist":[3],"expansion":2,"sources":[{"drop":{"difficulty":1,"npcId":19514,"zoneId":3845}}],"scalingOptions":{"0":{"randPropPoints":59,"ilvl":128}}},
 {"id":30449,"name":"Void Star Talisman","icon":"inv_misc_gem_ebondraenite_01","type":12,"phase":1,"quality":4,"classAllowlist":[9],"expansion":2,"sources":[{"drop":{"difficulty":1,"npcId":18805,"zoneId":3845}}],"scalingOptions":{"0":{"randPropPoints":59,"ilvl":128}},"itemEffect":{"buffId":37386,"buffName":"Pet Resistance","effectDurationMs":-1,"scalingOptions":{"0":{"stats":{"7":48}}},"proc":{}}},
-{"id":30450,"name":"Warp-Spring Coil","icon":"inv_gizmo_hardenedadamantitetube","type":12,"phase":1,"quality":4,"classAllowlist":[4],"expansion":2,"sources":[{"drop":{"difficulty":1,"npcId":19516,"zoneId":3845}}],"scalingOptions":{"0":{"randPropPoints":59,"stats":{"14":21,"22":21,"27":21},"ilvl":128}}},
+{"id":30450,"name":"Warp-Spring Coil","icon":"inv_gizmo_hardenedadamantitetube","type":12,"phase":1,"quality":4,"classAllowlist":[4],"expansion":2,"sources":[{"drop":{"difficulty":1,"npcId":19516,"zoneId":3845}}],"scalingOptions":{"0":{"randPropPoints":59,"stats":{"14":21,"22":21,"27":21},"ilvl":128}},"itemEffect":{"buffId":37174,"buffName":"Perceived Weakness","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"25":-1000}}},"proc":{"icdMs":30000}}},
 {"id":30459,"name":"Netherflame Robe","icon":"inv_chest_cloth_02","type":5,"armorType":1,"phase":1,"quality":3,"expansion":2,"sources":[{"crafted":{"profession":11,"spellId":36665}},{"crafted":{"profession":11,"spellId":36665}}],"scalingOptions":{"0":{"randPropPoints":61,"stats":{"2":21,"6":41,"7":41,"14":14,"15":35,"36":149},"ilvl":110}}},
 {"id":30460,"name":"Netherflame Belt","icon":"inv_belt_30","type":8,"armorType":1,"phase":1,"quality":3,"expansion":2,"sources":[{"crafted":{"profession":11,"spellId":36667}},{"crafted":{"profession":11,"spellId":36667}}],"scalingOptions":{"0":{"randPropPoints":46,"stats":{"2":16,"6":29,"7":29,"14":25,"15":11,"36":84},"ilvl":110}}},
 {"id":30461,"name":"Netherflame Boots","icon":"inv_boots_07","type":10,"armorType":1,"phase":1,"quality":3,"expansion":2,"sources":[{"crafted":{"profession":11,"spellId":36668}},{"crafted":{"profession":11,"spellId":36668}}],"scalingOptions":{"0":{"randPropPoints":46,"stats":{"2":16,"6":29,"7":29,"14":11,"15":25,"36":103},"ilvl":110}}},
@@ -8441,10 +8441,10 @@
 {"effectId":929,"itemId":16217,"spellId":13827,"name":"Enchant Shield - Greater Stamina","icon":"inv_misc_note_01","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":930,"itemId":11226,"spellId":13927,"name":"Enchant Gloves - Riding Skill","icon":"inv_misc_note_01","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":931,"spellId":13928,"name":"Enchant Gloves - Minor Haste","icon":"trade_engraving","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":963,"itemId":22552,"spellId":27967,"name":"Enchant Weapon - Major Striking","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":963,"itemId":22552,"spellId":27967,"name":"Enchant Weapon - Major Striking","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1071,"itemId":28282,"spellId":14465,"name":"Enchant Shield - Major Stamina","icon":"inv_misc_note_01","type":13,"enchantType":2,"stats":[0,0,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1144,"spellId":14433,"name":"Enchant Chest - Major Spirit","icon":"trade_engraving","type":5,"stats":[0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1257,"itemId":28276,"spellId":14717,"name":"Enchant Cloak - Greater Arcane Resistance","icon":"inv_misc_note_01","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
@@ -8469,10 +8469,10 @@
 {"effectId":1893,"itemId":16242,"spellId":19991,"name":"Enchant Chest - Major Mana","icon":"inv_misc_note_01","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1894,"itemId":16223,"spellId":20005,"name":"Enchant Weapon - Icy Chill","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1896,"itemId":16247,"spellId":20030,"name":"Enchant 2H Weapon - Superior Impact","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":1897,"itemId":16250,"spellId":20031,"name":"Enchant Weapon - Superior Striking","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":1898,"itemId":16254,"spellId":20004,"name":"Enchant Weapon - Lifestealing","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
+{"effectId":1897,"itemId":16250,"spellId":20031,"name":"Enchant Weapon - Superior Striking","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1898,"spellId":20004,"name":"Enchant Weapon - Major Spirit","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":1898,"itemId":16254,"spellId":20004,"name":"Enchant Weapon - Lifestealing","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":1899,"itemId":16248,"spellId":20006,"name":"Enchant Weapon - Unholy Weapon","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"enchantEffect":{"buffId":20006,"buffName":"Unholy Curse","effectDurationMs":12000,"scalingOptions":{"0":{"stats":{"7":-15}}},"proc":{}}},
 {"effectId":1900,"itemId":16252,"spellId":20007,"name":"Enchant Weapon - Crusader","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"enchantEffect":{"buffId":20007,"buffName":"Holy Strength","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"0":100}}},"proc":{}}},
 {"effectId":1903,"itemId":16255,"spellId":19986,"name":"Enchant 2H Weapon - Major Spirit","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -8551,7 +8551,7 @@
 {"effectId":2670,"itemId":22556,"spellId":27976,"name":"Enchant 2H Weapon - Major Agility","icon":"inv_misc_note_01","type":13,"stats":[0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2671,"itemId":22560,"spellId":27979,"name":"Enchant Weapon - Sunfire","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":2672,"itemId":22561,"spellId":27980,"name":"Enchant Weapon - Soulfrost","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
-{"effectId":2673,"itemId":22559,"spellId":28093,"name":"Enchant Weapon - Mongoose","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"enchantEffect":{"buffId":28093,"buffName":"Lightning Speed","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"1":120}}},"proc":{}}},
+{"effectId":2673,"itemId":22559,"spellId":28093,"name":"Enchant Weapon - Mongoose","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"enchantEffect":{"buffId":28093,"buffName":"Lightning Speed","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"1":120,"24":31.538466}}},"proc":{}}},
 {"effectId":2674,"itemId":22558,"spellId":27997,"name":"Enchant Weapon - Spellsurge","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2675,"itemId":22557,"spellId":28005,"name":"Enchant Weapon - Battlemaster","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2679,"itemId":22532,"spellId":27912,"name":"Enchant Bracer - Restore Mana Prime","icon":"inv_misc_note_01","type":6,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -8627,7 +8627,7 @@
 {"effectId":3150,"spellId":39882,"name":"Enchant Chest - Restore Mana Prime","icon":"trade_engraving","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":3222,"itemId":33165,"spellId":42620,"name":"Enchant Weapon - Greater Agility","icon":"inv_misc_note_01","type":13,"stats":[0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":3223,"itemId":33185,"spellId":43588,"name":"Adamantite Weapon Chain","icon":"spell_frost_chainsofice","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":3225,"itemId":33307,"spellId":42976,"name":"Enchant Weapon - Executioner","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
+{"effectId":3225,"itemId":33307,"spellId":42976,"name":"Enchant Weapon - Executioner","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"enchantEffect":{"buffId":42976,"buffName":"Executioner","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"25":-840}}},"proc":{}}},
 {"effectId":3229,"itemId":34110,"spellId":44383,"name":"Enchant Shield - Resilience","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":3260,"itemId":34207,"spellId":44769,"name":"Glove Reinforcements","icon":"inv_misc_armorkit_08","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":3269,"itemId":34836,"spellId":45698,"name":"Truesilver Fishing Line","icon":"inv_misc_thread_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -9978,12 +9978,12 @@
 {"id":7747,"name":"Enchant Chest - Lesser Health","icon":"trade_engraving"},
 {"id":7771,"name":"Enchant Cloak - Minor Protection","icon":"inv_misc_note_01"},
 {"id":7773,"name":"Enchant Chest - Lesser Mana","icon":"inv_misc_note_01"},
-{"id":7778,"name":"Enchant Boots - Minor Agility","icon":"inv_misc_note_01"},
+{"id":7778,"name":"Enchant Cloak - Minor Agility","icon":"inv_misc_note_01"},
 {"id":7780,"name":"Enchant Bracer - Minor Strength","icon":"inv_misc_note_01"},
 {"id":7784,"name":"Enchant Weapon - Minor Beastslayer","icon":"inv_misc_note_01"},
 {"id":7788,"name":"Enchant Weapon - Minor Striking","icon":"trade_engraving"},
 {"id":7850,"name":"Enchant Chest - Health","icon":"trade_engraving"},
-{"id":7851,"name":"Enchant 2H Weapon - Lesser Spirit","icon":"inv_misc_note_01"},
+{"id":7851,"name":"Enchant Shield - Lesser Spirit","icon":"trade_engraving"},
 {"id":7852,"name":"Enchant Cloak - Lesser Fire Resistance","icon":"trade_engraving"},
 {"id":8071,"name":"Stoneskin Totem","icon":"spell_nature_stoneskintotem"},
 {"id":8075,"name":"Strength of Earth Totem","icon":"spell_nature_earthbindtotem"},
@@ -9995,10 +9995,10 @@
 {"id":9316,"name":"Inscription of Faith","icon":"spell_holy_sealofsalvation"},
 {"id":9318,"name":"Greater Inscription of Faith","icon":"spell_holy_greaterblessingofsalvation"},
 {"id":9331,"name":"Greater Inscription of the Blade","icon":"spell_holy_weaponmastery"},
-{"id":9334,"name":"Enchant Gloves - Assault","icon":"trade_engraving"},
-{"id":9336,"name":"Greater Inscription of Vengeance","icon":"spell_holy_greaterblessingofkings"},
+{"id":9334,"name":"Inscription of Vengeance","icon":"spell_holy_fistofjustice"},
+{"id":9336,"name":"Zandalar Signet of Might","icon":"inv_misc_armorkit_08"},
 {"id":9344,"name":"Inscription of Discipline","icon":"spell_holy_sealofwisdom"},
-{"id":9346,"name":"Zandalar Signet of Mojo","icon":"inv_jewelry_ring_46"},
+{"id":9346,"name":"Greater Inscription of Discipline","icon":"spell_holy_sealofwisdom"},
 {"id":9408,"name":"Greater Inscription of the Oracle","icon":"spell_holy_powerinfusion"},
 {"id":9417,"name":"Greater Inscription of the Orb","icon":"inv_misc_orb_03"},
 {"id":9452,"name":"Vindication","icon":"spell_holy_vindication"},
@@ -10250,9 +10250,9 @@
 {"id":13364,"name":"Enchant Cloak - Lesser Agility","icon":"inv_misc_note_01"},
 {"id":13365,"name":"Enchant Boots - Agility","icon":"trade_engraving"},
 {"id":13366,"name":"Enchant Bracer - Intellect","icon":"trade_engraving"},
-{"id":13368,"name":"Enchant Bracer - Spirit","icon":"trade_engraving"},
-{"id":13369,"name":"Enchant Shield - Lesser Stamina","icon":"trade_engraving"},
-{"id":13370,"name":"Enchant Shield - Stamina","icon":"inv_misc_note_01"},
+{"id":13368,"name":"Enchant Boots - Spirit","icon":"inv_misc_note_01"},
+{"id":13369,"name":"Enchant Bracer - Lesser Stamina","icon":"trade_engraving"},
+{"id":13370,"name":"Enchant Bracer - Stamina","icon":"trade_engraving"},
 {"id":13371,"name":"Enchant Bracer - Lesser Strength","icon":"inv_misc_note_01"},
 {"id":13372,"name":"Enchant Gloves - Strength","icon":"trade_engraving"},
 {"id":13421,"name":"Enchant Cloak - Lesser Protection","icon":"trade_engraving"},
@@ -10310,8 +10310,8 @@
 {"id":13824,"name":"Enchant Chest - Stats","icon":"trade_engraving"},
 {"id":13825,"name":"Enchant Bracer - Greater Intellect","icon":"inv_misc_note_01"},
 {"id":13826,"name":"Enchant Bracer - Greater Spirit","icon":"inv_misc_note_01"},
-{"id":13827,"name":"Enchant Boots - Greater Stamina","icon":"inv_misc_note_01"},
-{"id":13828,"name":"Enchant Gloves - Greater Strength","icon":"inv_misc_note_01"},
+{"id":13827,"name":"Enchant Shield - Greater Stamina","icon":"inv_misc_note_01"},
+{"id":13828,"name":"Enchant Bracer - Greater Strength","icon":"trade_engraving"},
 {"id":13832,"name":"Precision","icon":"ability_marksmanship"},
 {"id":13838,"name":"Enchant Gloves - Advanced Mining","icon":"inv_misc_note_01"},
 {"id":13839,"name":"Enchant Gloves - Advanced Herbalism","icon":"inv_misc_note_01"},
@@ -11184,13 +11184,13 @@
 {"id":19833,"name":"Flawless Arcanite Rifle","icon":"temp"},
 {"id":19984,"name":"Enchant Bracer - Superior Strength","icon":"inv_misc_note_01"},
 {"id":19985,"name":"Enchant Bracer - Superior Stamina","icon":"inv_misc_note_01"},
-{"id":19986,"name":"Enchant 2H Weapon - Major Spirit","icon":"inv_misc_note_01"},
+{"id":19986,"name":"Enchant Bracer - Superior Spirit","icon":"inv_misc_note_01"},
 {"id":19987,"name":"Enchant 2H Weapon - Major Intellect","icon":"inv_misc_note_01"},
-{"id":19988,"name":"Enchant Bracer - Stats","icon":"trade_engraving"},
+{"id":19988,"name":"Enchant Chest - Greater Stats","icon":"inv_misc_note_01"},
 {"id":19990,"name":"Enchant Chest - Major Health","icon":"inv_misc_note_01"},
 {"id":19991,"name":"Enchant Chest - Major Mana","icon":"inv_misc_note_01"},
 {"id":19992,"name":"Enchant Cloak - Greater Resistance","icon":"inv_misc_note_01"},
-{"id":20004,"name":"Enchant Weapon - Major Spirit","icon":"trade_engraving"},
+{"id":20004,"name":"Enchant Weapon - Lifestealing","icon":"inv_misc_note_01"},
 {"id":20005,"name":"Enchant Weapon - Icy Chill","icon":"inv_misc_note_01"},
 {"id":20006,"name":"Enchant Weapon - Unholy Weapon","icon":"inv_misc_note_01"},
 {"id":20007,"name":"Enchant Weapon - Crusader","icon":"inv_misc_note_01"},
@@ -11393,7 +11393,7 @@
 {"id":23710,"name":"Molten Belt","icon":"temp"},
 {"id":23785,"name":"Master Demonologist","icon":"spell_shadow_shadowpact"},
 {"id":23793,"name":"Enchant Weapon - Strength","icon":"inv_misc_note_01"},
-{"id":23794,"name":"Enchant Weapon - Agility","icon":"inv_misc_note_01"},
+{"id":23794,"name":"Enchant Gloves - Superior Agility","icon":"inv_misc_note_01"},
 {"id":23795,"name":"Enchant Bracer - Mana Regeneration","icon":"inv_misc_note_01"},
 {"id":23796,"name":"Enchant Bracer - Healing Power","icon":"inv_misc_note_01"},
 {"id":23797,"name":"Enchant Weapon - Mighty Spirit","icon":"inv_misc_note_01"},
@@ -11545,7 +11545,7 @@
 {"id":27902,"name":"Spell Warding","icon":"spell_holy_spellwarding"},
 {"id":27903,"name":"Spell Warding","icon":"spell_holy_spellwarding"},
 {"id":27904,"name":"Spell Warding","icon":"spell_holy_spellwarding"},
-{"id":27908,"name":"Enchant Cloak - Steelweave","icon":"inv_misc_note_01"},
+{"id":27908,"name":"Enchant Bracer - Major Defense","icon":"inv_misc_note_01"},
 {"id":27912,"name":"Enchant Bracer - Restore Mana Prime","icon":"inv_misc_note_01"},
 {"id":27916,"name":"Enchant Bracer - Fortitude","icon":"inv_misc_note_01"},
 {"id":27918,"name":"Enchant Bracer - Spellpower","icon":"inv_misc_note_01"},
diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
index 4450f04ed3..2590727728 100644
Binary files a/assets/database/leftover_db.bin and b/assets/database/leftover_db.bin differ
diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json
index d42a83f37f..598899aa40 100644
--- a/assets/database/leftover_db.json
+++ b/assets/database/leftover_db.json
@@ -85,8 +85,8 @@
 {"effectId":254,"spellId":7850,"name":"Enchant Chest - Health","icon":"trade_engraving","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,0,0,0,0,0,0,0],"quality":1},
 {"effectId":255,"itemId":6375,"spellId":7851,"name":"Enchant Bracer - Lesser Spirit","icon":"inv_misc_note_01","type":6,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":255,"itemId":11167,"spellId":7851,"name":"Enchant Boots - Lesser Spirit","icon":"inv_misc_note_01","type":10,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":255,"spellId":7851,"name":"Enchant Shield - Lesser Spirit","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":255,"itemId":11038,"spellId":7851,"name":"Enchant 2H Weapon - Lesser Spirit","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
+{"effectId":255,"spellId":7851,"name":"Enchant Shield - Lesser Spirit","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":256,"spellId":7852,"name":"Enchant Cloak - Lesser Fire Resistance","icon":"trade_engraving","type":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":368,"spellId":9102,"name":"Enchant Cloak - Greater Agility","icon":"trade_engraving","type":4,"stats":[0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":369,"spellId":9108,"name":"Enchant Bracer - Major Intellect","icon":"trade_engraving","type":6,"stats":[0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
@@ -186,8 +186,8 @@
 {"effectId":1896,"itemId":16247,"spellId":20030,"name":"Enchant 2H Weapon - Superior Impact","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1897,"itemId":16250,"spellId":20031,"name":"Enchant Weapon - Superior Striking","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":1898,"spellId":20004,"name":"Enchant Weapon - Major Spirit","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1898,"itemId":16254,"spellId":20004,"name":"Enchant Weapon - Lifestealing","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
+{"effectId":1898,"spellId":20004,"name":"Enchant Weapon - Major Spirit","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1899,"itemId":16248,"spellId":20006,"name":"Enchant Weapon - Unholy Weapon","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"enchantEffect":{"buffId":20006,"buffName":"Unholy Curse","effectDurationMs":12000,"scalingOptions":{"0":{"stats":{"7":-15}}},"proc":{}}},
 {"effectId":1900,"itemId":16252,"spellId":20007,"name":"Enchant Weapon - Crusader","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2,"enchantEffect":{"buffId":20007,"buffName":"Holy Strength","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"0":100}}},"proc":{}}},
 {"effectId":1903,"itemId":16255,"spellId":19986,"name":"Enchant 2H Weapon - Major Spirit","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -206,8 +206,8 @@
 {"effectId":2503,"itemId":18251,"spellId":22725,"name":"Core Armor Kit","icon":"inv_misc_armorkit_05","type":5,"extraTypes":[7,9,10],"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":2504,"itemId":18259,"spellId":22747,"name":"Enchant Weapon - Spell Power","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,30,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":2505,"itemId":18260,"spellId":22748,"name":"Enchant Weapon - Healing Power","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,55,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
-{"effectId":2523,"spellId":22780,"name":"Stabilized Eternium Scope","icon":"trade_engraving","type":14,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":2523,"itemId":18283,"spellId":22780,"name":"Biznicks 247x128 Accurascope","icon":"inv_misc_spyglass_02","type":14,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
+{"effectId":2523,"spellId":22780,"name":"Stabilized Eternium Scope","icon":"trade_engraving","type":14,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":2543,"itemId":18329,"spellId":22841,"name":"Arcanum of Rapidity","icon":"inv_misc_gem_02","type":1,"extraTypes":[9],"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2544,"itemId":18330,"spellId":22843,"name":"Arcanum of Focus","icon":"inv_misc_gem_02","type":1,"extraTypes":[9],"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2545,"itemId":18331,"spellId":22847,"name":"Arcanum of Protection","icon":"inv_misc_gem_02","type":1,"extraTypes":[9],"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -266,7 +266,7 @@
 {"effectId":2670,"itemId":22556,"spellId":27976,"name":"Enchant 2H Weapon - Major Agility","icon":"inv_misc_note_01","type":13,"stats":[0,35,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2671,"itemId":22560,"spellId":27979,"name":"Enchant Weapon - Sunfire","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":2672,"itemId":22561,"spellId":27980,"name":"Enchant Weapon - Soulfrost","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
-{"effectId":2673,"itemId":22559,"spellId":28093,"name":"Enchant Weapon - Mongoose","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"enchantEffect":{"buffId":28093,"buffName":"Lightning Speed","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"1":120}}},"proc":{}}},
+{"effectId":2673,"itemId":22559,"spellId":28093,"name":"Enchant Weapon - Mongoose","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"enchantEffect":{"buffId":28093,"buffName":"Lightning Speed","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"1":120,"24":31.538466}}},"proc":{}}},
 {"effectId":2674,"itemId":22558,"spellId":27997,"name":"Enchant Weapon - Spellsurge","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2675,"itemId":22557,"spellId":28005,"name":"Enchant Weapon - Battlemaster","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":2679,"itemId":22532,"spellId":27912,"name":"Enchant Bracer - Restore Mana Prime","icon":"inv_misc_note_01","type":6,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -342,7 +342,7 @@
 {"effectId":3150,"spellId":39882,"name":"Enchant Chest - Restore Mana Prime","icon":"trade_engraving","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":3222,"itemId":33165,"spellId":42620,"name":"Enchant Weapon - Greater Agility","icon":"inv_misc_note_01","type":13,"stats":[0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":3223,"itemId":33185,"spellId":43588,"name":"Adamantite Weapon Chain","icon":"spell_frost_chainsofice","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
-{"effectId":3225,"itemId":33307,"spellId":42976,"name":"Enchant Weapon - Executioner","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
+{"effectId":3225,"itemId":33307,"spellId":42976,"name":"Enchant Weapon - Executioner","icon":"inv_misc_note_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"enchantEffect":{"buffId":42976,"buffName":"Executioner","effectDurationMs":15000,"scalingOptions":{"0":{"stats":{"25":-840}}},"proc":{}}},
 {"effectId":3229,"itemId":34110,"spellId":44383,"name":"Enchant Shield - Resilience","icon":"trade_engraving","type":13,"enchantType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":3260,"itemId":34207,"spellId":44769,"name":"Glove Reinforcements","icon":"inv_misc_armorkit_08","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":3269,"itemId":34836,"spellId":45698,"name":"Truesilver Fishing Line","icon":"inv_misc_thread_01","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
diff --git a/sim/common/tbc/stat_bonus_cds_auto_gen.go b/sim/common/tbc/stat_bonus_cds_auto_gen.go
index 69976654d9..8057d5e05a 100644
--- a/sim/common/tbc/stat_bonus_cds_auto_gen.go
+++ b/sim/common/tbc/stat_bonus_cds_auto_gen.go
@@ -18,6 +18,10 @@ func RegisterAllOnUseCds() {
 	shared.NewSimpleStatActive(27891) // Adamantine Figurine
 	shared.NewSimpleStatActive(33830) // Ancient Aqir Artifact
 
+	// ArmorPenetration
+	shared.NewSimpleStatActive(21670) // Badge of the Swarmguard
+	shared.NewSimpleStatActive(28121) // Icon of Unyielding Courage
+
 	// AttackPower
 	shared.NewSimpleStatActive(14554) // Cloudkeeper Legplates
 	shared.NewSimpleStatActive(21180) // Earthstrike
diff --git a/sim/common/tbc/stat_bonus_procs_auto_gen.go b/sim/common/tbc/stat_bonus_procs_auto_gen.go
index 0e5d2b1cf4..8e21adf386 100644
--- a/sim/common/tbc/stat_bonus_procs_auto_gen.go
+++ b/sim/common/tbc/stat_bonus_procs_auto_gen.go
@@ -33,6 +33,16 @@ func RegisterAllProcs() {
 		RequireDamageDealt: false,
 	})
 
+	// Your special attacks have a chance to give you 1001 armor penetration for 15s.
+	shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
+		Name:               "Warp-Spring Coil",
+		ItemID:             30450,
+		Callback:           core.CallbackOnSpellHitDealt,
+		ProcMask:           core.ProcMaskMeleeMHSpecial | core.ProcMaskMeleeOHSpecial | core.ProcMaskMeleeProc,
+		Outcome:            core.OutcomeLanded,
+		RequireDamageDealt: true,
+	})
+
 	// Your Mortal Strike, Bloodthirst, and Shield Slam attacks have a 25% chance to heal you for 329 and grant
 	// 54 Strength for 12s.
 	shared.NewProcStatBonusEffect(shared.ProcStatBonusEffect{
diff --git a/tools/database/dbc/spell_effect.go b/tools/database/dbc/spell_effect.go
index c36cdf5249..f37c3e521e 100644
--- a/tools/database/dbc/spell_effect.go
+++ b/tools/database/dbc/spell_effect.go
@@ -245,13 +245,13 @@ func (effect *SpellEffect) ParseStatEffect(scalesWithIlvl bool, ilvl int) *stats
 			effectStats[proto.Stat_StatRangedAttackPower] = effect.CalcCoefficientStatValue(ilvl)
 			break
 		}
-		effectStats[proto.Stat_StatRangedAttackPower] = float64(effect.EffectBasePoints + 1)
+		effectStats[proto.Stat_StatRangedAttackPower] = float64(effect.EffectBasePoints + effect.EffectDieSides)
 	case effect.EffectAura == A_MOD_ATTACK_POWER:
 		if effect.Coefficient != 0 && scalesWithIlvl {
 			effectStats[proto.Stat_StatAttackPower] = effect.CalcCoefficientStatValue(ilvl)
 			break
 		}
-		effectStats[proto.Stat_StatAttackPower] = float64(effect.EffectBasePoints + 1)
+		effectStats[proto.Stat_StatAttackPower] = float64(effect.EffectBasePoints + effect.EffectDieSides)
 	case effect.EffectMiscValues[0] == -1 && effect.EffectAura == A_MOD_STAT && effect.EffectType == E_APPLY_AURA:
 		// -1 represents ALL STATS if present in MiscValue 0
 		for _, s := range []proto.Stat{
@@ -262,7 +262,7 @@ func (effect *SpellEffect) ParseStatEffect(scalesWithIlvl bool, ilvl int) *stats
 				effectStats[s] = effect.CalcCoefficientStatValue(core.TernaryInt(scalesWithIlvl, ilvl, 0))
 				continue
 			}
-			effectStats[s] = float64(effect.EffectBasePoints + 1)
+			effectStats[s] = float64(effect.EffectBasePoints + effect.EffectDieSides)
 		}
 	case effect.EffectAura == A_MOD_STAT && effect.EffectType == E_APPLY_AURA:
 		if effect.Coefficient != 0 && effect.ScalingType != 0 {
@@ -271,21 +271,21 @@ func (effect *SpellEffect) ParseStatEffect(scalesWithIlvl bool, ilvl int) *stats
 		}
 
 		// if Coefficient is not set, we fall back to EffectBasePoints
-		effectStats[stat] = float64(effect.EffectBasePoints + 1)
+		effectStats[stat] = float64(effect.EffectBasePoints + effect.EffectDieSides)
 	case effect.EffectAura == A_MOD_DAMAGE_DONE && effect.EffectType == E_APPLY_AURA:
 		if effect.Coefficient != 0 && effect.ScalingType != 0 {
 			effectStats[proto.Stat_StatSpellDamage] = effect.CalcCoefficientStatValue(core.TernaryInt(scalesWithIlvl, ilvl, 0))
 			break
 		}
 		// Apply spell power, A_MOD_HEALING_DONE is also a possibility for healing power
-		effectStats[proto.Stat_StatSpellDamage] = float64(effect.EffectBasePoints + 1)
+		effectStats[proto.Stat_StatSpellDamage] = float64(effect.EffectBasePoints + effect.EffectDieSides)
 	case effect.EffectAura == A_MOD_HEALING_DONE && effect.EffectType == E_APPLY_AURA:
 		if effect.Coefficient != 0 && effect.ScalingType != 0 {
 			effectStats[proto.Stat_StatHealingPower] = effect.CalcCoefficientStatValue(core.TernaryInt(scalesWithIlvl, ilvl, 0))
 			break
 		}
 		// Apply spell power, A_MOD_HEALING_DONE is also a possibility for healing power
-		effectStats[proto.Stat_StatHealingPower] = float64(effect.EffectBasePoints + 1)
+		effectStats[proto.Stat_StatHealingPower] = float64(effect.EffectBasePoints + effect.EffectDieSides)
 	case effect.EffectAura == A_MOD_RESISTANCE:
 		school := SpellSchool(effect.EffectMiscValues[0])
 		for schoolType, stat := range SpellSchoolToStat {
@@ -294,7 +294,7 @@ func (effect *SpellEffect) ParseStatEffect(scalesWithIlvl bool, ilvl int) *stats
 					effectStats[stat] = effect.CalcCoefficientStatValue(ilvl)
 					break
 				}
-				effectStats[stat] += float64(effect.EffectBasePoints + 1)
+				effectStats[stat] += float64(effect.EffectBasePoints + effect.EffectDieSides)
 			}
 		}
 
@@ -305,17 +305,22 @@ func (effect *SpellEffect) ParseStatEffect(scalesWithIlvl bool, ilvl int) *stats
 					effectStats[statMod] = effect.CalcCoefficientStatValue(ilvl)
 					break
 				}
-				effectStats[statMod] = float64(effect.EffectBasePoints + 1)
+				effectStats[statMod] = float64(effect.EffectBasePoints + effect.EffectDieSides)
 			}
 		}
 	case effect.EffectAura == A_MOD_INCREASE_ENERGY:
-		effectStats[proto.Stat_StatMana] = float64(effect.EffectBasePoints + 1)
+		effectStats[proto.Stat_StatMana] = float64(effect.EffectBasePoints + effect.EffectDieSides)
 	case effect.EffectAura == A_MOD_INCREASE_HEALTH_2:
-		effectStats[proto.Stat_StatHealth] = float64(effect.EffectBasePoints + 1)
+		effectStats[proto.Stat_StatHealth] = float64(effect.EffectBasePoints + effect.EffectDieSides)
 	case effect.EffectAura == A_PERIODIC_TRIGGER_SPELL && effect.EffectAuraPeriod == 10000:
 		for _, sub := range dbcInstance.SpellEffects[effect.EffectTriggerSpell] {
 			effectStats.AddInplace(sub.ParseStatEffect(false, 0))
 		}
+	case effect.EffectAura == A_MOD_TARGET_RESISTANCE:
+		resist := ConvertTargetResistanceFlagToPenetrationStat(effect.EffectMiscValues[0])
+		effectStats[resist] = float64(effect.EffectBasePoints + effect.EffectDieSides)
+	case effect.EffectAura == A_MOD_MELEE_HASTE && effect.ImplicitTargets[0] == 1:
+		effectStats[proto.Stat_StatMeleeHasteRating] = float64(effect.EffectBasePoints+effect.EffectDieSides) * core.PhysicalHasteRatingPerHastePercent
 	}
 
 	return effectStats
diff --git a/ui/core/constants/missing_effects_auto_gen.ts b/ui/core/constants/missing_effects_auto_gen.ts
index 940366d502..5926dda28c 100644
--- a/ui/core/constants/missing_effects_auto_gen.ts
+++ b/ui/core/constants/missing_effects_auto_gen.ts
@@ -23,7 +23,6 @@ export const MISSING_ITEM_EFFECTS = [
     21128, // Staff of the Qiraji Prophets
     21190, // Wrath of Cenarius
     21625, // Scarab Brooch
-    21670, // Badge of the Swarmguard
     21685, // Petrified Scarab
     21780, // Blood Crown
     21789, // Figurine - Dark Iron Scorpid
@@ -72,7 +71,6 @@ export const MISSING_ITEM_EFFECTS = [
     29309, // Band of the Eternal Restorer
     30317, // Cosmic Infuser
     30449, // Void Star Talisman
-    30450, // Warp-Spring Coil
     30619, // Fel Reaver's Piston
     30621, // Prism of Inner Calm
     30626, // Sextant of Unstable Currents