fix APL wait (#3465)

* fix APL wait * fix * address comments
wowsims · Aug 16, 2023 · f715904 · f715904
1 parent d61f350
commit f715904
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/sim/core/apl.go b/sim/core/apl.go
@@ -181,6 +181,10 @@ func (apl *APLRotation) DoNextAction(sim *Simulation) {
 }
 
 func (apl *APLRotation) getNextAction(sim *Simulation) *APLAction {
+	if sim.CurrentTime < apl.unit.waitUntilTime {
+		return nil
+	}
+
 	if apl.strictSequence != nil {
 		ss := apl.strictSequence.impl.(*APLActionStrictSequence)
 		if ss.actions[ss.curIdx].IsReady(sim) {

diff --git a/sim/core/apl_action.go b/sim/core/apl_action.go
@@ -2,7 +2,6 @@ package core
 
 import (
 	"fmt"
-
 	"github.com/wowsims/wotlk/sim/core/proto"
 )
 

diff --git a/sim/core/apl_actions_core.go b/sim/core/apl_actions_core.go
@@ -214,9 +214,23 @@ func (rot *APLRotation) newActionWait(config *proto.APLActionWait) APLActionImpl
 func (action *APLActionWait) IsReady(sim *Simulation) bool {
 	return action.duration != nil
 }
+
 func (action *APLActionWait) Execute(sim *Simulation) {
-	action.unit.WaitUntil(sim, sim.CurrentTime+action.duration.GetDuration(sim))
+	waitUntilTime := sim.CurrentTime + action.duration.GetDuration(sim)
+	action.unit.waitUntilTime = waitUntilTime
+
+	if waitUntilTime > action.unit.GCD.ReadyAt() {
+		action.unit.WaitUntil(sim, waitUntilTime)
+		return
+	}
+	pa := &PendingAction{
+		Priority:     ActionPriorityLow,
+		OnAction:     action.unit.gcdAction.OnAction,
+		NextActionAt: waitUntilTime,
+	}
+	sim.AddPendingAction(pa)
 }
+
 func (action *APLActionWait) String() string {
 	return fmt.Sprintf("Wait(%s)", action.duration)
 }
diff --git a/sim/core/unit.go b/sim/core/unit.go
@@ -137,6 +137,7 @@ type Unit struct {
 	waitingForEnergy float64
 	waitingForMana   float64
 	waitStartTime    time.Duration
+	waitUntilTime    time.Duration
 
 	// Cached mana return values per tick.
 	manaTickWhileCasting    float64
@@ -451,6 +452,8 @@ func (unit *Unit) reset(sim *Simulation, agent Agent) {
 	if unit.Rotation != nil {
 		unit.Rotation.reset(sim)
 	}
+
+	unit.waitUntilTime = 0
 }
 
 func (unit *Unit) startPull(sim *Simulation) {