From 01d96563da01239bfaadff05f463af489f97ef8a Mon Sep 17 00:00:00 2001 From: Jake Magier Date: Sun, 28 Mar 2021 22:57:11 -0400 Subject: [PATCH] Dynamic Max Moves get the right type, name and desc still wrong (#437) --- calc/src/mechanics/gen78.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calc/src/mechanics/gen78.ts b/calc/src/mechanics/gen78.ts index 85452ddae..0f76d631e 100644 --- a/calc/src/mechanics/gen78.ts +++ b/calc/src/mechanics/gen78.ts @@ -130,8 +130,7 @@ export function calculateSMSS( const isCritical = !defender.hasAbility('Battle Armor', 'Shell Armor') && (move.isCrit || (attacker.hasAbility('Merciless') && defender.hasStatus('psn', 'tox'))) && move.timesUsed === 1; - - if (move.named('Weather Ball')) { + if (move.named('Weather Ball') || move.originalName === 'Weather Ball') { const holdingUmbrella = attacker.hasItem('Utility Umbrella'); move.type = field.hasWeather('Sun', 'Harsh Sunshine') && !holdingUmbrella ? 'Fire' @@ -154,7 +153,8 @@ export function calculateSMSS( desc.attackerItem = attacker.item; desc.moveBP = move.bp; desc.moveType = move.type; - } else if (move.named('Nature Power') || (move.named('Terrain Pulse') && isGrounded(attacker, field))) { + } else if (move.named('Nature Power') || move.originalName === 'Nature Power' || + ((move.named('Terrain Pulse') || move.originalName === 'Terrain Pulse') && isGrounded(attacker, field))) { move.type = field.hasTerrain('Electric') ? 'Electric' : field.hasTerrain('Grassy') ? 'Grass'