Merge pull request #3750 from wowsims/apl

Add apl value for clip delay, and channel interrupt doesn't check for…
wowsims · Sep 24, 2023 · 38e98cc · 38e98cc
2 parents bf9ee17 + f082608
commit 38e98cc
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 10 deletions.
diff --git a/proto/apl.proto b/proto/apl.proto
@@ -76,7 +76,7 @@ message APLAction {
     }
 }
 
-// NextIndex: 58
+// NextIndex: 59
 message APLValue {
     oneof value {
         // Operators
@@ -154,6 +154,9 @@ message APLValue {
         APLValueSequenceIsReady sequence_is_ready = 45;
         APLValueSequenceTimeToReady sequence_time_to_ready = 46;
 
+        // Properties
+        APLValueChannelClipDelay channel_clip_delay = 58;
+
         // Class or Spec-specific values
         APLValueTotemRemainingTime totem_remaining_time = 49;
         APLValueCatExcessEnergy cat_excess_energy = 52;
@@ -394,6 +397,8 @@ message APLValueSpellCastTime {
 message APLValueSpellChannelTime {
     ActionID spell_id = 1;
 }
+message APLValueChannelClipDelay {
+}
 message APLValueSpellTravelTime {
     ActionID spell_id = 1;
 }

diff --git a/sim/core/apl.go b/sim/core/apl.go
@@ -212,7 +212,7 @@ func (apl *APLRotation) shouldInterruptChannel(sim *Simulation) bool {
 		// Don't allow interupts between ticks, just continue channeling until next tick.
 		return false
 	}
-	if !apl.unit.GCD.IsReady(sim) || apl.interruptChannelIf == nil || !apl.interruptChannelIf.GetBool(sim) {
+	if apl.interruptChannelIf == nil || !apl.interruptChannelIf.GetBool(sim) {
 		// Continue the channel.
 		return false
 	}

diff --git a/sim/core/apl_actions_timing.go b/sim/core/apl_actions_timing.go
@@ -32,7 +32,7 @@ func (action *APLActionWait) GetAPLValues() []APLValue {
 	return []APLValue{action.duration}
 }
 func (action *APLActionWait) IsReady(sim *Simulation) bool {
-	return true
+	return action.duration.GetDuration(sim) > 0
 }
 
 func (action *APLActionWait) Execute(sim *Simulation) {

diff --git a/sim/core/apl_value.go b/sim/core/apl_value.go
@@ -192,6 +192,10 @@ func (rot *APLRotation) newAPLValue(config *proto.APLValue) APLValue {
 	case *proto.APLValue_SequenceTimeToReady:
 		return rot.newValueSequenceTimeToReady(config.GetSequenceTimeToReady())
 
+	// Properties
+	case *proto.APLValue_ChannelClipDelay:
+		return rot.newValueChannelClipDelay(config.GetChannelClipDelay())
+
 	default:
 		return nil
 	}

diff --git a/sim/core/apl_values_properties.go b/sim/core/apl_values_properties.go
@@ -0,0 +1,27 @@
+package core
+
+import (
+	"time"
+
+	"github.com/wowsims/wotlk/sim/core/proto"
+)
+
+type APLValueChannelClipDelay struct {
+	DefaultAPLValueImpl
+	unit *Unit
+}
+
+func (rot *APLRotation) newValueChannelClipDelay(config *proto.APLValueChannelClipDelay) APLValue {
+	return &APLValueChannelClipDelay{
+		unit: rot.unit,
+	}
+}
+func (value *APLValueChannelClipDelay) Type() proto.APLValueType {
+	return proto.APLValueType_ValueTypeDuration
+}
+func (value *APLValueChannelClipDelay) GetDuration(sim *Simulation) time.Duration {
+	return value.unit.ChannelClipDelay
+}
+func (value *APLValueChannelClipDelay) String() string {
+	return "Channel Clip Delay()"
+}
diff --git a/sim/core/dot.go b/sim/core/dot.go
@@ -199,7 +199,9 @@ func (dot *Dot) TickOnce(sim *Simulation) {
 			}
 		} else if dot.Spell.Unit.Rotation.shouldInterruptChannel(sim) {
 			dot.Cancel(sim)
-			dot.Spell.Unit.WaitUntil(sim, sim.CurrentTime+dot.Spell.Unit.ChannelClipDelay)
+			if dot.Spell.Unit.GCD.IsReady(sim) {
+				dot.Spell.Unit.WaitUntil(sim, sim.CurrentTime+dot.Spell.Unit.ChannelClipDelay)
+			}
 		}
 	}
 }

diff --git a/ui/core/components/individual_sim_ui/apl_actions.ts b/ui/core/components/individual_sim_ui/apl_actions.ts
@@ -366,7 +366,6 @@ const actionKindFactories: {[f in NonNullable<APLActionKind>]: ActionKindConfig<
 			<p>The channel will be interrupted only if all of the following are true:</p>
 			<ul>
 				<li>Immediately following a tick of the channel</li>
-				<li>The GCD is ready</li>
 				<li>The <b>Interrupt If</b> condition is <b>True</b></li>
 				<li>A higher-priority action in the APL list is available</li>
 			</ul>
@@ -375,10 +374,8 @@ const actionKindFactories: {[f in NonNullable<APLActionKind>]: ActionKindConfig<
 		newValue: () => APLActionChannelSpell.create({
 			interruptIf: {
 				value: {
-					oneofKind: 'const',
-					const: {
-						val: 'true',
-					}
+					oneofKind: 'gcdIsReady',
+					gcdIsReady: {},
 				}
 			},
 		}),

diff --git a/ui/core/components/individual_sim_ui/apl_values.ts b/ui/core/components/individual_sim_ui/apl_values.ts
@@ -49,6 +49,7 @@ import {
 	APLValueSpellCPM,
 	APLValueSpellIsChanneling,
 	APLValueSpellChanneledTicks,
+	APLValueChannelClipDelay,
 	APLValueAuraIsActive,
 	APLValueAuraIsActiveWithReactionTime,
 	APLValueAuraRemainingTime,
@@ -806,6 +807,14 @@ const valueKindFactories: {[f in NonNullable<APLValueKind>]: ValueKindConfig<APL
 			AplHelpers.actionIdFieldConfig('spellId', 'channel_spells', ''),
 		],
 	}),
+	'channelClipDelay': inputBuilder({
+		label: 'Channel Clip Delay',
+		submenu: ['Spell'],
+		shortDescription: 'The amount of time specified by the <b>Channel Clip Delay</b> setting.',
+		newValue: APLValueChannelClipDelay.create,
+		fields: [
+		],
+	}),
 
 	// Auras
 	'auraIsActive': inputBuilder({

diff --git a/ui/shadow_priest/presets.ts b/ui/shadow_priest/presets.ts
@@ -210,7 +210,9 @@ export const ROTATION_PRESET_DEFAULT = {
 				{"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}}}},
 				{"action":{"condition":{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":15258}}},"rhs":{"const":{"val":"5"}}}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14751}}},{"castSpell":{"spellId":{"spellId":48156}}}]}}},
-				{"action":{"channelSpell":{"spellId":{"spellId":48156},"interruptIf":{"const":{"val":"true"}}}}},
+				{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":48300}}},"rhs":{"const":{"val":"200ms"}}}}]}},"wait":{"duration":{"dotRemainingTime":{"spellId":{"spellId":48300}}}}}},
+				{"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":48160}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellCastTime":{"spellId":{"spellId":48160}}},"rhs":{"channelClipDelay":{}}}}}},{"dotIsActive":{"spellId":{"spellId":48160}}},{"spellIsChanneling":{"spellId":{"spellId":48156}}}]}},"wait":{"duration":{"math":{"op":"OpSub","lhs":{"dotRemainingTime":{"spellId":{"spellId":48160}}},"rhs":{"spellCastTime":{"spellId":{"spellId":48160}}}}}}}},
+				{"action":{"channelSpell":{"spellId":{"spellId":48156},"interruptIf":{"cmp":{"op":"OpLe","lhs":{"gcdTimeToReady":{}},"rhs":{"channelClipDelay":{}}}}}}},
 				{"action":{"castSpell":{"spellId":{"spellId":47585}}}}
 			]
 		}`),