Merge pull request #2472 from wowsims/fixes

Fix mage t8 set detection
wowsims · Jan 24, 2023 · cf953cc · cf953cc
2 parents b609249 + 4650b81
commit cf953cc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
@@ -432,8 +432,8 @@ dps_results: {
 dps_results: {
  key: "TestArcane-AllItems-KirinTorGarb"
  value: {
-  dps: 6843.52142
-  tps: 4133.67947
+  dps: 6773.87212
+  tps: 4092.85543
  }
 }
 dps_results: {

diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
@@ -432,8 +432,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-AllItems-KirinTorGarb"
  value: {
-  dps: 6374.82619
-  tps: 5098.24219
+  dps: 6274.65264
+  tps: 5019.6335
  }
 }
 dps_results: {

diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
@@ -432,8 +432,8 @@ dps_results: {
 dps_results: {
  key: "TestFrost-AllItems-KirinTorGarb"
  value: {
-  dps: 5029.56474
-  tps: 3992.62514
+  dps: 5022.37638
+  tps: 3986.39356
  }
 }
 dps_results: {

diff --git a/sim/mage/items.go b/sim/mage/items.go
@@ -38,19 +38,22 @@ var ItemSetFrostfireGarb = core.NewItemSet(core.ItemSet{
 
 // T8 Ulduar
 var ItemSetKirinTorGarb = core.NewItemSet(core.ItemSet{
-	Name: "Kirin Tor Garb",
+	Name:            "Kirin Tor Garb",
+	AlternativeName: "Kirin'dor Garb", // Wowhead spells this incorrectly
 	Bonuses: map[int32]core.ApplyEffect{
 		2: func(agent core.Agent) {
 			mage := agent.(MageAgent).GetMage()
-			procAura := mage.NewTemporaryStatsAura("Kirin Tor 2pc", core.ActionID{SpellID: 64867}, stats.Stats{stats.SpellPower: 350}, 15*time.Second)
+			procAura := mage.NewTemporaryStatsAura("Kirin Tor 2pc", core.ActionID{SpellID: 64868}, stats.Stats{stats.SpellPower: 350}, 15*time.Second)
 			core.MakeProcTriggerAura(&mage.Unit, core.ProcTrigger{
 				Name:       "Mage2pT8",
 				Callback:   core.CallbackOnSpellHitDealt,
+				Outcome:    core.OutcomeLanded,
 				ProcChance: 0.25,
 				ICD:        time.Second * 45,
-				SpellFlags: BarrageSpells,
-				Handler: func(sim *core.Simulation, _ *core.Spell, _ *core.SpellResult) {
-					procAura.Activate(sim)
+				Handler: func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) {
+					if spell == mage.ArcaneBlast || spell == mage.Fireball || spell == mage.FrostfireBolt || spell == mage.Frostbolt {
+						procAura.Activate(sim)
+					}
 				},
 			})
 		},