- {castLog.actionId!.name} from {castLog.timestamp.toFixed(2)}s to {(castLog.timestamp + castLog.castTime).toFixed(2)}s (
- {castLog.castTime > 0 && `${castLog.castTime.toFixed(2)}s, `} {castLog.effectiveTime.toFixed(2)}s GCD Time)
+ {castLog.actionId!.name} from {castLog.timestamp.toFixed(2)}s to{' '}
+ {(castLog.castCancelledLog?.timestamp || castLog.timestamp + castLog.castTime).toFixed(2)}s
+ {castLog.castCancelledLog?.timestamp
+ ? ` (Cancelled after ${castLog.cancelTime.toFixed(2)}s)`
+ : ` (${castLog.castTime > 0 ? `${castLog.castTime.toFixed(2)}s, ` : ''}${castLog.effectiveTime.toFixed(2)}s GCD Time)`}
{travelTimeStr.length > 0 && travelTimeStr}
{totalDamage > 0 && (
diff --git a/ui/core/components/individual_sim_ui/apl_actions.ts b/ui/core/components/individual_sim_ui/apl_actions.ts
index dc1391d10c..94040381c9 100644
--- a/ui/core/components/individual_sim_ui/apl_actions.ts
+++ b/ui/core/components/individual_sim_ui/apl_actions.ts
@@ -33,6 +33,7 @@ import {
APLActionWaitUntil,
APLValue,
APLActionWarlockNextExhaleTarget,
+ APLActionCancelSpellCast,
} from '../../proto/apl.js';
import { Spec } from '../../proto/common.js';
import { FeralDruid_Rotation_AplType } from '../../proto/druid.js';
@@ -339,6 +340,13 @@ const actionKindFactories: { [f in NonNullable
]: ActionKindConfig
newValue: APLActionCastSpell.create,
fields: [AplHelpers.actionIdFieldConfig('spellId', 'castable_spells', ''), AplHelpers.unitFieldConfig('target', 'targets')],
}),
+ ['cancelSpellCast']: inputBuilder({
+ label: i18n.t('rotation_tab.apl.actions.cancel_cast.label'),
+ submenu: ['casting'],
+ shortDescription: i18n.t('rotation_tab.apl.actions.cancel_cast.tooltip'),
+ newValue: APLActionCancelSpellCast.create,
+ fields: [],
+ }),
['castFriendlySpell']: inputBuilder({
label: i18n.t('rotation_tab.apl.actions.cast_at_player.label'),
shortDescription: i18n.t('rotation_tab.apl.actions.cast_at_player.tooltip'),
diff --git a/ui/core/components/individual_sim_ui/apl_values.ts b/ui/core/components/individual_sim_ui/apl_values.ts
index eb7b8c3fc2..5f33ece0b6 100644
--- a/ui/core/components/individual_sim_ui/apl_values.ts
+++ b/ui/core/components/individual_sim_ui/apl_values.ts
@@ -118,6 +118,8 @@ import {
APLValueDotTimeToNextTick,
APLValueSpellInFlight,
APLValueBossCurrentTarget,
+ APLValueSpellIsCasting,
+ APLValueRemainingCastTime,
} from '../../proto/apl.js';
import { Class, Spec } from '../../proto/common.js';
import { ShamanTotems_TotemType as TotemType } from '../../proto/shaman.js';
@@ -1054,6 +1056,16 @@ const valueKindFactories: { [f in ValidAPLValueKind]: ValueKindConfig, isPrepull: boolean) => !isPrepull,
+ fields: [],
+ }),
+
// Spells
spellIsKnown: inputBuilder({
label: i18n.t('rotation_tab.apl.values.spell_known.label'),
@@ -1118,6 +1130,14 @@ const valueKindFactories: { [f in ValidAPLValueKind]: ValueKindConfig, isPrepull: boolean) => !isPrepull,
fields: [AplHelpers.actionIdFieldConfig('spellId', 'castable_spells', '')],
}),
+ spellIsCasting: inputBuilder({
+ label: i18n.t('rotation_tab.apl.values.is_casting.label'),
+ submenu: ['spell'],
+ shortDescription: i18n.t('rotation_tab.apl.values.is_casting.tooltip'),
+ newValue: APLValueSpellIsCasting.create,
+ includeIf: (_: Player, isPrepull: boolean) => !isPrepull,
+ fields: [AplHelpers.actionIdFieldConfig('spellId', 'non_instant_spells', '')],
+ }),
spellIsChanneling: inputBuilder({
label: i18n.t('rotation_tab.apl.values.is_channeling.label'),
submenu: ['spell'],
diff --git a/ui/core/proto_utils/logs_parser.tsx b/ui/core/proto_utils/logs_parser.tsx
index 197345a143..3380638b84 100644
--- a/ui/core/proto_utils/logs_parser.tsx
+++ b/ui/core/proto_utils/logs_parser.tsx
@@ -253,6 +253,7 @@ export class SimLog {
AuraStacksChangeLog.parse(params) ||
MajorCooldownUsedLog.parse(params) ||
CastBeganLog.parse(params) ||
+ CastCancelledLog.parse(params) ||
CastCompletedLog.parse(params) ||
StatChangeLog.parse(params) ||
Promise.resolve(new SimLog(params))
@@ -289,6 +290,10 @@ export class SimLog {
return this instanceof CastCompletedLog;
}
+ isCastCancelled(): this is CastCancelledLog {
+ return this instanceof CastCancelledLog;
+ }
+
isStatChange(): this is StatChangeLog {
return this instanceof StatChangeLog;
}
@@ -392,24 +397,24 @@ export class DamageDealtLog extends SimLog {
{this.miss
? 'Miss'
: this.dodge
- ? 'Dodge'
- : this.parry
- ? 'Parry'
- : this.block
- ? this.crit
- ? 'Critical Block'
- : this.glance
- ? 'Blocked Glance'
- : 'Block'
- : this.glance
- ? 'Glance'
- : this.crit
- ? 'Crit'
- : this.crush
- ? 'Crush'
- : this.tick
- ? 'Tick'
- : 'Hit'}
+ ? 'Dodge'
+ : this.parry
+ ? 'Parry'
+ : this.block
+ ? this.crit
+ ? 'Critical Block'
+ : this.glance
+ ? 'Blocked Glance'
+ : 'Block'
+ : this.glance
+ ? 'Glance'
+ : this.crit
+ ? 'Crit'
+ : this.crush
+ ? 'Crush'
+ : this.tick
+ ? 'Tick'
+ : 'Hit'}
)}
{` `}
@@ -997,6 +1002,41 @@ export class CastBeganLog extends SimLog {
}
}
+export class CastCancelledLog extends SimLog {
+ readonly cancelTime: number;
+
+ constructor(params: SimLogParams, cancelTime: number) {
+ super(params);
+ this.cancelTime = cancelTime;
+ }
+
+ toHTML(includeTimestamp = true) {
+ return this.cacheOutput(includeTimestamp, () => (
+ <>
+ {this.toPrefix(includeTimestamp)} Cancelled {this.newActionIdLink()} after {this.cancelTime.toFixed(2)}s.
+
+ ));
+ }
+
+ static parse(params: SimLogParams): Promise | null {
+ const match = params.raw.match(/Cancelled (.*) after (\d+\.?\d*)(m?s)/);
+ if (match) {
+ let castProgress = parseFloat(match[2]);
+ if (match[3] == 'ms') {
+ castProgress /= 1000;
+ }
+ return ActionId.fromLogString(match[1])
+ .fill(params.source?.index)
+ .then(castId => {
+ params.actionId = castId;
+ return new CastCancelledLog(params, castProgress);
+ });
+ } else {
+ return null;
+ }
+ }
+}
+
export class CastCompletedLog extends SimLog {
constructor(params: SimLogParams) {
super(params);
@@ -1029,34 +1069,47 @@ export class CastLog extends SimLog {
readonly castTime: number;
readonly effectiveTime: number;
readonly travelTime: number;
+ readonly cancelTime: number;
readonly castBeganLog: CastBeganLog;
+ readonly castCancelledLog: CastCancelledLog | null;
readonly castCompletedLog: CastCompletedLog | null;
// All instances of damage dealt from the completion of this cast until the completion of the next cast.
readonly damageDealtLogs: Array;
- constructor(castBeganLog: CastBeganLog, castCompletedLog: CastCompletedLog | null, damageDealtLogs: Array) {
+ constructor(
+ castBeganLog: CastBeganLog,
+ castCompletedLog: CastCompletedLog | null,
+ castCancelledLog: CastCancelledLog | null,
+ damageDealtLogs: Array,
+ ) {
super({
raw: castBeganLog.raw,
logIndex: castBeganLog.logIndex,
timestamp: castBeganLog.timestamp,
source: castBeganLog.source,
target: castBeganLog.target,
- actionId: castCompletedLog?.actionId || castBeganLog.actionId, // Use completed log because of arcane blast
- spellSchool: castCompletedLog?.spellSchool || castBeganLog.spellSchool,
- threat: castCompletedLog?.threat || castBeganLog.threat,
+ actionId: castCompletedLog?.actionId || castCancelledLog?.actionId || castBeganLog.actionId, // Use completed log because of arcane blast
+ spellSchool: castCompletedLog?.spellSchool || castCancelledLog?.spellSchool || castBeganLog.spellSchool,
+ threat: castCompletedLog?.threat || castCancelledLog?.threat || castBeganLog.threat,
});
this.castTime = castBeganLog.castTime;
this.effectiveTime = castBeganLog.effectiveTime;
+ this.cancelTime = castCancelledLog?.cancelTime || 0;
+
this.castBeganLog = castBeganLog;
this.castCompletedLog = castCompletedLog;
+ this.castCancelledLog = castCancelledLog;
this.damageDealtLogs = damageDealtLogs;
if (this.castCompletedLog && this.castBeganLog) {
this.castTime = this.castCompletedLog.timestamp - this.castBeganLog.timestamp;
this.effectiveTime = this.castCompletedLog.timestamp - this.castBeganLog.timestamp;
}
+ if (this.castCancelledLog) {
+ this.cancelTime = this.castCancelledLog.cancelTime;
+ }
if (
this.castCompletedLog &&
this.damageDealtLogs.length >= 1 &&
@@ -1084,6 +1137,7 @@ export class CastLog extends SimLog {
static fromLogs(logs: Array): Array {
const castBeganLogs = logs.filter((log): log is CastBeganLog => log.isCastBegan());
const castCompletedLogs = logs.filter((log): log is CastCompletedLog => log.isCastCompleted());
+ const castCancelledLogs = logs.filter((log): log is CastCancelledLog => log.isCastCancelled());
const damageDealtLogs = logs.filter((log): log is DamageDealtLog => log.isDamageDealt());
const toBucketKey = (actionId: ActionId) => {
@@ -1098,36 +1152,58 @@ export class CastLog extends SimLog {
};
const castBeganLogsByAbility = bucket(castBeganLogs, log => toBucketKey(log.actionId!));
const castCompletedLogsByAbility = bucket(castCompletedLogs, log => toBucketKey(log.actionId!));
+ const castCancelledLogsByAbility = bucket(castCancelledLogs, log => toBucketKey(log.actionId!));
const damageDealtLogsByAbility = bucket(damageDealtLogs, log => toBucketKey(log.actionId!));
const castLogs: Array = [];
Object.keys(castBeganLogsByAbility).forEach(bucketKey => {
const abilityCastsBegan = castBeganLogsByAbility[bucketKey]!;
const abilityCastsCompleted = castCompletedLogsByAbility[bucketKey];
+ const abilityCastsCancelled = castCancelledLogsByAbility[bucketKey];
const abilityDamageDealt = damageDealtLogsByAbility[bucketKey];
let ddIdx = 0;
+ let castSkipIdx = 0;
for (let cbIdx = 0; cbIdx < abilityCastsBegan.length; cbIdx++) {
const cbLog = abilityCastsBegan[cbIdx];
// Assume cast completed log is the same index because they always come in pairs.
// Only exception is final pair, where there might be a cast began without a cast completed.
let ccLog: CastCompletedLog | null = null;
+ let cCancelLog: CastCancelledLog | null = null;
let nextCcLog: CastCompletedLog | null = null;
if (abilityCastsCompleted && cbIdx < abilityCastsCompleted.length) {
- ccLog = abilityCastsCompleted[cbIdx];
- if (cbIdx + 1 < abilityCastsCompleted.length) {
- nextCcLog = abilityCastsCompleted[cbIdx + 1];
+ ccLog = abilityCastsCompleted[cbIdx + castSkipIdx];
+ if (cbIdx + castSkipIdx + 1 < abilityCastsCompleted.length) {
+ nextCcLog = abilityCastsCompleted[cbIdx + castSkipIdx + 1];
}
}
+ if (abilityCastsCancelled) {
+ const cancelledCast =
+ abilityCastsCancelled.find(
+ cancelLog => cancelLog.timestamp >= cbLog.timestamp && cancelLog.timestamp <= abilityCastsBegan[cbIdx + 1].timestamp,
+ ) || null;
+ if (cancelledCast) {
+ cCancelLog = cancelledCast;
+ castSkipIdx--
+ }
+ }
+ if (cbLog.actionId?.spellId === 2912) {
+ }
+
// Find all damage dealt logs between the cur and next cast completed logs.
const ddLogs = [];
- while (abilityDamageDealt && ddIdx < abilityDamageDealt.length && (!nextCcLog || abilityDamageDealt[ddIdx].timestamp < nextCcLog.timestamp)) {
+ while (
+ !cCancelLog &&
+ abilityDamageDealt &&
+ ddIdx < abilityDamageDealt.length &&
+ (!nextCcLog || abilityDamageDealt[ddIdx].timestamp < nextCcLog.timestamp)
+ ) {
ddLogs.push(abilityDamageDealt[ddIdx]);
ddIdx++;
}
- castLogs.push(new CastLog(cbLog, ccLog, ddLogs));
+ castLogs.push(new CastLog(cbLog, ccLog, cCancelLog, ddLogs));
}
});
diff --git a/ui/scss/core/components/detailed_results/_timeline.scss b/ui/scss/core/components/detailed_results/_timeline.scss
index 02330ab496..2ba459c6de 100644
--- a/ui/scss/core/components/detailed_results/_timeline.scss
+++ b/ui/scss/core/components/detailed_results/_timeline.scss
@@ -1,6 +1,7 @@
:root {
--timeline-tick-bg: maroon;
--timeline-cast-bg: rgb(229, 204, 128, 0.7);
+ --timeline-cast-cancel-bg: rgb(230, 128, 102, 0.7);
--timeline-aura-bg: rgba(0, 0, 255, 0.52);
--timeline-travel-time-bg: rgb(249, 192, 255, 0.6);
}
@@ -331,6 +332,14 @@
border-bottom: 3px solid var(--bs-gray);
}
+.rotation-timeline-cast.cast-cancelled {
+ background-color: var(--timeline-cast-cancel-bg);
+
+ .rotation-timeline-cast-icon {
+ border-color: var(--bs-cancel);
+ }
+}
+
.rotation-timeline-cast.outcome-miss .rotation-timeline-cast-icon {
border-color: var(--bs-miss);
}
diff --git a/ui/scss/shared/_variables.scss b/ui/scss/shared/_variables.scss
index 9668aac9b0..b6d6312dab 100644
--- a/ui/scss/shared/_variables.scss
+++ b/ui/scss/shared/_variables.scss
@@ -160,6 +160,7 @@ $damage-hit: green;
$damage-crit: blue;
$damage-partial: yellow;
$damage-miss: red;
+$damage-cancel: #e68066;
$damage-dps: #ed5653;
$damage-threat: #b56d07;
@@ -170,6 +171,7 @@ $damage-colors: (
crit: $damage-crit,
partial: $damage-partial,
miss: $damage-miss,
+ cancel: $damage-cancel,
);
$theme-colors: map-merge($theme-colors, $damage-colors);