Merge pull request #1263 from wowsims/hunterfixdec12

[Hunter] Implement Dec 11 hotfixes
wowsims · Dec 12, 2024 · 0ea0fca · 0ea0fca
2 parents ca728f7 + 3b999ea
commit 0ea0fca
Show file tree

Hide file tree

Showing 6 changed files with 654 additions and 650 deletions.
diff --git a/sim/core/attack.go b/sim/core/attack.go
@@ -174,6 +174,9 @@ func (unit *Unit) OHWeaponDamage(sim *Simulation, attackPower float64) float64 {
 func (unit *Unit) OHNormalizedWeaponDamage(sim *Simulation, attackPower float64) float64 {
 	return 0.5 * unit.AutoAttacks.oh.CalculateNormalizedWeaponDamage(sim, attackPower)
 }
+func (unit *Unit) RangedNormalizedWeaponDamage(sim *Simulation, attackPower float64) float64 {
+	return unit.AutoAttacks.ranged.CalculateNormalizedWeaponDamage(sim, attackPower)
+}
 
 func (unit *Unit) RangedWeaponDamage(sim *Simulation, attackPower float64) float64 {
 	return unit.AutoAttacks.ranged.CalculateWeaponDamage(sim, attackPower)

diff --git a/sim/hunter/aspects.go b/sim/hunter/aspects.go
@@ -33,6 +33,7 @@ func (hunter *Hunter) registerAspectOfTheHawkSpell() {
 		},
 	})
 }
+
 func (hunter *Hunter) registerAspectOfTheFoxSpell() {
 	actionID := core.ActionID{SpellID: 82661}
 

diff --git a/sim/hunter/cata_items.go b/sim/hunter/cata_items.go
@@ -77,11 +77,12 @@ var ItemSetFlameWakersBattleGear = core.NewItemSet(core.ItemSet{
 					if spell.ClassSpellMask&HunterSpellsTierTwelve == 0 || spell.ActionID.SpellID == 0 {
 						return
 					}
-
+					// https://www.bluetracker.gg/wow/topic/eu-en/510644-cataclysm-classic-hotfixes-11-december/
+					// Breaks both Arcane Shot and Explosive Shot consuming of Burning Adrenaline
 					// Arcane Shot is free if Lock and Load is up
-					if hunter.LockAndLoadAura.IsActive() && (spell.ClassSpellMask == HunterSpellArcaneShot || spell.ClassSpellMask == HunterSpellExplosiveShot || spell.SpellID == 53301 || spell.SpellID == 1215485) {
-						return
-					}
+					// if hunter.LockAndLoadAura.IsActive() && (spell.ClassSpellMask == HunterSpellExplosiveShot || spell.SpellID == 53301 || spell.SpellID == 1215485) {
+					// 	return
+					// }
 
 					if hunter.HasActiveAura("Ready, Set, Aim...") && spell.ClassSpellMask == HunterSpellAimedShot {
 						return
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ func (hunter *Hunter) registerAspectOfTheHawkSpell() { @@
     		},
     	})
     }
     func (hunter *Hunter) registerAspectOfTheFoxSpell() {
     	actionID := core.ActionID{SpellID: 82661}
@@ Expand Down @@