ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert clarity change due to causing bug with move selection

This commit is contained in:
Christopher Schmidt 2024-09-15 20:11:02 -04:00
parent 68ecc3dc19
commit 76dba4c300
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/phases/command-phase.ts
View File

@ -90,12 +90,12 @@ export class CommandPhase extends FieldPhase {
if (cursor === -1 || if (cursor === -1 ||
playerPokemon.trySelectMove(cursor, args[0] as boolean) || playerPokemon.trySelectMove(cursor, args[0] as boolean) ||
(useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m?.isUsable(playerPokemon)).length)) { (useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m?.isUsable(playerPokemon)).length)) {
const turnMove: TurnMove | undefined = args.length === 1 ? (args[0] as TurnMove) : undefined; const turnMove: TurnMove | undefined = (args.length === 1 ? (args[0] as TurnMove) : undefined);
let moveId: Moves; let moveId: Moves;
if (useStruggle) { if (useStruggle) {
moveId = Moves.STRUGGLE; moveId = Moves.STRUGGLE;
} else if (turnMove !== undefined) { } else if (turnMove) {
moveId = turnMove.move; moveId = turnMove.move;
} else if (cursor > -1) { } else if (cursor > -1) {
moveId = playerPokemon.getMoveset()[cursor]!.moveId; moveId = playerPokemon.getMoveset()[cursor]!.moveId;