fix APL oom detection (#3922)

wowsims · Oct 20, 2023 · b332a54 · b332a54
1 parent cd3c64f
commit b332a54
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/sim/core/apl.go b/sim/core/apl.go
@@ -193,6 +193,8 @@ func (apl *APLRotation) DoNextAction(sim *Simulation) {
 
 	i := 0
 	apl.inLoop = true
+	apl.unit.StartAPLLoop(sim)
+
 	for nextAction := apl.getNextAction(sim); nextAction != nil; i, nextAction = i+1, apl.getNextAction(sim) {
 		if i > 1000 {
 			panic(fmt.Sprintf("[USER_ERROR] Infinite loop detected, current action:\n%s", nextAction))
@@ -206,11 +208,14 @@ func (apl *APLRotation) DoNextAction(sim *Simulation) {
 		apl.unit.Log(sim, "No available actions!")
 	}
 
-	if apl.unit.GCD.IsReady(sim) {
+	gcdReady := apl.unit.GCD.IsReady(sim)
+	if gcdReady {
 		apl.unit.WaitUntil(sim, sim.CurrentTime+time.Millisecond*50)
 	} else {
 		apl.unit.DoNothing()
 	}
+
+	apl.unit.DoneAPLLoop(sim, gcdReady)
 }
 
 func (apl *APLRotation) getNextAction(sim *Simulation) *APLAction {

diff --git a/sim/core/mana.go b/sim/core/mana.go
@@ -262,9 +262,14 @@ func (sim *Simulation) initManaTickAction() {
 		for _, player := range playersWithManaBars {
 			char := player.GetCharacter()
 			char.ManaTick(sim)
+
 			if char.OnManaTick != nil {
 				// Only execute APL actions after mana ticks once pre-pull has completed.
 				if char.IsUsingAPL && sim.CurrentTime > 0 {
+					if char.IsWaitingForMana() && !char.DoneWaitingForMana(sim) {
+						continue
+					}
+
 					char.Rotation.DoNextAction(sim)
 				} else {
 					char.OnManaTick(sim)

diff --git a/sim/core/spell.go b/sim/core/spell.go
@@ -506,6 +506,14 @@ func (spell *Spell) CanCast(sim *Simulation, target *Unit) bool {
 			//if sim.Log != nil {
 			//	sim.Log("Cant cast because of resource cost")
 			//}
+			_, isManaCost := spell.Cost.(*ManaCost)
+			if isManaCost && spell.CurCast.Cost > 0 {
+				if spell.Unit.ManaRequired > 0 {
+					spell.Unit.ManaRequired = min(spell.Unit.ManaRequired, spell.CurCast.Cost)
+				} else {
+					spell.Unit.ManaRequired = spell.CurCast.Cost
+				}
+			}
 			return false
 		}
 	}

diff --git a/sim/core/unit.go b/sim/core/unit.go
@@ -159,6 +159,8 @@ type Unit struct {
 
 	// The currently-channeled DOT spell, otherwise nil.
 	ChanneledDot *Dot
+
+	ManaRequired float64
 }
 
 // Units can be disabled for several reasons:
@@ -561,3 +563,16 @@ func (unit *Unit) GetMetadata() *proto.UnitMetadata {
 
 	return metadata
 }
+
+func (unit *Unit) StartAPLLoop(sim *Simulation) {
+	if unit.HasManaBar() {
+		unit.ManaRequired = 0
+	}
+}
+
+func (unit *Unit) DoneAPLLoop(sim *Simulation, usedGCD bool) {
+	if unit.HasManaBar() && !usedGCD && unit.ManaRequired > 0 {
+		unit.WaitForMana(sim, unit.ManaRequired)
+		unit.ManaRequired = 0
+	}
+}