Merge pull request #1250 from wowsims/SvHunterFix

Fix lnl consume
wowsims · Dec 5, 2024 · 2b3bce6 · 2b3bce6
2 parents a277ac0 + 61f0ce6
commit 2b3bce6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/sim/hunter/cata_items.go b/sim/hunter/cata_items.go
@@ -79,7 +79,7 @@ var ItemSetFlameWakersBattleGear = core.NewItemSet(core.ItemSet{
 					}
 
 					// Arcane Shot is free if Lock and Load is up
-					if hunter.HasActiveAura("Lock and Load Proc") && (spell.ClassSpellMask == HunterSpellArcaneShot || spell.ClassSpellMask == HunterSpellExplosiveShot) {
+					if hunter.LockAndLoadAura.IsActive() && (spell.ClassSpellMask == HunterSpellArcaneShot || spell.ClassSpellMask == HunterSpellExplosiveShot || spell.SpellID == 53301 || spell.SpellID == 1215485) {
 						return
 					}
 

diff --git a/sim/hunter/survival/TestSV.results b/sim/hunter/survival/TestSV.results
@@ -627,8 +627,8 @@ dps_results: {
 dps_results: {
  key: "TestSV-AllItems-Flamewaker'sBattlegear"
  value: {
-  dps: 29211.80126
-  tps: 26471.66547
+  dps: 29213.80701
+  tps: 26471.28986
  }
 }
 dps_results: {

diff --git a/sim/hunter/survival_talents.go b/sim/hunter/survival_talents.go
@@ -159,7 +159,7 @@ func (hunter *Hunter) applyTNT() {
 				hunter.ExplosiveShot.CostMultiplier += 1
 			}
 		},
-		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 == hunter.ExplosiveShot {
 				hunter.ExplosiveShot.CD.Reset()
 				aura.RemoveStack(sim)
-Original file line number
+Diff line change
@@ Expand Up @@
     					}
     					// Arcane Shot is free if Lock and Load is up
-    					if hunter.HasActiveAura("Lock and Load Proc") && (spell.ClassSpellMask == HunterSpellArcaneShot || spell.ClassSpellMask == HunterSpellExplosiveShot) {
+    					if hunter.LockAndLoadAura.IsActive() && (spell.ClassSpellMask == HunterSpellArcaneShot || spell.ClassSpellMask == HunterSpellExplosiveShot || spell.SpellID == 53301 || spell.SpellID == 1215485) {
     						return
     					}
@@ Expand Down @@