Merge pull request wowsims#3799 from vigo2/vigo/after-cast-removal

vigo/after-cast-removal
lime-green · Oct 4, 2023 · 51fda77 · 51fda77
2 parents ec3bf25 + 05509c7
commit 51fda77
Show file tree

Hide file tree

Showing 4 changed files with 321 additions and 329 deletions.
diff --git a/sim/core/cast.go b/sim/core/cast.go
@@ -48,10 +48,6 @@ type Cast struct {
 
 	// Additional GCD delay after the cast completes.
 	ChannelTime time.Duration
-
-	// Additional GCD delay after the cast ends. Never affected by cast speed.
-	// This is typically used for latency.
-	AfterCastDelay time.Duration
 }
 
 func (cast *Cast) EffectiveTime() time.Duration {
@@ -60,7 +56,7 @@ func (cast *Cast) EffectiveTime() time.Duration {
 		// TODO: isn't this wrong for spells like shadowfury, that have a reduced GCD?
 		gcd = MaxDuration(GCDMin, gcd)
 	}
-	fullCastTime := cast.CastTime + cast.ChannelTime + cast.AfterCastDelay
+	fullCastTime := cast.CastTime + cast.ChannelTime
 	return MaxDuration(gcd, fullCastTime)
 }
 

diff --git a/sim/core/spell.go b/sim/core/spell.go
@@ -165,7 +165,6 @@ func (unit *Unit) RegisterSpell(config SpellConfig) *Spell {
 
 	if unit.IsUsingAPL {
 		config.Cast.DefaultCast.ChannelTime = 0
-		config.Cast.DefaultCast.AfterCastDelay = 0
 	}
 
 	if (config.DamageMultiplier != 0 || config.ThreatMultiplier != 0) && config.ProcMask == ProcMaskUnknown {

diff --git a/sim/priest/mind_flay.go b/sim/priest/mind_flay.go
@@ -96,18 +96,15 @@ func (priest *Priest) newMindFlaySpell(numTicksIdx int32) *core.Spell {
 				ChannelTime: channelTime,
 			},
 			ModifyCast: func(sim *core.Simulation, spell *core.Spell, cast *core.Cast) {
-				if spell.Unit.IsUsingAPL {
+				if spell.Unit.IsUsingAPL || priest.Latency == 0 {
 					return
 				}
-				// if our channel is longer than GCD it will have human latency to end it beause you can't queue the next spell.
-				wait := priest.ApplyCastSpeed(channelTime)
-				gcd := core.MaxDuration(core.GCDMin, priest.ApplyCastSpeed(core.GCDDefault))
-				if wait > gcd && priest.Latency > 0 {
-					base := priest.Latency * 0.67
-					variation := base + sim.RandomFloat("spriest latency")*base // should vary from 0.66 - 1.33 of given latency
-					cast.AfterCastDelay += time.Duration(variation) * time.Millisecond
+				// if our channel is longer than GCD it will have human latency to end it because you can't queue the next spell.
+				if float64(channelTime)*priest.CastSpeed > float64(core.GCDMin) {
+					variation := priest.Latency * (0.66 + sim.RandomFloat("spriest latency")*(1.33-0.66)) // should vary from 0.66 - 1.33 of given latency
+					cast.ChannelTime += time.Duration(variation / priest.CastSpeed * float64(time.Millisecond))
 					if sim.Log != nil {
-						priest.Log(sim, "Latency: %0.02f, AfterCastDelay: %s", priest.Latency, cast.AfterCastDelay)
+						priest.Log(sim, "Latency: %.3f, Applied Latency: %.3f", priest.Latency, variation)
 					}
 				}
 			},