From 8d9ccd58d7f0f4210f29a0fe468b0e399335f824 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Wed, 3 Apr 2024 14:22:12 -0400 Subject: [PATCH] Fix charge moves breaking with multi lens --- src/data/move.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/move.ts b/src/data/move.ts index cc8925eb2..a7bd10693 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1158,7 +1158,7 @@ export class ChargeAttr extends OverrideMoveEffectAttr { apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { return new Promise(resolve => { const lastMove = user.getLastXMoves().find(() => true); - if (!lastMove || lastMove.move !== move.id || lastMove.result !== MoveResult.OTHER) { + if (!lastMove || lastMove.move !== move.id || (lastMove.result !== MoveResult.OTHER && lastMove.turn !== user.scene.currentBattle.turn)) { (args[0] as Utils.BooleanHolder).value = true; new MoveChargeAnim(this.chargeAnim, move.id, user).play(user.scene, () => { user.scene.queueMessage(getPokemonMessage(user, ` ${this.chargeText.replace('{TARGET}', target.name)}`));