From 0ccb9df405e0e05178c1401831c7d02207cfd118 Mon Sep 17 00:00:00 2001 From: PigeonBar <56974298+PigeonBar@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:01:26 -0500 Subject: [PATCH] Fix Heavy Rain check to account for weather suppression Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> --- src/data/battler-tags.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index d9e973726d4..0f64f3933c5 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -885,7 +885,8 @@ export class PowderTag extends BattlerTag { const movePhase = pokemon.scene.getCurrentPhase(); if (movePhase instanceof MovePhase) { const move = movePhase.move.getMove(); - if (pokemon.getMoveType(move) === Type.FIRE && pokemon.scene.arena.weather?.weatherType !== WeatherType.HEAVY_RAIN) { + const weather = pokemon.scene.arena.weather; + if (pokemon.getMoveType(move) === Type.FIRE && !(weather && weather.weatherType === WeatherType.HEAVY_RAIN && !weather.isEffectSuppressed(pokemon.scene))) { movePhase.fail(); pokemon.scene.unshiftPhase(new CommonAnimPhase(pokemon.scene, pokemon.getBattlerIndex(), pokemon.getBattlerIndex(), CommonAnim.POWDER));