Skip to content

Commit 01d9656

Browse files
committed
Dynamic Max Moves get the right type, name and desc still wrong (smogon#437)
1 parent e593be2 commit 01d9656

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

calc/src/mechanics/gen78.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ export function calculateSMSS(
130130
const isCritical = !defender.hasAbility('Battle Armor', 'Shell Armor') &&
131131
(move.isCrit || (attacker.hasAbility('Merciless') && defender.hasStatus('psn', 'tox'))) &&
132132
move.timesUsed === 1;
133-
134-
if (move.named('Weather Ball')) {
133+
if (move.named('Weather Ball') || move.originalName === 'Weather Ball') {
135134
const holdingUmbrella = attacker.hasItem('Utility Umbrella');
136135
move.type =
137136
field.hasWeather('Sun', 'Harsh Sunshine') && !holdingUmbrella ? 'Fire'
@@ -154,7 +153,8 @@ export function calculateSMSS(
154153
desc.attackerItem = attacker.item;
155154
desc.moveBP = move.bp;
156155
desc.moveType = move.type;
157-
} else if (move.named('Nature Power') || (move.named('Terrain Pulse') && isGrounded(attacker, field))) {
156+
} else if (move.named('Nature Power') || move.originalName === 'Nature Power' ||
157+
((move.named('Terrain Pulse') || move.originalName === 'Terrain Pulse') && isGrounded(attacker, field))) {
158158
move.type =
159159
field.hasTerrain('Electric') ? 'Electric'
160160
: field.hasTerrain('Grassy') ? 'Grass'

0 commit comments

Comments
 (0)