From 10ff20ccebd827bcb08aa7bf40b7e3db3726a319 Mon Sep 17 00:00:00 2001 From: Vollmer Date: Tue, 19 Mar 2024 10:29:55 +0100 Subject: [PATCH] Reverting some of the timeline changes to reduce scope of PR - moving to another branch --- .../evoker/devastation/CombatLogParser.ts | 2 - .../LivingFlamePrePullNormalizer.ts | 54 ------------------- src/common/SPELLS/dragonflight/trinkets.ts | 10 ---- .../dragonflight/NymuesUnravelingSpindle.tsx | 2 +- src/parser/shared/normalizers/Channeling.ts | 8 --- 5 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 src/analysis/retail/evoker/devastation/modules/normalizers/LivingFlamePrePullNormalizer.ts diff --git a/src/analysis/retail/evoker/devastation/CombatLogParser.ts b/src/analysis/retail/evoker/devastation/CombatLogParser.ts index 131c99fdd84..a14ac9e1c29 100644 --- a/src/analysis/retail/evoker/devastation/CombatLogParser.ts +++ b/src/analysis/retail/evoker/devastation/CombatLogParser.ts @@ -29,7 +29,6 @@ import EngulfingBlaze from './modules/talents/EngulfingBlaze'; import LayWaste from './modules/talents/LayWaste'; import Iridescence from './modules/talents/Iridescence'; import T31DevaTier from './modules/dragonflight/tier/T31DevaTier'; -import LivingFlamePrePullNormalizer from './modules/normalizers/LivingFlamePrePullNormalizer'; // Shared import { @@ -60,7 +59,6 @@ class CombatLogParser extends MainCombatLogParser { // Normalizer castLinkNormalizer: CastLinkNormalizer, essenceBurstNormalizer: EssenceBurstNormalizer, - livingFlamePrePullNormalizer: LivingFlamePrePullNormalizer, // features apls: AplCheck, diff --git a/src/analysis/retail/evoker/devastation/modules/normalizers/LivingFlamePrePullNormalizer.ts b/src/analysis/retail/evoker/devastation/modules/normalizers/LivingFlamePrePullNormalizer.ts deleted file mode 100644 index c9a7ceefc62..00000000000 --- a/src/analysis/retail/evoker/devastation/modules/normalizers/LivingFlamePrePullNormalizer.ts +++ /dev/null @@ -1,54 +0,0 @@ -import SPELLS from 'common/SPELLS/evoker'; -import { AnyEvent, BeginCastEvent, EventType } from 'parser/core/Events'; -import EventsNormalizer from 'parser/core/EventsNormalizer'; -import { isFromBurnout } from './CastLinkNormalizer'; -import Haste from 'parser/shared/modules/Haste'; - -/** - * Living flame is the most commonly pre-pull casted spell for Devastation - * however it often occurs that you'll start channeling it pre-pull and only - * the cast success event (PrePullNormalizer doesn't account for this since we don't have a way to define instant cast spells) - * will trigger, this messes with how we handle GCDs and makes for a messy timeline. - * - * This normalizer aims to correct those situation - */ -class LivingFlamePrePullNormalizer extends EventsNormalizer { - static dependencies = { - ...EventsNormalizer.dependencies, - haste: Haste, - }; - protected haste!: Haste; - normalize(events: AnyEvent[]) { - const fixedEvents: AnyEvent[] = []; - let lastBeginCastEvent: BeginCastEvent | undefined; - - events.forEach((event) => { - if (!lastBeginCastEvent) { - if ( - event.type === EventType.BeginCast && - event.ability.guid === SPELLS.LIVING_FLAME_CAST.id - ) { - lastBeginCastEvent = event; - } - - if ( - event.type === EventType.Cast && - event.ability.guid === SPELLS.LIVING_FLAME_CAST.id && - !isFromBurnout(event) - ) { - fixedEvents.push({ - ...event, - // Try to get the proper GCD time - timestamp: event.timestamp - 1500 / (1 + this.haste.current), - __modified: true, - prepull: true, - }); - return; - } - } - fixedEvents.push(event); - }); - return fixedEvents; - } -} -export default LivingFlamePrePullNormalizer; diff --git a/src/common/SPELLS/dragonflight/trinkets.ts b/src/common/SPELLS/dragonflight/trinkets.ts index f4bbbd7aecd..4685d190f5a 100644 --- a/src/common/SPELLS/dragonflight/trinkets.ts +++ b/src/common/SPELLS/dragonflight/trinkets.ts @@ -91,16 +91,6 @@ const spells = { name: "Nymue's Unraveling Spindle", icon: 'inv_cloth_outdooremeralddream_d_01_buckle', }, - NYMUES_UNRAVELING_SPINDLE_DAMAGE: { - id: 427161, - name: "Nymue's Unraveling Spindle", - icon: 'inv_cloth_outdooremeralddream_d_01_buckle', - }, - NYMUES_UNRAVELING_SPINDLE_BUFF: { - id: 427072, - name: "Nymue's Unraveling Spindle", - icon: 'inv_cloth_outdooremeralddream_d_01_buckle', - }, BELORRELOS_SOLAR_MAELSTROM: { id: 422146, name: 'Solar Maelstrom', diff --git a/src/parser/retail/modules/items/dragonflight/NymuesUnravelingSpindle.tsx b/src/parser/retail/modules/items/dragonflight/NymuesUnravelingSpindle.tsx index 46c65d0a162..84d9dcc780d 100644 --- a/src/parser/retail/modules/items/dragonflight/NymuesUnravelingSpindle.tsx +++ b/src/parser/retail/modules/items/dragonflight/NymuesUnravelingSpindle.tsx @@ -25,7 +25,7 @@ export default class NymuesUnravelingSpindle extends Analyzer.withDependencies(d suggestion: true, recommendedEfficiency: 0.9, }, - damageSpellIds: [SPELLS.NYMUES_UNRAVELING_SPINDLE_DAMAGE.id], + damageSpellIds: [SPELLS.NYMUES_UNRAVELING_SPINDLE.id], }); } } diff --git a/src/parser/shared/normalizers/Channeling.ts b/src/parser/shared/normalizers/Channeling.ts index 9b3cba319f4..9c47a06bf7d 100644 --- a/src/parser/shared/normalizers/Channeling.ts +++ b/src/parser/shared/normalizers/Channeling.ts @@ -19,7 +19,6 @@ import { Options } from 'parser/core/Module'; import { TALENTS_DEMON_HUNTER } from 'common/TALENTS'; import { TALENTS_PRIEST } from 'common/TALENTS'; import { playerInfo } from '../metrics/apl/conditions/test-tools'; -import PrePullCooldowns from './PrePullCooldowns'; /** * Channels and casts are handled differently in events, and some information is also missing and must be inferred. @@ -41,11 +40,6 @@ import PrePullCooldowns from './PrePullCooldowns'; * in events, and this normalizer allows special case handling to be registered for each. */ class Channeling extends EventsNormalizer { - static dependencies = { - ...EventsNormalizer.dependencies, - /** We add dependency to PrePullCooldowns to ensure we also normalize fabricated pre-pull events */ - prePullCooldowns: PrePullCooldowns, - }; /** * Listing of all special case handlers for channels */ @@ -53,8 +47,6 @@ class Channeling extends EventsNormalizer { // General // Shadowlands Encounter buffChannelSpec(SPELLS.SOUL_INFUSION.id), // fight channel from Sun King's Salvation - see in this log: https://wowanalyzer.com/report/g4Pja6pLHnmQtbvk/32-Normal+Sun+King's+Salvation+-+Kill+(10:14)/Pjurbo/standard/events - // Trinkets - buffChannelSpec(SPELLS.NYMUES_UNRAVELING_SPINDLE.id), // Mage buffChannelSpec(TALENTS_MAGE.EVOCATION_TALENT.id), buffChannelSpec(TALENTS_MAGE.SHIFTING_POWER_TALENT.id),