Merge pull request #1225 from wowsims/hunter-nov

[Hunter] Small fixes for Hunter
wowsims · Nov 24, 2024 · dc5f29a · dc5f29a
2 parents 8542ef9 + 29455e4
commit dc5f29a
Show file tree

Hide file tree

Showing 14 changed files with 1,411 additions and 1,619 deletions.
diff --git a/sim/hunter/beast_mastery/TestBM.results b/sim/hunter/beast_mastery/TestBM.results
@@ -2228,8 +2228,8 @@ dps_results: {
 dps_results: {
  key: "TestBM-AllItems-WyrmstalkerBattlegear"
  value: {
-  dps: 24182.45572
-  tps: 20624.70105
+  dps: 22604.90031
+  tps: 19097.24913
  }
 }
 dps_results: {

diff --git a/sim/hunter/cata_items.go b/sim/hunter/cata_items.go
@@ -121,34 +121,22 @@ var ItemSetWyrmstalkerBattleGear = core.NewItemSet(core.ItemSet{
 				Label:    "Chronohunter",
 				Duration: time.Second * 15,
 				ActionID: core.ActionID{SpellID: 105919},
-				Icd: &core.Cooldown{ // Assume 113sec icd for now
-					Duration: time.Second * 113,
-					Timer:    hunter.NewTimer(),
-				},
-				OnReset: func(aura *core.Aura, sim *core.Simulation) {
-					aura.Activate(sim)
-				},
 				OnGain: func(aura *core.Aura, sim *core.Simulation) {
 					aura.Unit.MultiplyRangedSpeed(sim, 1.3)
 				},
 				OnExpire: func(aura *core.Aura, sim *core.Simulation) {
 					aura.Unit.MultiplyRangedSpeed(sim, 1/1.3)
 				},
 			})
-			hunter.RegisterAura(core.Aura{
-				Label:    "T13 4-set",
-				Duration: core.NeverExpires,
-				OnReset: func(aura *core.Aura, sim *core.Simulation) {
-					aura.Activate(sim)
-				},
-				OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
-					if spell != hunter.ArcaneShot {
-						return
-					}
-					procChance := 0.4
-					if sim.RandomFloat("Chronohunter") < procChance {
-						chronoHunter.Activate(sim)
-					}
+
+			core.MakeProcTriggerAura(&agent.GetCharacter().Unit, core.ProcTrigger{
+				Name:           "T13 4-set",
+				Callback:       core.CallbackOnCastComplete,
+				ClassSpellMask: HunterSpellArcaneShot,
+				ProcChance:     0.4,
+				ICD:            time.Second * 110,
+				Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+					chronoHunter.Activate(sim)
 				},
 			})
 		},