Merge pull request wowsims#429 from wowsims/refactor-hunter

Refactor Hunter to use Spell Mods where possible and move the sim to Beta status
ToxicKevinFerm · May 12, 2024 · 6e0ab8d · 6e0ab8d
2 parents 7fd2165 + e8504d9
commit 6e0ab8d
Show file tree

Hide file tree

Showing 26 changed files with 1,775 additions and 1,685 deletions.
diff --git a/sim/hunter/arcane_shot.go b/sim/hunter/arcane_shot.go
@@ -14,7 +14,8 @@ func (hunter *Hunter) registerArcaneShotSpell() {
 		ProcMask:       core.ProcMaskRangedSpecial,
 		Flags:          core.SpellFlagMeleeMetrics | core.SpellFlagAPL,
 		MissileSpeed:   40,
-
+		MinRange:       5,
+		MaxRange:       40,
 		FocusCost: core.FocusCostOptions{
 			Cost: 25 - float64(hunter.Talents.Efficiency),
 		},

diff --git a/sim/hunter/aspects.go b/sim/hunter/aspects.go
@@ -35,11 +35,12 @@ func (hunter *Hunter) registerAspectOfTheHawkSpell() {
 }
 func (hunter *Hunter) registerAspectOfTheFoxSpell() {
 	actionID := core.ActionID{SpellID: 82661}
-	// restoreFocus := 2
+	restoreFocus := 2.0
+	focusMetric := hunter.NewFocusMetrics(actionID)
 
-	// if hunter.Talents.OneWithNature > 0 {
-	// 	restoreFocus += 1 * float64(hunter.Talents.OneWithNature)
-	// }
+	if hunter.Talents.OneWithNature > 0 {
+		restoreFocus += 1 * float64(hunter.Talents.OneWithNature)
+	}
 
 	foxMod := hunter.AddDynamicMod(core.SpellModConfig{
 		Kind:      core.SpellMod_AllowCastWhileMoving,
@@ -54,6 +55,11 @@ func (hunter *Hunter) registerAspectOfTheFoxSpell() {
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
 			foxMod.Deactivate()
 		},
+		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+			if aura.IsActive() {
+				hunter.AddFocus(sim, restoreFocus, focusMetric)
+			}
+		},
 	}))
 
 	hunter.applySharedAspectConfig(true, hunter.AspectOfTheFoxAura)
@@ -68,8 +74,6 @@ func (hunter *Hunter) registerAspectOfTheFoxSpell() {
 	})
 }
 
-// Todo: Implement Aspect of the Fox?
-
 func (hunter *Hunter) applySharedAspectConfig(isHawk bool, aura *core.Aura) {
 	aura.Duration = core.NeverExpires
 	aura.NewExclusiveEffect("Aspect", true, core.ExclusiveEffect{})