Merge pull request #1070 from wowsims/t12-hunter

Fix T12 procs Hunter
wowsims · Oct 2, 2024 · 8d3d70a · 8d3d70a
2 parents b42fe81 + d425c51
commit 8d3d70a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/sim/hunter/beast_mastery/TestBM.results b/sim/hunter/beast_mastery/TestBM.results
@@ -620,8 +620,8 @@ dps_results: {
 dps_results: {
  key: "TestBM-AllItems-Flamewaker'sBattlegear"
  value: {
-  dps: 22901.28393
-  tps: 19273.40391
+  dps: 22782.96715
+  tps: 19168.04784
  }
 }
 dps_results: {

diff --git a/sim/hunter/cata_items.go b/sim/hunter/cata_items.go
@@ -73,10 +73,16 @@ var ItemSetFlameWakersBattleGear = core.NewItemSet(core.ItemSet{
 				OnGain: func(aura *core.Aura, sim *core.Simulation) {
 					baMod.Activate()
 				},
-				OnApplyEffects: func(aura *core.Aura, sim *core.Simulation, target *core.Unit, spell *core.Spell) {
+				OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) {
 					if spell.ClassSpellMask&^HunterSpellsTierTwelve != 0 || spell.ActionID.SpellID == 0 {
 						return
 					}
+					if hunter.HasActiveAura("Lock and Load Proc") && spell.ClassSpellMask == HunterSpellExplosiveShot {
+						return
+					}
+					if hunter.HasActiveAura("Ready, Set, Aim...") && spell.ClassSpellMask == HunterSpellAimedShot {
+						return
+					}
 					baMod.Deactivate()
 					aura.Deactivate(sim)
 				},

diff --git a/sim/hunter/kill_command.go b/sim/hunter/kill_command.go
@@ -18,7 +18,7 @@ func (hunter *Hunter) registerKillCommandSpell() {
 		SpellSchool:    core.SpellSchoolPhysical,
 		ProcMask:       core.ProcMaskMelee,
 		ClassSpellMask: HunterSpellKillCommand,
-		Flags:          core.SpellFlagNoOnCastComplete | core.SpellFlagAPL,
+		Flags:          core.SpellFlagAPL,
 
 		FocusCost: core.FocusCostOptions{
 			Cost: 40,

diff --git a/sim/hunter/marksmanship/TestMM.results b/sim/hunter/marksmanship/TestMM.results
@@ -620,8 +620,8 @@ dps_results: {
 dps_results: {
  key: "TestMM-AllItems-Flamewaker'sBattlegear"
  value: {
-  dps: 22803.17757
-  tps: 20452.59604
+  dps: 23003.58742
+  tps: 20650.69778
  }
 }
 dps_results: {

diff --git a/sim/hunter/survival/TestSV.results b/sim/hunter/survival/TestSV.results
@@ -620,8 +620,8 @@ dps_results: {
 dps_results: {
  key: "TestSV-AllItems-Flamewaker'sBattlegear"
  value: {
-  dps: 26671.69825
-  tps: 24122.77274
+  dps: 26644.74175
+  tps: 24113.99791
  }
 }
 dps_results: {