mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-06-21 00:52:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sutff

Browse Source
This commit is contained in:
Bertie690 2025-06-13 07:30:42 -04:00
parent 688bd5366d
commit 81d3fb1eea
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/phases/turn-start-phase.ts
View File

@ -17,10 +17,6 @@ import type { TurnCommand } from "#app/battle";
export class TurnStartPhase extends FieldPhase { export class TurnStartPhase extends FieldPhase {
public readonly phaseName = "TurnStartPhase"; public readonly phaseName = "TurnStartPhase";
constructor() {
super(false);
}
/** /**
* This orders the active Pokemon on the field by speed into an BattlerIndex array and returns that array. * This orders the active Pokemon on the field by speed into an BattlerIndex array and returns that array.
* It also checks for Trick Room and reverses the array if it is present. * It also checks for Trick Room and reverses the array if it is present.
@ -160,7 +156,8 @@ export class TurnStartPhase extends FieldPhase {
return; return;
} }
// TODO: This logic is questionable, especially given the fact that `order` is used for exactly 1 thing... // TODO: This logic is questionable and needs to be redone,
// especially given the fact that `order` is used for exactly 1 thing...
if (turnCommand.command === Command.FIGHT) { if (turnCommand.command === Command.FIGHT) {
pokemon.turnData.order = index; pokemon.turnData.order = index;
} }
@ -196,7 +193,7 @@ export class TurnStartPhase extends FieldPhase {
"SwitchSummonPhase", "SwitchSummonPhase",
turnCommand.args?.[0] ? SwitchType.BATON_PASS : SwitchType.SWITCH, turnCommand.args?.[0] ? SwitchType.BATON_PASS : SwitchType.SWITCH,
pokemon.getFieldIndex(), pokemon.getFieldIndex(),
turnCommand.cursor!, turnCommand.cursor!, // TODO: Is this bang correct?
true, true,
pokemon.isPlayer(), pokemon.isPlayer(),
); );