Fix recursion bug in GetAllAPLValues() and add debug log for energy t…

…hresholds
wowsims · Oct 14, 2023 · 10b45b2 · 10b45b2
1 parent f8b2826
commit 10b45b2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/sim/core/apl_action.go b/sim/core/apl_action.go
@@ -37,10 +37,16 @@ func (action *APLAction) GetAllActions() []*APLAction {
 func (action *APLAction) GetAllAPLValues() []APLValue {
 	var values []APLValue
 	for _, a := range action.GetAllActions() {
-		values = append(values, a.impl.GetAPLValues()...)
+		unprocessed := a.impl.GetAPLValues()
 		if a.condition != nil {
-			values = append(values, a.condition)
-			values = append(values, a.condition.GetInnerValues()...)
+			unprocessed = append(unprocessed, a.condition)
+		}
+
+		for len(unprocessed) > 0 {
+			next := unprocessed[len(unprocessed)-1]
+			unprocessed = unprocessed[:len(unprocessed)-1]
+			values = append(values, next)
+			unprocessed = append(unprocessed, next.GetInnerValues()...)
 		}
 	}
 	return FilterSlice(values, func(val APLValue) bool { return val != nil })

diff --git a/sim/core/apl_actions_casting.go b/sim/core/apl_actions_casting.go
@@ -73,6 +73,9 @@ func (rot *APLRotation) newActionChannelSpell(config *proto.APLActionChannelSpel
 		allowRecast: config.AllowRecast,
 	}
 }
+func (action *APLActionChannelSpell) GetAPLValues() []APLValue {
+	return []APLValue{action.interruptIf}
+}
 func (action *APLActionChannelSpell) IsReady(sim *Simulation) bool {
 	return action.spell.CanCast(sim, action.target.Get())
 }

diff --git a/sim/core/energy.go b/sim/core/energy.go
@@ -256,6 +256,10 @@ func (eb *energyBar) reset(sim *Simulation) {
 	eb.currentEnergy = eb.maxEnergy
 	eb.comboPoints = 0
 	eb.newTickAction(sim, true, sim.Environment.PrepullStartTime())
+
+	if eb.cumulativeEnergyDecisionThresholds != nil && sim.Log != nil {
+		eb.unit.Log(sim, "[DEBUG] APL Energy decision thresholds: %v", eb.energyDecisionThresholds)
+	}
 }
 
 type EnergyCostOptions struct {