diff --git a/assets/database/db.bin b/assets/database/db.bin index 866b695106..2937a8f89a 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 0ddd1bcd13..89c7f15e81 100644 --- a/assets/database/db.json +++ b/assets/database/db.json @@ -10655,6 +10655,7 @@ {"effectId":907,"spellId":13846,"name":"Enchant Bracer - Greater Spirit","type":6,"stats":[0,0,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],"quality":1}, {"effectId":908,"spellId":13858,"name":"Enchant Chest - Superior Health","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,50,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":909,"spellId":13868,"name":"Enchant Gloves - Advanced Herbalism","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],"quality":2}, +{"effectId":910,"spellId":25083,"name":"Enchant Cloak - Stealth","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],"quality":3}, {"effectId":911,"spellId":13890,"name":"Enchant Boots - Minor Speed","type":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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":912,"spellId":13915,"name":"Enchant Weapon - Demonslaying","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],"quality":2}, {"effectId":913,"spellId":13917,"name":"Enchant Chest - Superior Mana","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,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, @@ -10715,6 +10716,7 @@ {"effectId":2544,"itemId":18330,"spellId":22844,"name":"Arcanum of Focus","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":22846,"name":"Arcanum of Protection","type":1,"extraTypes":[9],"enchantType":3,"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,1,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":2563,"spellId":23799,"name":"Enchant Weapon - Strength","type":13,"stats":[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,0,0],"quality":1}, +{"effectId":2564,"spellId":25080,"name":"Enchant Gloves - Superior Agility","type":7,"stats":[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,0],"quality":3}, {"effectId":2564,"spellId":23800,"name":"Enchant Weapon - Agility","type":13,"stats":[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,0],"quality":1}, {"effectId":2565,"spellId":23801,"name":"Enchant Bracer - Mana Regeneration","type":6,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,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":2566,"spellId":23802,"name":"Enchant Bracer - Healing Power","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,24,0,0],"quality":1}, @@ -10723,8 +10725,15 @@ {"effectId":2604,"itemId":20078,"spellId":24420,"name":"Zandalar Signet of Serenity","type":3,"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,33,0,0],"quality":3}, {"effectId":2605,"itemId":20076,"spellId":24421,"name":"Zandalar Signet of Mojo","type":3,"stats":[0,0,0,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,18,0,0],"quality":3}, {"effectId":2606,"itemId":20077,"spellId":24422,"name":"Zandalar Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, +{"effectId":2613,"spellId":25072,"name":"Enchant Gloves - Threat","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],"quality":3}, +{"effectId":2614,"spellId":25073,"name":"Enchant Gloves - Shadow Power","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,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],"quality":3}, +{"effectId":2615,"spellId":25074,"name":"Enchant Gloves - Frost Power","type":7,"stats":[0,0,0,0,0,0,0,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],"quality":3}, +{"effectId":2616,"spellId":25078,"name":"Enchant Gloves - Fire Power","type":7,"stats":[0,0,0,0,0,0,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],"quality":3}, +{"effectId":2617,"spellId":25079,"name":"Enchant Gloves - Healing Power","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,30,0,0],"quality":3}, {"effectId":2619,"itemId":229008,"spellId":25081,"name":"Enchant Cloak - Greater Fire Resistance","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,15,0,0,0,0,0,0,0],"quality":1}, {"effectId":2620,"itemId":229009,"spellId":25082,"name":"Enchant Cloak - Greater Nature Resistance","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,15,0,0,0,0,0],"quality":1}, +{"effectId":2621,"spellId":25084,"name":"Enchant Cloak - Subtlety","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],"quality":3}, +{"effectId":2622,"spellId":25086,"name":"Enchant Cloak - Dodge","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,1,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, {"effectId":2646,"spellId":27837,"name":"Enchant 2H Weapon - Agility","type":13,"enchantType":1,"stats":[0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":2681,"itemId":22635,"spellId":28161,"name":"Savage Guard","type":1,"extraTypes":[9],"enchantType":3,"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,10,0,0,0,0,0],"quality":3}, {"effectId":7124,"itemId":212568,"spellId":432190,"name":"Wolfshead Trophy","type":1,"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],"quality":3,"classAllowlist":[1]}, @@ -10758,7 +10767,12 @@ {"effectId":7632,"itemId":231379,"spellId":468373,"name":"Presence of Might","type":1,"extraTypes":[9],"enchantType":3,"stats":[10,10,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],"quality":3,"classAllowlist":[9],"requiresLevel":60}, {"effectId":7633,"itemId":231381,"spellId":468376,"name":"Presence of Valor","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,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,7,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"classAllowlist":[9],"requiresLevel":60}, {"effectId":7634,"itemId":231383,"spellId":468380,"name":"Presence of Sight","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,10,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],"quality":3,"classAllowlist":[3],"requiresLevel":60}, -{"effectId":7635,"itemId":231384,"spellId":468383,"name":"Falcon's Fury","type":1,"extraTypes":[9],"enchantType":3,"stats":[10,10,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],"quality":3,"classAllowlist":[2],"requiresLevel":60} +{"effectId":7635,"itemId":231384,"spellId":468383,"name":"Falcon's Fury","type":1,"extraTypes":[9],"enchantType":3,"stats":[10,10,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],"quality":3,"classAllowlist":[2],"requiresLevel":60}, +{"effectId":7645,"spellId":1213616,"name":"Enchant Chest - Living Stats","type":5,"stats":[4,4,4,4,4,0,0,0,0,0,0,0,0,0,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],"quality":3}, +{"effectId":7646,"spellId":1213622,"name":"Enchant Gloves - Holy Power","type":7,"stats":[0,0,0,0,0,0,0,0,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],"quality":3}, +{"effectId":7647,"spellId":1213626,"name":"Enchant Gloves - Arcane Power","type":7,"stats":[0,0,0,0,0,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],"quality":3}, +{"effectId":7648,"itemId":233802,"spellId":1213829,"name":"Glowing Chitin Armor Kit","type":5,"extraTypes":[9,7,10],"enchantType":3,"stats":[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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, +{"effectId":7649,"itemId":233803,"spellId":1213519,"name":"Sharpened Chitin Armor Kit","type":5,"extraTypes":[9,7,10],"enchantType":3,"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],"quality":3} ], "runes":[ {"id":29787,"name":"Engrave Belt - Focused Rage","icon":"ability_warrior_focusedrage","type":8,"requiresLevel":1,"classAllowlist":[9]}, @@ -11474,7 +11488,9 @@ {"id":231379,"name":"Presence of Might","icon":"spell_holy_sealofwrath","requiresLevel":60}, {"id":231381,"name":"Presence of Valor","icon":"spell_holy_sealofwrath","requiresLevel":60}, {"id":231383,"name":"Presence of Sight","icon":"spell_shadow_detectlesserinvisibility","requiresLevel":60}, -{"id":231384,"name":"Falcon's Fury","icon":"spell_nature_forceofnature","requiresLevel":60} +{"id":231384,"name":"Falcon's Fury","icon":"spell_nature_forceofnature","requiresLevel":60}, +{"id":233802,"name":"Glowing Chitin Armor Kit","icon":"inv_misc_armorkit_06","requiresLevel":50}, +{"id":233803,"name":"Sharpened Chitin Armor Kit","icon":"inv_misc_armorkit_20","requiresLevel":50} ], "spellIcons":[ {"id":10,"name":"Blizzard","icon":"spell_frost_icestorm","rank":1,"requiresLevel":20,"hasBuff":true}, @@ -14798,8 +14814,17 @@ {"id":24975,"name":"Insect Swarm","icon":"spell_nature_insectswarm","rank":3,"requiresLevel":40,"hasBuff":true}, {"id":24976,"name":"Insect Swarm","icon":"spell_nature_insectswarm","rank":4,"requiresLevel":50,"hasBuff":true}, {"id":24977,"name":"Insect Swarm","icon":"spell_nature_insectswarm","rank":5,"requiresLevel":60,"hasBuff":true}, +{"id":25072,"name":"Enchant Gloves - Threat","icon":"spell_holy_greaterheal"}, +{"id":25073,"name":"Enchant Gloves - Shadow Power","icon":"spell_holy_greaterheal"}, +{"id":25074,"name":"Enchant Gloves - Frost Power","icon":"spell_holy_greaterheal"}, +{"id":25078,"name":"Enchant Gloves - Fire Power","icon":"spell_holy_greaterheal"}, +{"id":25079,"name":"Enchant Gloves - Healing Power","icon":"spell_holy_greaterheal"}, +{"id":25080,"name":"Enchant Gloves - Superior Agility","icon":"spell_holy_greaterheal"}, {"id":25081,"name":"Enchant Cloak - Greater Fire Resistance","icon":"spell_holy_greaterheal"}, {"id":25082,"name":"Enchant Cloak - Greater Nature Resistance","icon":"spell_holy_greaterheal"}, +{"id":25083,"name":"Enchant Cloak - Stealth","icon":"spell_holy_greaterheal"}, +{"id":25084,"name":"Enchant Cloak - Subtlety","icon":"spell_holy_greaterheal"}, +{"id":25086,"name":"Enchant Cloak - Dodge","icon":"spell_holy_greaterheal"}, {"id":25286,"name":"Heroic Strike","icon":"ability_rogue_ambush","rank":9,"requiresLevel":60}, {"id":25288,"name":"Revenge","icon":"ability_warrior_revenge","rank":6,"requiresLevel":60}, {"id":25289,"name":"Battle Shout","icon":"ability_warrior_battleshout","rank":7,"requiresLevel":60,"hasBuff":true}, diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin index f055de3831..434257cf0b 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 d6cf2b85d0..a30b08d94b 100644 --- a/assets/database/leftover_db.json +++ b/assets/database/leftover_db.json @@ -1482,8 +1482,8 @@ {"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","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],"quality":1}, {"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","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],"quality":1}, {"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"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],"quality":1}, +{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","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],"quality":1}, {"effectId":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","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,15,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":246,"spellId":7776,"name":"Enchant Chest - Lesser Mana","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,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, @@ -1542,6 +1542,7 @@ {"effectId":907,"spellId":13846,"name":"Enchant Bracer - Greater Spirit","type":6,"stats":[0,0,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],"quality":1}, {"effectId":908,"spellId":13858,"name":"Enchant Chest - Superior Health","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,50,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":909,"spellId":13868,"name":"Enchant Gloves - Advanced Herbalism","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],"quality":2}, +{"effectId":910,"spellId":25083,"name":"Enchant Cloak - Stealth","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],"quality":3}, {"effectId":911,"spellId":13890,"name":"Enchant Boots - Minor Speed","type":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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1}, {"effectId":912,"spellId":13915,"name":"Enchant Weapon - Demonslaying","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],"quality":2}, {"effectId":913,"spellId":13917,"name":"Enchant Chest - Superior Mana","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,65,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, @@ -1584,8 +1585,8 @@ {"effectId":1893,"spellId":20028,"name":"Enchant Chest - Major Mana","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,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":1894,"spellId":20029,"name":"Enchant Weapon - Icy Chill","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],"quality":2}, {"effectId":1896,"spellId":20030,"name":"Enchant 2H Weapon - Superior Impact","type":13,"enchantType":1,"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],"quality":2}, -{"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","type":13,"enchantType":1,"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],"quality":1}, {"effectId":1897,"spellId":20031,"name":"Enchant Weapon - Superior Striking","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],"quality":2}, +{"effectId":1897,"spellId":13695,"name":"Enchant 2H Weapon - Impact","type":13,"enchantType":1,"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],"quality":1}, {"effectId":1898,"spellId":20032,"name":"Enchant Weapon - Lifestealing","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],"quality":3}, {"effectId":1899,"spellId":20033,"name":"Enchant Weapon - Unholy Weapon","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],"quality":2}, {"effectId":1900,"spellId":20034,"name":"Enchant Weapon - Crusader","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],"quality":2}, @@ -1602,6 +1603,7 @@ {"effectId":2544,"itemId":18330,"spellId":22844,"name":"Arcanum of Focus","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":22846,"name":"Arcanum of Protection","type":1,"extraTypes":[9],"enchantType":3,"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,1,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2}, {"effectId":2563,"spellId":23799,"name":"Enchant Weapon - Strength","type":13,"stats":[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,0,0],"quality":1}, +{"effectId":2564,"spellId":25080,"name":"Enchant Gloves - Superior Agility","type":7,"stats":[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,0],"quality":3}, {"effectId":2564,"spellId":23800,"name":"Enchant Weapon - Agility","type":13,"stats":[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,0],"quality":1}, {"effectId":2565,"spellId":23801,"name":"Enchant Bracer - Mana Regeneration","type":6,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,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":2566,"spellId":23802,"name":"Enchant Bracer - Healing Power","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,24,0,0],"quality":1}, @@ -1610,8 +1612,15 @@ {"effectId":2604,"itemId":20078,"spellId":24420,"name":"Zandalar Signet of Serenity","type":3,"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,33,0,0],"quality":3}, {"effectId":2605,"itemId":20076,"spellId":24421,"name":"Zandalar Signet of Mojo","type":3,"stats":[0,0,0,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,18,0,0],"quality":3}, {"effectId":2606,"itemId":20077,"spellId":24422,"name":"Zandalar Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, +{"effectId":2613,"spellId":25072,"name":"Enchant Gloves - Threat","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],"quality":3}, +{"effectId":2614,"spellId":25073,"name":"Enchant Gloves - Shadow Power","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,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],"quality":3}, +{"effectId":2615,"spellId":25074,"name":"Enchant Gloves - Frost Power","type":7,"stats":[0,0,0,0,0,0,0,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],"quality":3}, +{"effectId":2616,"spellId":25078,"name":"Enchant Gloves - Fire Power","type":7,"stats":[0,0,0,0,0,0,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],"quality":3}, +{"effectId":2617,"spellId":25079,"name":"Enchant Gloves - Healing Power","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,30,0,0],"quality":3}, {"effectId":2619,"itemId":229008,"spellId":25081,"name":"Enchant Cloak - Greater Fire Resistance","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,15,0,0,0,0,0,0,0],"quality":1}, {"effectId":2620,"itemId":229009,"spellId":25082,"name":"Enchant Cloak - Greater Nature Resistance","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,15,0,0,0,0,0],"quality":1}, +{"effectId":2621,"spellId":25084,"name":"Enchant Cloak - Subtlety","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],"quality":3}, +{"effectId":2622,"spellId":25086,"name":"Enchant Cloak - Dodge","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,1,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, {"effectId":2646,"spellId":27837,"name":"Enchant 2H Weapon - Agility","type":13,"enchantType":1,"stats":[0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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":2681,"itemId":22635,"spellId":28161,"name":"Savage Guard","type":1,"extraTypes":[9],"enchantType":3,"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,10,0,0,0,0,0],"quality":3}, {"effectId":7124,"itemId":212568,"spellId":432190,"name":"Wolfshead Trophy","type":1,"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],"quality":3,"classAllowlist":[1]}, @@ -1645,7 +1654,12 @@ {"effectId":7632,"itemId":231379,"spellId":468373,"name":"Presence of Might","type":1,"extraTypes":[9],"enchantType":3,"stats":[10,10,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],"quality":3,"classAllowlist":[9],"requiresLevel":60}, {"effectId":7633,"itemId":231381,"spellId":468376,"name":"Presence of Valor","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,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,7,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3,"classAllowlist":[9],"requiresLevel":60}, {"effectId":7634,"itemId":231383,"spellId":468380,"name":"Presence of Sight","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,20,10,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],"quality":3,"classAllowlist":[3],"requiresLevel":60}, -{"effectId":7635,"itemId":231384,"spellId":468383,"name":"Falcon's Fury","type":1,"extraTypes":[9],"enchantType":3,"stats":[10,10,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],"quality":3,"classAllowlist":[2],"requiresLevel":60} +{"effectId":7635,"itemId":231384,"spellId":468383,"name":"Falcon's Fury","type":1,"extraTypes":[9],"enchantType":3,"stats":[10,10,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],"quality":3,"classAllowlist":[2],"requiresLevel":60}, +{"effectId":7645,"spellId":1213616,"name":"Enchant Chest - Living Stats","type":5,"stats":[4,4,4,4,4,0,0,0,0,0,0,0,0,0,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],"quality":3}, +{"effectId":7646,"spellId":1213622,"name":"Enchant Gloves - Holy Power","type":7,"stats":[0,0,0,0,0,0,0,0,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],"quality":3}, +{"effectId":7647,"spellId":1213626,"name":"Enchant Gloves - Arcane Power","type":7,"stats":[0,0,0,0,0,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],"quality":3}, +{"effectId":7648,"itemId":233802,"spellId":1213829,"name":"Glowing Chitin Armor Kit","type":5,"extraTypes":[9,7,10],"enchantType":3,"stats":[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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}, +{"effectId":7649,"itemId":233803,"spellId":1213519,"name":"Sharpened Chitin Armor Kit","type":5,"extraTypes":[9,7,10],"enchantType":3,"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],"quality":3} ], "runes":[ {"id":29787,"name":"Engrave Belt - Focused Rage","icon":"ability_warrior_focusedrage","type":8,"requiresLevel":1,"classAllowlist":[9]}, diff --git a/proto/common.proto b/proto/common.proto index de27d4fc17..5fcf86c49c 100644 --- a/proto/common.proto +++ b/proto/common.proto @@ -525,7 +525,7 @@ enum MageScroll { MageScrollFrostProtection = 5; } -// NextIndex: 30 +// NextIndex: 31 enum WeaponImbue { // Weapon Oils WeaponImbueUnknown = 0; @@ -534,7 +534,8 @@ enum WeaponImbue { MinorWizardOil = 13; LesserWizardOil = 14; WizardOil = 20; - BrillianWizardOil = 2; + BrilliantWizardOil = 2; + EnchantedRepellent = 30; MinorManaOil = 15; LesserManaOil = 16; diff --git a/sim/common/vanilla/enchant_effects.go b/sim/common/vanilla/enchant_effects.go index 203df40230..49f9bc95e3 100644 --- a/sim/common/vanilla/enchant_effects.go +++ b/sim/common/vanilla/enchant_effects.go @@ -312,5 +312,60 @@ func init() { }) }) + core.NewEnchantEffect(2621, func(agent core.Agent) { + character := agent.GetCharacter() + + character.RegisterAura(core.Aura{ + Label: "Subtlety", + OnReset: func(aura *core.Aura, sim *core.Simulation) { + character.PseudoStats.ThreatMultiplier /= 1.02 + }, + }) + }) + + core.NewEnchantEffect(2613, func(agent core.Agent) { + character := agent.GetCharacter() + + character.RegisterAura(core.Aura{ + Label: "Threat +2%", + OnReset: func(aura *core.Aura, sim *core.Simulation) { + character.PseudoStats.ThreatMultiplier *= 1.02 + }, + }) + }) + + core.NewEnchantEffect(7649, func(agent core.Agent) { + character := agent.GetCharacter() + actionID := core.ActionID{SpellID: 1213833} + + procSpell := character.RegisterSpell(core.SpellConfig{ + ActionID: actionID, + SpellSchool: core.SpellSchoolNature, + ProcMask: core.ProcMaskEmpty, + Flags: core.SpellFlagBinary | core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell, + + DamageMultiplier: 1, + ThreatMultiplier: 1, + + ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { + spell.CalcAndDealDamage(sim, target, 20, spell.OutcomeMagicHit) + }, + }) + + character.GetOrRegisterAura(core.Aura{ + Label: "Thorns +20", + Duration: core.NeverExpires, + OnReset: func(aura *core.Aura, sim *core.Simulation) { + aura.Activate(sim) + }, + OnSpellHitTaken: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) { + if result.Landed() && spell.ProcMask.Matches(core.ProcMaskMelee) { + procSpell.Cast(sim, spell.Unit) + } + }, + }) + }) + + core.AddEffectsToTest = true } diff --git a/sim/core/consumes.go b/sim/core/consumes.go index 0a900894cc..4b383ca3ad 100644 --- a/sim/core/consumes.go +++ b/sim/core/consumes.go @@ -133,11 +133,16 @@ func addImbueStats(character *Character, imbue proto.WeaponImbue, isMh bool, sha character.AddStats(stats.Stats{ stats.SpellPower: 24, }) - case proto.WeaponImbue_BrillianWizardOil: + case proto.WeaponImbue_BrilliantWizardOil: character.AddStats(stats.Stats{ stats.SpellPower: 36, stats.SpellCrit: 1 * SpellCritRatingPerCritChance, }) + case proto.WeaponImbue_EnchantedRepellent: + character.AddStats(stats.Stats{ + stats.SpellPower: 45, + stats.SpellCrit: 1 * SpellCritRatingPerCritChance, + }) // Mana Oils case proto.WeaponImbue_MinorManaOil: diff --git a/sim/druid/balance/balance_test.go b/sim/druid/balance/balance_test.go index 8ace149d91..bbcf110416 100644 --- a/sim/druid/balance/balance_test.go +++ b/sim/druid/balance/balance_test.go @@ -156,7 +156,7 @@ var Phase5Consumes = core.ConsumesCombo{ DefaultPotion: proto.Potions_MajorManaPotion, Flask: proto.Flask_FlaskOfSupremePower, Food: proto.Food_FoodNightfinSoup, - MainHandImbue: proto.WeaponImbue_BrillianWizardOil, + MainHandImbue: proto.WeaponImbue_BrilliantWizardOil, SpellPowerBuff: proto.SpellPowerBuff_GreaterArcaneElixir, }, } diff --git a/sim/mage/mage_test.go b/sim/mage/mage_test.go index e775fda402..caee043f06 100644 --- a/sim/mage/mage_test.go +++ b/sim/mage/mage_test.go @@ -334,7 +334,7 @@ var Phase5Consumes = core.ConsumesCombo{ FirePowerBuff: proto.FirePowerBuff_ElixirOfGreaterFirepower, FrostPowerBuff: proto.FrostPowerBuff_ElixirOfFrostPower, Food: proto.Food_FoodRunnTumTuberSurprise, - MainHandImbue: proto.WeaponImbue_BrillianWizardOil, + MainHandImbue: proto.WeaponImbue_BrilliantWizardOil, SpellPowerBuff: proto.SpellPowerBuff_GreaterArcaneElixir, }, } diff --git a/tools/database/enchant_overrides.go b/tools/database/enchant_overrides.go index f7e157cdee..0963b5cd1c 100644 --- a/tools/database/enchant_overrides.go +++ b/tools/database/enchant_overrides.go @@ -18,6 +18,10 @@ var EnchantOverrides = []*proto.UIEnchant{ {EffectId: 1843, ItemId: 15564, SpellId: 19057, Name: "Rugged Armor Kit", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.BonusArmor: 40}.ToFloatArray(), Type: proto.ItemType_ItemTypeChest, ExtraTypes: []proto.ItemType{proto.ItemType_ItemTypeLegs, proto.ItemType_ItemTypeHands, proto.ItemType_ItemTypeFeet}, EnchantType: proto.EnchantType_EnchantTypeKit}, // Drops in MC {EffectId: 2503, ItemId: 18251, SpellId: 22725, Name: "Core Armor Kit", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.Defense: 3}.ToFloatArray(), Type: proto.ItemType_ItemTypeChest, ExtraTypes: []proto.ItemType{proto.ItemType_ItemTypeLegs, proto.ItemType_ItemTypeHands, proto.ItemType_ItemTypeFeet}, EnchantType: proto.EnchantType_EnchantTypeKit}, + // SoD Phase 6 Armor Kit + {EffectId: 7648, ItemId: 233802, SpellId: 1213829, Name: "Glowing Chitin Armor Kit", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.SpellPower: 10}.ToFloatArray(), Type: proto.ItemType_ItemTypeChest, ExtraTypes: []proto.ItemType{proto.ItemType_ItemTypeLegs, proto.ItemType_ItemTypeHands, proto.ItemType_ItemTypeFeet}, EnchantType: proto.EnchantType_EnchantTypeKit}, + {EffectId: 7649, ItemId: 233803, SpellId: 1213519, Name: "Sharpened Chitin Armor Kit", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeChest, ExtraTypes: []proto.ItemType{proto.ItemType_ItemTypeLegs, proto.ItemType_ItemTypeHands, proto.ItemType_ItemTypeFeet}, EnchantType: proto.EnchantType_EnchantTypeKit}, + // Arcanums // Lvl 50 Burning Steppes Quest @@ -115,15 +119,15 @@ var EnchantOverrides = []*proto.UIEnchant{ {EffectId: 2620, ItemId: 229009, SpellId: 25082, Name: "Enchant Cloak - Greater Nature Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.NatureResistance: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, {EffectId: 2619, ItemId: 229008, SpellId: 25081, Name: "Enchant Cloak - Greater Fire Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.FireResistance: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, // Drop in AQ - // {EffectId: 2622, SpellId: 25086, Name: "Enchant Cloak - Dodge", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.Dodge: 1 * core.DodgeRatingPerDodgeChance}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, + {EffectId: 2622, SpellId: 25086, Name: "Enchant Cloak - Dodge", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.Dodge: 1 * core.DodgeRatingPerDodgeChance}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, // Requires Cenarion Circle - Friendly which doesn't seem doable until phase 4 // {EffectId: 2619, SpellId: 25081, Name: "Enchant Cloak - Greater Fire Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.FireResistance: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, // Requires Cenarion Circle - Honored which doesn't seem doable until phase 4 // {EffectId: 2620, SpellId: 25082, Name: "Enchant Cloak - Greater Nature Resistance", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.NatureResistance: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, // Drop in AQ - // {EffectId: 910, SpellId: 25083, Name: "Enchant Cloak - Stealth", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, + {EffectId: 910, SpellId: 25083, Name: "Enchant Cloak - Stealth", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, // Drop in AQ - // {EffectId: 2621, SpellId: 25084, Name: "Enchant Cloak - Subtlety", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, + {EffectId: 2621, SpellId: 25084, Name: "Enchant Cloak - Subtlety", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeBack}, // Chest {EffectId: 41, SpellId: 7420, Name: "Enchant Chest - Minor Health", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.Health: 5}.ToFloatArray(), Type: proto.ItemType_ItemTypeChest}, @@ -145,6 +149,8 @@ var EnchantOverrides = []*proto.UIEnchant{ {EffectId: 1892, SpellId: 20026, Name: "Enchant Chest - Major Health", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.Health: 100}.ToFloatArray(), Type: proto.ItemType_ItemTypeChest}, {EffectId: 1893, SpellId: 20028, Name: "Enchant Chest - Major Mana", Quality: proto.ItemQuality_ItemQualityUncommon, Stats: stats.Stats{stats.Mana: 100}.ToFloatArray(), Type: proto.ItemType_ItemTypeChest}, {EffectId: 1891, SpellId: 20025, Name: "Enchant Chest - Greater Stats", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.Stamina: 4, stats.Agility: 4, stats.Strength: 4, stats.Intellect: 4, stats.Spirit: 4}.ToFloatArray(), Type: proto.ItemType_ItemTypeChest}, + //SoD P6 Enchants + {EffectId: 7645, SpellId: 1213616, Name: "Enchant Chest - Living Stats", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.Stamina: 4, stats.Agility: 4, stats.Strength: 4, stats.Intellect: 4, stats.Spirit: 4, stats.NatureResistance: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeChest}, // Wrist {EffectId: 66, SpellId: 7457, Name: "Enchant Bracer - Minor Stamina", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.Stamina: 1}.ToFloatArray(), Type: proto.ItemType_ItemTypeWrist}, @@ -188,12 +194,15 @@ var EnchantOverrides = []*proto.UIEnchant{ {EffectId: 1887, SpellId: 20012, Name: "Enchant Gloves - Greater Agility", Quality: proto.ItemQuality_ItemQualityUncommon, Stats: stats.Stats{stats.Agility: 7}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, {EffectId: 927, SpellId: 20013, Name: "Enchant Gloves - Greater Strength", Quality: proto.ItemQuality_ItemQualityCommon, Stats: stats.Stats{stats.Strength: 7}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, // All drops in AQ - // {EffectId: 2616, SpellId: 25078, Name: "Enchant Gloves - Fire Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.FirePower: 20}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, - // {EffectId: 2615, SpellId: 25074, Name: "Enchant Gloves - Frost Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.FrostPower: 20}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, - // {EffectId: 2617, SpellId: 25079, Name: "Enchant Gloves - Healing Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.HealingPower: 30}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, - // {EffectId: 2614, SpellId: 25073, Name: "Enchant Gloves - Shadow Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.ShadowPower: 20}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, - // {EffectId: 2564, SpellId: 25080, Name: "Enchant Gloves - Superior Agility", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.Agility: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, - // {EffectId: 2613, SpellId: 25072, Name: "Enchant Gloves - Threat", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, + {EffectId: 2616, SpellId: 25078, Name: "Enchant Gloves - Fire Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.FirePower: 20}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, + {EffectId: 2615, SpellId: 25074, Name: "Enchant Gloves - Frost Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.FrostPower: 20}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, + {EffectId: 2617, SpellId: 25079, Name: "Enchant Gloves - Healing Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.HealingPower: 30}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, + {EffectId: 2614, SpellId: 25073, Name: "Enchant Gloves - Shadow Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.ShadowPower: 20}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, + {EffectId: 2564, SpellId: 25080, Name: "Enchant Gloves - Superior Agility", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.Agility: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, + {EffectId: 2613, SpellId: 25072, Name: "Enchant Gloves - Threat", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, + //SoD P6 Enchants + {EffectId: 7646, SpellId: 1213622, Name: "Enchant Gloves - Holy Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.HolyPower: 20}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, + {EffectId: 7647, SpellId: 1213626, Name: "Enchant Gloves - Arcane Power", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.ArcanePower: 20}.ToFloatArray(), Type: proto.ItemType_ItemTypeHands}, // Feet {EffectId: 247, SpellId: 7867, Name: "Enchant Boots - Minor Agility", Quality: proto.ItemQuality_ItemQualityUncommon, Stats: stats.Stats{stats.Agility: 1}.ToFloatArray(), Type: proto.ItemType_ItemTypeFeet}, diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts index bc43adea82..1fe60e97fd 100644 --- a/ui/balance_druid/presets.ts +++ b/ui/balance_druid/presets.ts @@ -121,7 +121,7 @@ export const DefaultConsumes = Consumes.create({ enchantedSigil: EnchantedSigil.FlowingWatersSigil, flask: Flask.FlaskOfSupremePower, food: Food.FoodRunnTumTuberSurprise, - mainHandImbue: WeaponImbue.BrillianWizardOil, + mainHandImbue: WeaponImbue.BrilliantWizardOil, manaRegenElixir: ManaRegenElixir.MagebloodPotion, mildlyIrradiatedRejuvPot: true, diff --git a/ui/core/components/inputs/consumables.ts b/ui/core/components/inputs/consumables.ts index 43836351c1..d35b2d86a2 100644 --- a/ui/core/components/inputs/consumables.ts +++ b/ui/core/components/inputs/consumables.ts @@ -1019,10 +1019,20 @@ export const WildStrikes: ConsumableInputConfig = { // Other Imbues // Wizard Oils -export const BrillianWizardOil = (slot: ItemSlot): ConsumableInputConfig => { +export const EnchantedRepellent = (slot: ItemSlot): ConsumableInputConfig => { + return { + actionId: player => player.getMatchingItemActionId([{ id: 233996, minLevel: 60 }]), + value: WeaponImbue.EnchantedRepellent, + showWhen: player => { + const weapon = player.getEquippedItem(slot); + return !weapon || weapon.item.weaponType != WeaponType.WeaponTypeOffHand; + }, + }; +}; +export const BrilliantWizardOil = (slot: ItemSlot): ConsumableInputConfig => { return { actionId: player => player.getMatchingItemActionId([{ id: 20749, minLevel: 45 }]), - value: WeaponImbue.BrillianWizardOil, + value: WeaponImbue.BrilliantWizardOil, showWhen: player => { const weapon = player.getEquippedItem(slot); return !weapon || isWeapon(weapon.item.weaponType); @@ -1223,9 +1233,10 @@ const ROGUE_IMBUES: ConsumableStatOption[] = [ ]; const CONSUMABLES_IMBUES = (slot: ItemSlot): ConsumableStatOption[] => [ + { config: EnchantedRepellent(slot), stats: [Stat.StatSpellPower] }, { config: MagnificentTrollshine(slot), stats: [Stat.StatSpellPower] }, { config: ConductiveShieldCoating(slot), stats: [Stat.StatSpellPower] }, - { config: BrillianWizardOil(slot), stats: [Stat.StatSpellPower] }, + { config: BrilliantWizardOil(slot), stats: [Stat.StatSpellPower] }, { config: WizardOil(slot), stats: [Stat.StatSpellPower] }, { config: LesserWizardOil(slot), stats: [Stat.StatSpellPower] }, { config: MinorWizardOil(slot), stats: [Stat.StatSpellPower] }, diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts index 192fa785fe..296717ad88 100644 --- a/ui/mage/presets.ts +++ b/ui/mage/presets.ts @@ -282,7 +282,7 @@ export const DefaultConsumes = Consumes.create({ food: Food.FoodRunnTumTuberSurprise, frostPowerBuff: FrostPowerBuff.ElixirOfFrostPower, mageScroll: MageScroll.MageScrollArcanePower, - mainHandImbue: WeaponImbue.BrillianWizardOil, + mainHandImbue: WeaponImbue.BrilliantWizardOil, manaRegenElixir: ManaRegenElixir.MagebloodPotion, mildlyIrradiatedRejuvPot: true, diff --git a/ui/shadow_priest/presets.ts b/ui/shadow_priest/presets.ts index 7f64051f8a..43e8705571 100644 --- a/ui/shadow_priest/presets.ts +++ b/ui/shadow_priest/presets.ts @@ -129,7 +129,7 @@ export const DefaultConsumes = Consumes.create({ enchantedSigil: EnchantedSigil.FlowingWatersSigil, flask: Flask.FlaskOfSupremePower, food: Food.FoodRunnTumTuberSurprise, - mainHandImbue: WeaponImbue.BrillianWizardOil, + mainHandImbue: WeaponImbue.BrilliantWizardOil, manaRegenElixir: ManaRegenElixir.MagebloodPotion, mildlyIrradiatedRejuvPot: true, diff --git a/ui/warlock/presets.ts b/ui/warlock/presets.ts index cf8c5d5b6e..82f27151d4 100644 --- a/ui/warlock/presets.ts +++ b/ui/warlock/presets.ts @@ -245,7 +245,7 @@ export const DefaultConsumes = Consumes.create({ flask: Flask.FlaskOfSupremePower, firePowerBuff: FirePowerBuff.ElixirOfGreaterFirepower, food: Food.FoodTenderWolfSteak, - mainHandImbue: WeaponImbue.BrillianWizardOil, + mainHandImbue: WeaponImbue.BrilliantWizardOil, manaRegenElixir: ManaRegenElixir.MagebloodPotion, spellPowerBuff: SpellPowerBuff.GreaterArcaneElixir,