Merge pull request #2651 from wowsims/balance-t84p

Elune's wrath usage adjustments
wowsims · Feb 12, 2023 · 6955a9f · 6955a9f
2 parents bb635e8 + c23c1b1
commit 6955a9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results
@@ -579,8 +579,8 @@ dps_results: {
 dps_results: {
  key: "TestBalance-AllItems-NightsongGarb"
  value: {
-  dps: 6739.193
-  tps: 6580.97202
+  dps: 6743.89982
+  tps: 6585.47563
  }
 }
 dps_results: {

diff --git a/sim/druid/balance/rotation.go b/sim/druid/balance/rotation.go
@@ -114,7 +114,9 @@ func (moonkin *BalanceDruid) rotation(sim *core.Simulation) *core.Spell {
 				return moonkin.Starfire
 			} else if solarIsActive {
 				if rotation.UseWrath {
-					if moonkin.MoonkinT84PCAura.IsActive() && moonkin.LunarICD.TimeToReady(sim)+playerLatency > moonkin.MoonkinT84PCAura.RemainingDuration(sim) {
+					if moonkin.MoonkinT84PCAura.IsActive() &&
+						(moonkin.LunarICD.TimeToReady(sim)+playerLatency > moonkin.MoonkinT84PCAura.RemainingDuration(sim) ||
+							moonkin.MoonkinT84PCAura.RemainingDuration(sim) > solarUptime) {
 						return moonkin.Starfire
 					}
 					if (rotation.UseSmartCooldowns && solarUptime > 10*time.Second) || sim.GetRemainingDuration() < 15*time.Second {