Merge pull request #746 from wowsims/revert-745-revert/pr-723

[Core] Cooldown, Rounding for Cast Time and GCD
wowsims · Jul 19, 2024 · ee209e1 · ee209e1
2 parents 302a772 + d729539
commit ee209e1
Show file tree

Hide file tree

Showing 15 changed files with 5,389 additions and 5,351 deletions.
diff --git a/sim/core/cast.go b/sim/core/cast.go
@@ -110,24 +110,22 @@ func (spell *Spell) makeCastFunc(config CastConfig) CastSuccessFunc {
 		}
 
 		if !config.IgnoreHaste {
-			spell.CurCast.GCD = max(0, spell.Unit.ApplyCastSpeed(spell.CurCast.GCD))
-			spell.CurCast.CastTime = spell.Unit.ApplyCastSpeedForSpell(spell.CurCast.CastTime, spell)
+			spell.CurCast.GCD = max(0, spell.Unit.ApplyCastSpeed(spell.CurCast.GCD)).Round(time.Millisecond)
+			spell.CurCast.CastTime = spell.Unit.ApplyCastSpeedForSpell(spell.CurCast.CastTime, spell).Round(time.Millisecond)
 		}
 
 		if config.CD.Timer != nil {
 			// By panicking if spell is on CD, we force each sim to properly check for their own CDs.
 			if !spell.CD.IsReady(sim) {
 				return spell.castFailureHelper(sim, "still on cooldown for %s, curTime = %s", spell.CD.TimeToReady(sim), sim.CurrentTime)
 			}
-			spell.CD.Set(sim.CurrentTime + spell.CurCast.CastTime + time.Duration(float64(spell.CD.Duration)*spell.CdMultiplier))
 		}
 
 		if config.SharedCD.Timer != nil {
 			// By panicking if spell is on CD, we force each sim to properly check for their own CDs.
 			if !spell.SharedCD.IsReady(sim) {
 				return spell.castFailureHelper(sim, "still on shared cooldown for %s, curTime = %s", spell.SharedCD.TimeToReady(sim), sim.CurrentTime)
 			}
-			spell.SharedCD.Set(sim.CurrentTime + spell.CurCast.CastTime + time.Duration(float64(spell.SharedCD.Duration)*spell.CdMultiplier))
 		}
 
 		// By panicking if spell is on CD, we force each sim to properly check for their own CDs.
@@ -167,6 +165,14 @@ func (spell *Spell) makeCastFunc(config CastConfig) CastSuccessFunc {
 						spell.Cost.SpendCost(sim, spell)
 					}
 
+					if config.CD.Timer != nil {
+						spell.CD.Set(sim.CurrentTime + time.Duration(float64(spell.CD.Duration)*spell.CdMultiplier))
+					}
+
+					if config.SharedCD.Timer != nil {
+						spell.SharedCD.Set(sim.CurrentTime + time.Duration(float64(spell.SharedCD.Duration)*spell.CdMultiplier))
+					}
+
 					spell.applyEffects(sim, target)
 
 					if !spell.Flags.Matches(SpellFlagNoOnCastComplete) {
@@ -191,6 +197,14 @@ func (spell *Spell) makeCastFunc(config CastConfig) CastSuccessFunc {
 			spell.Cost.SpendCost(sim, spell)
 		}
 
+		if config.CD.Timer != nil {
+			spell.CD.Set(sim.CurrentTime + time.Duration(float64(spell.CD.Duration)*spell.CdMultiplier))
+		}
+
+		if config.SharedCD.Timer != nil {
+			spell.SharedCD.Set(sim.CurrentTime + time.Duration(float64(spell.SharedCD.Duration)*spell.CdMultiplier))
+		}
+
 		spell.applyEffects(sim, target)
 
 		if !spell.Flags.Matches(SpellFlagNoOnCastComplete) {

diff --git a/sim/core/gcd.go b/sim/core/gcd.go
@@ -14,6 +14,7 @@ func (unit *Unit) newHardcastAction(sim *Simulation) {
 	if unit.hardcastAction == nil {
 		pa := &PendingAction{
 			NextActionAt: unit.Hardcast.Expires,
+			Priority:     ActionPriorityGCD,
 			OnAction: func(sim *Simulation) {
 				if hc := &unit.Hardcast; hc.Expires != startingCDTime && hc.Expires <= sim.CurrentTime {
 					hc.Expires = startingCDTime