Reverting some of the timeline changes to reduce scope of PR - moving…

… to another branch
Krealle · Mar 19, 2024 · 10ff20c · 10ff20c
1 parent e6ba0fe
commit 10ff20c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 75 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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,20 +40,13 @@ 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
    */
   static CHANNEL_SPECS: ChannelSpec[] = [
     // 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),