Updating demo tier to df s4 (WoWAnalyzer#6748)

* fixed fel domination being on gcd and moved it to shared warlock abilities * updated demo tier for s4
emallson · May 3, 2024 · 748d877 · 748d877
1 parent 9085113
commit 748d877
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 26 deletions.
diff --git a/src/analysis/retail/warlock/affliction/modules/features/Abilities.ts b/src/analysis/retail/warlock/affliction/modules/features/Abilities.ts
@@ -293,14 +293,6 @@ class Abilities extends SharedAbilities {
           base: 1500,
         },
       },
-      {
-        spell: SPELLS.FEL_DOMINATION.id,
-        category: SPELL_CATEGORY.UTILITY,
-        cooldown: () => 180 - combatant.getTalentRank(TALENTS.FEL_PACT_TALENT) * 30,
-        gcd: {
-          base: 1500,
-        },
-      },
       {
         spell: TALENTS.HOWL_OF_TERROR_TALENT.id,
         category: SPELL_CATEGORY.UTILITY,

diff --git a/src/analysis/retail/warlock/demonology/CHANGELOG.tsx b/src/analysis/retail/warlock/demonology/CHANGELOG.tsx
@@ -5,6 +5,7 @@ import { Sharrq, Zeboot, Meldris, ToppleTheNun, Jonfanz, Mae, dodse, Arlie, Putr
 import { SpellLink } from 'interface';
 
 export default [
+  change(date(2024, 4, 30), "Updated for DF S4", Zyer),
   change(date(2024, 3, 6), <>Added <SpellLink spell={TALENTS_WARLOCK.DARK_PACT_TALENT}/> and <SpellLink spell={SPELLS.UNENDING_RESOLVE}/> guide</>, Zyer),
   change(date(2024, 2, 22), "Updated for patch 10.2.5, added statistic for T31 Amirdrassil", Zyer),
   change(date(2024, 2, 20), <>Added <SpellLink spell={TALENTS_WARLOCK.SUMMON_DEMONIC_TYRANT_TALENT}/> breakdown to main guide</>, Zyer),

diff --git a/...analysis/retail/warlock/demonology/modules/dragonflight/tier/T31AmirdrassilDemonology.tsx b/...analysis/retail/warlock/demonology/modules/dragonflight/tier/T31AmirdrassilDemonology.tsx
@@ -41,9 +41,13 @@ class T31AmirdrassilDemonology extends Analyzer {
 
   constructor(options: Options) {
     super(options);
-    this.active = this.selectedCombatant.has2PieceByTier(TIERS.DF3);
+    this.active =
+      this.selectedCombatant.has2PieceByTier(TIERS.DF3) ||
+      this.selectedCombatant.has2PieceByTier(TIERS.DF4);
     this.has2Piece = this.active;
-    this.has4Piece = this.selectedCombatant.has4PieceByTier(TIERS.DF3);
+    this.has4Piece =
+      this.selectedCombatant.has4PieceByTier(TIERS.DF3) ||
+      this.selectedCombatant.has4PieceByTier(TIERS.DF4);
 
     this.addEventListener(
       Events.applydebuff.by(SELECTED_PLAYER).spell(SPELLS.DOOM_BRAND_DEBUFF),

diff --git a/src/analysis/retail/warlock/demonology/modules/features/Abilities.ts b/src/analysis/retail/warlock/demonology/modules/features/Abilities.ts
@@ -330,14 +330,6 @@ class Abilities extends SharedAbilities {
         },
         cooldown: combatant.hasTalent(TALENTS.DARKFURY_TALENT) ? 45 : 60,
       },
-      {
-        spell: SPELLS.FEL_DOMINATION.id,
-        category: SPELL_CATEGORY.UTILITY,
-        cooldown: () => 180 - combatant.getTalentRank(TALENTS.FEL_PACT_TALENT) * 30,
-        gcd: {
-          base: 1500,
-        },
-      },
       {
         spell: SPELLS.UNENDING_BREATH.id,
         category: SPELL_CATEGORY.UTILITY,

diff --git a/src/analysis/retail/warlock/destruction/modules/features/Abilities.ts b/src/analysis/retail/warlock/destruction/modules/features/Abilities.ts
@@ -270,14 +270,6 @@ class Abilities extends SharedAbilities {
           base: 1500,
         },
       },
-      {
-        spell: SPELLS.FEL_DOMINATION.id,
-        category: SPELL_CATEGORY.UTILITY,
-        cooldown: 180,
-        gcd: {
-          base: 1500,
-        },
-      },
       {
         spell: SPELLS.UNENDING_BREATH.id,
         category: SPELL_CATEGORY.UTILITY,

diff --git a/src/analysis/retail/warlock/shared/Abilities.ts b/src/analysis/retail/warlock/shared/Abilities.ts
@@ -50,6 +50,12 @@ class Abilities extends CoreAbilities {
       },
 
       // Utility
+      {
+        spell: SPELLS.FEL_DOMINATION.id,
+        category: SPELL_CATEGORY.UTILITY,
+        cooldown: 180 - combatant.getTalentRank(TALENTS.FEL_PACT_TALENT) * 30,
+        gcd: null,
+      },
       {
         spell: SPELLS.DEMONIC_CIRCLE_SUMMON.id,
         category: SPELL_CATEGORY.UTILITY,