Skip to content

Commit 53f29b8

Browse files
authored
Merge branch 'WoWAnalyzer:midnight' into unholy-midnight-proc-and-buff-tracking
2 parents b35590f + 597bcf1 commit 53f29b8

File tree

4 files changed

+7
-55
lines changed

4 files changed

+7
-55
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { change, date } from 'common/changelog';
22
import { TALENTS_SHAMAN } from 'common/TALENTS';
3-
import { Seriousnes } from 'CONTRIBUTORS';
3+
import { Seriousnes, Texleretour } from 'CONTRIBUTORS';
44
import SpellLink from 'interface/SpellLink';
55

66
// prettier-ignore
77
export default [
8+
change(date(2026, 2, 12), <>Fix typos and talent check issues.</>, Texleretour),
89
change(date(2025, 12, 17), <>Updated for Midnight</>, Seriousnes)
910
];

src/analysis/retail/shaman/enhancement/modules/Abilities.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class Abilities extends ClassAbilities {
6969
spell: SPELLS.PRIMORDIAL_STORM_CAST.id,
7070
category: SPELL_CATEGORY.COOLDOWNS,
7171
gcd: {
72-
base: 150,
72+
base: 1500,
7373
},
7474
enabled: combatant.hasTalent(TALENTS.PRIMORDIAL_STORM_TALENT),
7575
},

src/analysis/retail/shaman/enhancement/modules/talents/HotHand.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ class HotHand extends MajorCooldown<HotHandProc> {
390390
<SpellLink spell={TALENTS.SUNDERING_TALENT} /> cast by {ll} will also trigger an{' '}
391391
<SpellLink spell={TALENTS.EARTHSURGE_TALENT} /> half way along{' '}
392392
<SpellLink spell={TALENTS.SUNDERING_TALENT} />
393-
's path
393+
's path.
394394
</>
395395
) : null}
396396
</p>

src/analysis/retail/shaman/enhancement/modules/talents/PrimordialStorm.tsx

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ interface PrimordialStormCast extends CooldownTrigger<CastEvent> {
2121
maelstromUsed: number;
2222
shouldHaveHadDoomwinds: boolean;
2323
hadDoomwinds: boolean;
24-
legacyOfTheFrostWitch: boolean;
2524
surgingElementsActive: boolean;
2625
};
2726
}
@@ -61,10 +60,6 @@ class PrimordialStorm extends MajorCooldown<PrimordialStormCast> {
6160
const details: PrimordialStormCast['details'] = {
6261
shouldHaveHadDoomwinds: this.doomWindsAlternater,
6362
hadDoomwinds,
64-
legacyOfTheFrostWitch: this.selectedCombatant.hasBuff(
65-
SPELLS.LIGHTNING_STRIKES_BUFF,
66-
event.timestamp,
67-
),
6863
maelstromUsed: this.resourceTracker.lastSpenderInfo?.amount ?? 0,
6964
surgingElementsActive: this.selectedCombatant.hasBuff(
7065
SPELLS.SURGING_ELEMENTS_BUFF,
@@ -82,14 +77,6 @@ class PrimordialStorm extends MajorCooldown<PrimordialStormCast> {
8277
);
8378
}
8479

85-
if (!details.legacyOfTheFrostWitch) {
86-
lis.push(
87-
<>
88-
<SpellLink spell={SPELLS.LIGHTNING_STRIKES_BUFF} /> was missing.
89-
</>,
90-
);
91-
}
92-
9380
if (details.maelstromUsed < 10) {
9481
lis.push(
9582
<>
@@ -145,9 +132,7 @@ class PrimordialStorm extends MajorCooldown<PrimordialStormCast> {
145132
<p>
146133
Each hit from {pstorm} is considered a Main-Hand attack, and can trigger{' '}
147134
<SpellLink spell={TALENTS.WINDFURY_WEAPON_TALENT} /> separately and are AoE. Each hit
148-
deals combination physical and spell damage, and all hits are amplified by{' '}
149-
<SpellLink spell={SPELLS.LIGHTNING_STRIKES_BUFF} />, and{' '}
150-
<SpellLink spell={SPELLS.PRIMORDIAL_FROST} /> is buffed twice.
135+
deals combination physical and spell damage.
151136
</p>
152137
<p>
153138
{pstorm} is currently the <strong>strongest</strong> {msw} spender, and you should always
@@ -164,47 +149,13 @@ class PrimordialStorm extends MajorCooldown<PrimordialStormCast> {
164149
const details = cast.details;
165150

166151
const maelstromUsed = details.maelstromUsed ?? 0;
167-
const lotfwActive = details.legacyOfTheFrostWitch ?? false;
168152
const hadDoomwinds = details.hadDoomwinds ?? false;
169153
const shouldHaveHadDoomwinds = details.shouldHaveHadDoomwinds ?? false;
170154
const surgingElementsActive = details.surgingElementsActive ?? false;
171155

172156
const issues: ReactNode[] = [];
173157
const checklistItems: ChecklistUsageInfo[] = [];
174158

175-
/**
176-
* Legacy of the Frost Witch (buff)
177-
*/
178-
checklistItems.push({
179-
check: 'legacy-of-the-frost-witch',
180-
timestamp: cast.event.timestamp,
181-
performance: lotfwActive ? QualitativePerformance.Perfect : QualitativePerformance.Fail,
182-
summary: (
183-
<>
184-
<SpellLink spell={SPELLS.LIGHTNING_STRIKES_BUFF} /> {lotfwActive ? '' : 'not'}
185-
active.
186-
</>
187-
),
188-
details: (
189-
<div>
190-
<SpellLink spell={SPELLS.LIGHTNING_STRIKES_BUFF} /> {lotfwActive ? '' : 'not'}
191-
active.
192-
{!lotfwActive && (
193-
<> This is a significant damage increase, aim to have it active for every cast.</>
194-
)}
195-
</div>
196-
),
197-
});
198-
if (!lotfwActive) {
199-
issues.push(
200-
<>
201-
<li key="lotfw">
202-
<SpellLink spell={SPELLS.LIGHTNING_STRIKES_BUFF} /> should be active for every cast.
203-
</li>
204-
</>,
205-
);
206-
}
207-
208159
/**
209160
* Maelstrom Used
210161
*/
@@ -226,7 +177,7 @@ class PrimordialStorm extends MajorCooldown<PrimordialStormCast> {
226177
),
227178
details: (
228179
<div>
229-
<strong>{maelstromUsed}</strong> <SpellLink spell={TALENTS.MAELSTROM_WEAPON_TALENT} />
180+
<strong>{maelstromUsed}</strong> <SpellLink spell={TALENTS.MAELSTROM_WEAPON_TALENT} />{' '}
230181
used.
231182
</div>
232183
),
@@ -235,7 +186,7 @@ class PrimordialStorm extends MajorCooldown<PrimordialStormCast> {
235186
issues.push(
236187
<>
237188
<li key="maelstrom-weapon">
238-
Aim to use <strong>10</strong> <SpellLink spell={TALENTS.MAELSTROM_WEAPON_TALENT} />
189+
Aim to use <strong>10</strong> <SpellLink spell={TALENTS.MAELSTROM_WEAPON_TALENT} />{' '}
239190
each time you cast <SpellLink spell={TALENTS.PRIMORDIAL_STORM_TALENT} />.
240191
</li>
241192
</>,

0 commit comments

Comments
 (0)