Merge pull request #3757 from wowsims/apl

Add Max Ticks option to channel action, and tiny improvement to sprie…

proto/apl.proto

@@ -177,6 +177,7 @@ message APLActionChannelSpell {
     UnitReference target = 2;
 
     APLValue interrupt_if = 3;
+    APLValue max_ticks = 4;
 }
 
 message APLActionMultidot {

sim/core/apl.go

@@ -20,6 +20,9 @@ type APLRotation struct {
 	// Will be nil when there is no active channel.
 	interruptChannelIf APLValue
 
+	// Max ticks for the current channel, or 0 for no maximum.
+	channelMaxTicks int32
+
 	// Used inside of actions/value to determine whether they will occur during the prepull or regular rotation.
 	parsingPrepull bool
 
@@ -149,6 +152,8 @@ func (rot *APLRotation) allPrepullActions() []*APLAction {
 func (rot *APLRotation) reset(sim *Simulation) {
 	rot.controllingAction = nil
 	rot.inLoop = false
+	rot.interruptChannelIf = nil
+	rot.channelMaxTicks = 0
 	for _, action := range rot.allAPLActions() {
 		action.impl.Reset(sim)
 	}
@@ -208,10 +213,11 @@ func (apl *APLRotation) shouldInterruptChannel(sim *Simulation) bool {
 		// Channel has ended, but apl.unit.ChanneledDot hasn't been cleared yet meaning the aura is still active.
 		return false
 	}
-	if apl.unit.ChanneledDot.lastTickTime != sim.CurrentTime {
-		// Don't allow interupts between ticks, just continue channeling until next tick.
-		return false
+
+	if apl.channelMaxTicks != 0 && channeledDot.TickCount >= apl.channelMaxTicks {
+		return true
 	}
+
 	if apl.interruptChannelIf == nil || !apl.interruptChannelIf.GetBool(sim) {
 		// Continue the channel.
 		return false

sim/core/apl_actions_casting.go

@@ -41,6 +41,7 @@ type APLActionChannelSpell struct {
 	spell       *Spell
 	target      UnitReference
 	interruptIf APLValue
+	maxTicks    APLValue
 }
 
 func (rot *APLRotation) newActionChannelSpell(config *proto.APLActionChannelSpell) APLActionImpl {
@@ -52,6 +53,8 @@ func (rot *APLRotation) newActionChannelSpell(config *proto.APLActionChannelSpel
 		})
 	}
 
+	maxTicks := rot.coerceTo(rot.newAPLValue(config.MaxTicks), proto.APLValueType_ValueTypeInt)
+
 	spell := rot.GetAPLSpell(config.SpellId)
 	if spell == nil {
 		return nil
@@ -69,14 +72,20 @@ func (rot *APLRotation) newActionChannelSpell(config *proto.APLActionChannelSpel
 		spell:       spell,
 		target:      target,
 		interruptIf: interruptIf,
+		maxTicks:    maxTicks,
 	}
 }
 func (action *APLActionChannelSpell) IsReady(sim *Simulation) bool {
 	return action.spell.CanCast(sim, action.target.Get())
 }
 func (action *APLActionChannelSpell) Execute(sim *Simulation) {
+	maxTicks := int32(0)
+	if action.maxTicks != nil {
+		maxTicks = action.maxTicks.GetInt(sim)
+	}
 	action.spell.Cast(sim, action.target.Get())
 	action.spell.Unit.Rotation.interruptChannelIf = action.interruptIf
+	action.spell.Unit.Rotation.channelMaxTicks = maxTicks
 }
 func (action *APLActionChannelSpell) String() string {
 	return fmt.Sprintf("Channel Spell(%s, interruptIf=%s)", action.spell.ActionID, action.interruptIf)

sim/core/dot.go

@@ -267,6 +267,7 @@ func newDot(config Dot) *Dot {
 			dot.Spell.Unit.ChanneledDot = nil
 			if dot.Spell.Unit.IsUsingAPL {
 				dot.Spell.Unit.Rotation.interruptChannelIf = nil
+				dot.Spell.Unit.Rotation.channelMaxTicks = 0
 			}
 		}
 	})

ui/core/components/individual_sim_ui/apl_actions.ts

@@ -386,6 +386,10 @@ const actionKindFactories: {[f in NonNullable<APLActionKind>]: ActionKindConfig<
 				label: 'Interrupt If',
 				labelTooltip: 'Condition which must be true to allow the channel to be interrupted.',
 			}),
+			AplValues.valueFieldConfig('maxTicks', {
+				label: 'Max Ticks',
+				labelTooltip: 'Maximum number of ticks to use for the channel, evaluated when casting begins. <b>None</b> or <b>0</b> will allow the full duration.',
+			}),
 		],
 	}),
 	['autocastOtherCooldowns']: inputBuilder({

ui/shadow_priest/presets.ts

@@ -203,9 +203,9 @@ export const ROTATION_PRESET_DEFAULT = {
 				{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"0s"}}}},"castSpell":{"spellId":{"spellId":34433}}}},
 				{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1s"}}}},"autocastOtherCooldowns":{}}},
 				{"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"61s"}}}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}},
-				{"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"2s"}}}},"castSpell":{"spellId":{"spellId":48300}}}},
+				{"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"1.75s"}}}},"castSpell":{"spellId":{"spellId":48300}}}},
 				{"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48125}}}}},{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"const":{"val":"5"}},"rhs":{"auraNumStacks":{"auraId":{"spellId":15258}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"75s"}}}}]}},{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"const":{"val":"3"}},"rhs":{"auraNumStacks":{"auraId":{"spellId":15258}}}}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"75s"}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":48125}}}},
-				{"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":48160}}},"rhs":{"spellCastTime":{"spellId":{"spellId":48160}}}}},"castSpell":{"spellId":{"spellId":48160}}}},
+				{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":48160}}},"rhs":{"spellCastTime":{"spellId":{"spellId":48160}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3s"}}}}]}},"castSpell":{"spellId":{"spellId":48160}}}},
 				{"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48300}}}}},"castSpell":{"spellId":{"spellId":48300}}}},
 				{"hide":true,"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":48127}}},"rhs":{"const":{"val":"750ms"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":57669}}},"rhs":{"const":{"val":"5s"}}}}]}},"castSpell":{"spellId":{"spellId":48127}}}},
 				{"hide":true,"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"spellCastTime":{"spellId":{"spellId":48127}}},"rhs":{"const":{"val":"750ms"}}}},"castSpell":{"spellId":{"spellId":48127}}}},