IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix charge move effect activating twice

pull/16/head
Flashfyre 2024-02-27 20:15:47 -05:00
parent 38a518a9e1
commit 822c83e469
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/data/move.ts
View File

@ -955,8 +955,9 @@ export class ChargeAttr extends OverrideMoveEffectAttr {
usedChargeEffect(user: Pokemon, target: Pokemon, move: Move): boolean { usedChargeEffect(user: Pokemon, target: Pokemon, move: Move): boolean {
if (!this.chargeEffect) if (!this.chargeEffect)
return false; return false;
const lastMove = user.getLastXMoves().find(() => true); // Account for move history being populated when this function is called
return lastMove && lastMove.move === move.id && lastMove.result === MoveResult.OTHER; const lastMoves = user.getLastXMoves(2);
return lastMoves.length === 2 && lastMoves[1].move === move.id && lastMoves[1].result === MoveResult.OTHER;
} }
} }
@ -2206,7 +2207,7 @@ export function getMoveTargets(user: Pokemon, move: Moves): MoveTargetSet {
break; break;
case MoveTarget.ALL: case MoveTarget.ALL:
case MoveTarget.BOTH_SIDES: case MoveTarget.BOTH_SIDES:
set = [ user, user.getAlly() ].concat(user.getOpponents()); set = [ user, user.getAlly() ].concat(opponents);
multiple = true; multiple = true;
break; break;
} }