From d6617957be66fd66483b2215ee962a6698ff4753 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Tue, 21 Nov 2023 14:11:13 -0500 Subject: [PATCH] Fix status effects from moves always overriding --- src/data/move.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index 6aa356d80..76d4f56c7 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1188,8 +1188,12 @@ export class StatusEffectAttr extends MoveEffectAttr { const statusCheck = move.chance < 0 || move.chance === 100 || Utils.randInt(100) < move.chance; if (statusCheck) { const pokemon = this.selfTarget ? user : target; - if (pokemon.status) - pokemon.resetStatus(); + if (pokemon.status) { + if (this.overrideStatus) + pokemon.resetStatus(); + else + return false; + } if (!pokemon.status || (pokemon.status.effect === this.effect && move.chance < 0)) { user.scene.unshiftPhase(new ObtainStatusEffectPhase(user.scene, pokemon.getBattlerIndex(), this.effect, this.cureTurn)); return true;