From 3fe58ac5db75bc1cbde8d2f6341d7de1c54fa2cc Mon Sep 17 00:00:00 2001 From: Zach Day Date: Fri, 9 Aug 2024 20:42:51 -0400 Subject: [PATCH] Simplify DisablingBattlerTag lapse --- src/data/battler-tags.ts | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index d3f6d9be4ef..081af7ff61d 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -110,20 +110,15 @@ export abstract class DisablingBattlerTag extends BattlerTag { const phase = pokemon.scene.getCurrentPhase() as MovePhase; const move = phase.move; - if (!this.moveIsDisabled(move.moveId)) { - return true; + if (this.moveIsDisabled(move.moveId)) { + pokemon.scene.queueMessage(this.interruptedText(pokemon, move.moveId)); + phase.fail(); } - pokemon.scene.queueMessage(this.interruptedText(pokemon, move.moveId)); - phase.fail(); - } else if (lapseType === BattlerTagLapseType.TURN_END) { - // On turn end, subtract from lifetime and remove this tag if 0 - if (!super.lapse(pokemon, lapseType)) { - return false; - } + return true; } - return true; + return super.lapse(pokemon, lapseType); } /**