From 6fe3388b4f3c07b3d8df52171c497e8ce6390514 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sat, 30 Mar 2024 22:06:16 -0400 Subject: [PATCH] Implement a better fix for consecutive use moves --- src/data/move.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index b5f1da2ff50..cc5b03e2328 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -1409,12 +1409,12 @@ export class MovePowerMultiplierAttr extends VariablePowerAttr { export abstract class ConsecutiveUsePowerMultiplierAttr extends MovePowerMultiplierAttr { constructor(limit: integer, resetOnFail: boolean, resetOnLimit?: boolean, ...comboMoves: Moves[]) { super((user: Pokemon, target: Pokemon, move: Move): number => { - const moveHistory = user.getMoveHistory().reverse().slice(0); + const moveHistory = user.getMoveHistory().reverse().slice(1); let count = 0; let turnMove: TurnMove; - while (((turnMove = moveHistory.shift())?.move === move.id || (comboMoves.length && comboMoves.indexOf(turnMove?.move) > -1)) && (!resetOnFail || turnMove.result === MoveResult.SUCCESS)) { + while (((turnMove = moveHistory.shift())?.move === move.id || (comboMoves.length && comboMoves.includes(turnMove?.move))) && (!resetOnFail || turnMove.result === MoveResult.SUCCESS)) { if (count < (limit - 1)) count++; else if (resetOnLimit) @@ -1423,7 +1423,7 @@ export abstract class ConsecutiveUsePowerMultiplierAttr extends MovePowerMultipl break; } - return this.getMultiplier(count - 1); + return this.getMultiplier(count); }); }