Merge branch 'master' into rotation_timing

wowsims · Jul 16, 2024 · 47e9758 · 47e9758
2 parents 7798c57 + 1277638
commit 47e9758
Show file tree

Hide file tree

Showing 12 changed files with 598 additions and 476 deletions.
diff --git a/proto/hunter.proto b/proto/hunter.proto
@@ -219,6 +219,8 @@ message HunterOptions {
 	double pet_uptime = 4;
 	double time_to_trap_weave_ms = 5;
 	bool use_hunters_mark = 6;
+	bool use_aq_tier = 7;
+	bool use_naxx_tier = 8;
 }
 
 message BeastMasteryHunter {

diff --git a/sim/hunter/rapid_fire.go b/sim/hunter/rapid_fire.go
@@ -21,7 +21,12 @@ func (hunter *Hunter) registerRapidFireCD() {
 		Duration: time.Second * 15,
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
 			aura.Unit.MultiplyRangedSpeed(sim, hasteMultiplier)
-
+			if sim.CurrentTime <= 0 && hunter.Options.UseAqTier {
+				hunter.RapidFire.CD.Reduce(2 * time.Minute)
+			}
+			if sim.CurrentTime < 0 && hunter.Options.UseNaxxTier {
+				aura.UpdateExpires(aura.ExpiresAt() + (time.Second * 4))
+			}
 			focusPA = core.StartPeriodicAction(sim, core.PeriodicActionOptions{
 				Period:   time.Second * 3,
 				NumTicks: 5,