Fix Elemental Blast for Enhancement shamans

Pewtro · Sep 6, 2023 · b5f75fd · b5f75fd
1 parent b355ec6
commit b5f75fd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/analysis/retail/shaman/enhancement/CHANGELOG.tsx b/src/analysis/retail/shaman/enhancement/CHANGELOG.tsx
@@ -1,9 +1,10 @@
 import { change, date } from 'common/changelog';
 import { TALENTS_SHAMAN } from 'common/TALENTS';
-import { Taum, Vetyst, Vohrr, xunni, Seriousnes, ToppleTheNun } from 'CONTRIBUTORS';
+import { Taum, Vetyst, Vohrr, xunni, Seriousnes, ToppleTheNun, Putro } from 'CONTRIBUTORS';
 import { SpellLink } from 'interface';
 
 export default [
+  change(date(2023, 9, 6), <>Fix <SpellLink spell={TALENTS_SHAMAN.ELEMENTAL_BLAST_ENHANCEMENT_TALENT} /> not working after 10.1.7.</>, Putro),
   change(date(2023, 8, 4), <>Added filler spell details to Ascendance analyzer</>, Seriousnes),
   change(date(2023, 7, 31), <>Updated example report</>, Seriousnes),
   change(date(2023, 7, 31), <>Reordered guide sections</>, Seriousnes),

diff --git a/src/analysis/retail/shaman/enhancement/constants.tsx b/src/analysis/retail/shaman/enhancement/constants.tsx
@@ -36,7 +36,7 @@ export const MAELSTROM_WEAPON_ELIGIBLE_SPELLS: Spell[] = [
   SPELLS.ELEMENTAL_BLAST,
   SPELLS.LIGHTNING_BOLT,
   TALENTS.CHAIN_LIGHTNING_TALENT,
-  TALENTS.ELEMENTAL_BLAST_ENHANCEMENT_TALENT,
+  TALENTS.ELEMENTAL_BLAST_ELEMENTAL_TALENT, //Intentional usage of Elemental Shaman spell id
   TALENTS.CHAIN_HEAL_TALENT,
   SPELLS.HEALING_SURGE,
 ];

diff --git a/src/analysis/retail/shaman/enhancement/modules/Abilities.tsx b/src/analysis/retail/shaman/enhancement/modules/Abilities.tsx
@@ -413,7 +413,7 @@ class Abilities extends CoreAbilities {
       },
       {
         // This is no error. We actually use the elemental shaman elemental blast spell id.
-        spell: TALENTS_SHAMAN.ELEMENTAL_BLAST_ENHANCEMENT_TALENT.id,
+        spell: TALENTS_SHAMAN.ELEMENTAL_BLAST_ELEMENTAL_TALENT.id,
         enabled: combatant.hasTalent(TALENTS_SHAMAN.ELEMENTAL_BLAST_ENHANCEMENT_TALENT),
         charges:
           combatant.getRepeatedTalentCount(TALENTS_SHAMAN.ELEMENTAL_BLAST_ENHANCEMENT_TALENT) +

diff --git a/src/analysis/retail/shaman/enhancement/modules/apl/AplCheck.tsx b/src/analysis/retail/shaman/enhancement/modules/apl/AplCheck.tsx
@@ -50,7 +50,7 @@ export const apl = (info: PlayerInfo): Apl => {
 
   if (combatant.hasTalent(TALENTS.DOOM_WINDS_TALENT)) {
     rules.push({
-      spell: TALENTS.ELEMENTAL_BLAST_ENHANCEMENT_TALENT,
+      spell: TALENTS.ELEMENTAL_BLAST_ELEMENTAL_TALENT,
       condition: atLeastFiveMSW,
     });
     if (!combatant.hasTalent(TALENTS.STATIC_ACCUMULATION_TALENT)) {
@@ -68,10 +68,10 @@ export const apl = (info: PlayerInfo): Apl => {
   } else {
     rules.push(
       {
-        spell: TALENTS.ELEMENTAL_BLAST_ENHANCEMENT_TALENT,
+        spell: TALENTS.ELEMENTAL_BLAST_ELEMENTAL_TALENT,
         condition: and(
           atLeastFiveMSW,
-          spellCharges(TALENTS.ELEMENTAL_BLAST_ENHANCEMENT_TALENT, { atLeast: 2, atMost: 2 }),
+          spellCharges(TALENTS.ELEMENTAL_BLAST_ELEMENTAL_TALENT, { atLeast: 2, atMost: 2 }),
         ),
       },
       {
@@ -83,7 +83,7 @@ export const apl = (info: PlayerInfo): Apl => {
         condition: and(atLeastFiveMSW, buffPresent(SPELLS.CRACKLING_THUNDER_TIER_BUFF)),
       },
       {
-        spell: TALENTS.ELEMENTAL_BLAST_ENHANCEMENT_TALENT,
+        spell: TALENTS.ELEMENTAL_BLAST_ELEMENTAL_TALENT,
         condition: and(
           atLeastFiveMSW,
           describe(