First pass at mage set implementation

wowsims · Dec 8, 2024 · 4a51a54 · 4a51a54
1 parent e2dc775
commit 4a51a54
Show file tree

Hide file tree

Showing 18 changed files with 560 additions and 616 deletions.
diff --git a/assets/database/db.bin b/assets/database/db.bin
diff --git a/assets/database/db.json b/assets/database/db.json
@@ -8742,8 +8742,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":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":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":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},
@@ -10471,8 +10471,10 @@
 {"id":11255,"name":"Improved Counterspell","icon":"spell_frost_iceshock","rank":1},
 {"id":11269,"name":"Ambush","icon":"ability_rogue_ambush","rank":6},
 {"id":11275,"name":"Rupture","icon":"ability_rogue_rupture","rank":6,"hasBuff":true},
+{"id":11281,"name":"Backstab","icon":"ability_backstab","rank":8},
 {"id":11290,"name":"Garrote","icon":"ability_rogue_garrote","rank":6,"hasBuff":true},
 {"id":11294,"name":"Sinister Strike","icon":"spell_shadow_ritualofsacrifice","rank":8},
+{"id":11300,"name":"Eviscerate","icon":"ability_rogue_eviscerate","rank":8},
 {"id":11306,"name":"Fire Nova","icon":"spell_fire_sealoffire","rank":4},
 {"id":11307,"name":"Fire Nova","icon":"spell_fire_sealoffire","rank":5},
 {"id":11314,"name":"Fire Nova Totem","icon":"spell_fire_sealoffire","rank":4},
@@ -12700,7 +12702,6 @@
 {"id":25297,"name":"Healing Touch","icon":"spell_nature_healingtouch","rank":11},
 {"id":25298,"name":"Starfire","icon":"spell_arcane_starfire","rank":7},
 {"id":25299,"name":"Rejuvenation","icon":"spell_nature_rejuvenation","rank":11,"hasBuff":true},
-{"id":25300,"name":"Backstab","icon":"ability_backstab","rank":9},
 {"id":25304,"name":"Frostbolt","icon":"spell_frost_frostbolt02","rank":11,"hasBuff":true},
 {"id":25306,"name":"Fireball","icon":"spell_fire_flamebolt","rank":12,"hasBuff":true},
 {"id":25307,"name":"Shadow Bolt","icon":"spell_shadow_shadowbolt","rank":10},
@@ -12872,7 +12873,6 @@
 {"id":30906,"name":"Deadliness","icon":"inv_weapon_crossbow_11","rank":5},
 {"id":30919,"name":"Weapon Expertise","icon":"spell_holy_blessingofstrength","rank":1},
 {"id":30920,"name":"Weapon Expertise","icon":"spell_holy_blessingofstrength","rank":2},
-{"id":31016,"name":"Eviscerate","icon":"ability_rogue_eviscerate"},
 {"id":31018,"name":"Ferocious Bite","icon":"ability_druid_ferociousbite"},
 {"id":400574,"name":"Arcane Blast","icon":"spell_arcane_blast"},
 {"id":400610,"name":"Arcane Barrage","icon":"ability_mage_arcanebarrage"},

diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json
@@ -1511,8 +1511,8 @@
 {"effectId":929,"itemId":16217,"spellId":20069,"name":"Enchant Shield - Greater Stamina","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],"quality":1},
 {"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","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":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","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":1},
-{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser 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":943,"spellId":13693,"name":"Enchant Weapon - 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":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser 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":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater 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":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","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,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","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,100,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -1538,8 +1538,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},

diff --git a/sim/common/vanilla/item_sets/dungeon_set_1.go b/sim/common/vanilla/item_sets/dungeon_set_1.go
@@ -121,7 +121,7 @@ var ItemSetMagistersRegalia = core.NewItemSet(core.ItemSet{
 		},
 		// When struck in combat has a chance of freezing the attacker in place for 3 sec.
 		6: func(agent core.Agent) {
-			//Not implemented due to raid boss immunity
+			// No implementation in sim
 		},
 		// +8 All Resistances.
 		8: func(agent core.Agent) {

diff --git a/sim/mage/TestP1Mage.results b/sim/mage/TestP1Mage.results
@@ -96,6 +96,76 @@ stat_weights_results: {
   weights: 0
  }
 }
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-ArcanistRegalia"
+ value: {
+  dps: 97.10096
+  tps: 90.36367
+ }
+}
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-Champion'sRegalia"
+ value: {
+  dps: 84.10533
+  tps: 91.33828
+ }
+}
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-EnigmaVestments"
+ value: {
+  dps: 107.96625
+  tps: 114.91555
+ }
+}
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-FieldMarshal'sRegalia"
+ value: {
+  dps: 106.14672
+  tps: 113.43537
+ }
+}
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-FrostfireRegalia"
+ value: {
+  dps: 146.34232
+  tps: 134.14575
+ }
+}
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-Illusionist'sAttire"
+ value: {
+  dps: 85.18755
+  tps: 92.46523
+ }
+}
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-LieutenantCommander'sRegalia"
+ value: {
+  dps: 84.10533
+  tps: 91.33828
+ }
+}
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-NetherwindRegalia"
+ value: {
+  dps: 107.93251
+  tps: 101.39714
+ }
+}
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-Sorcerer'sRegalia"
+ value: {
+  dps: 92.73649
+  tps: 100.01821
+ }
+}
+dps_results: {
+ key: "TestP1Mage-Phase1-AllItems-Warlord'sRegalia"
+ value: {
+  dps: 106.14672
+  tps: 113.43537
+ }
+}
 dps_results: {
  key: "TestP1Mage-Phase1-Average-Default"
  value: {