Compare commits

..

2 Commits

Author SHA1 Message Date
Bertie690
1e644e453c
Update turn-start-phase.ts 2025-08-12 12:05:29 -04:00
Bertie690
c3bc15a0a9
Update src/phases/turn-start-phase.ts
Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
2025-08-12 10:33:24 -04:00

View File

@ -17,9 +17,9 @@ export class TurnStartPhase extends FieldPhase {
public readonly phaseName = "TurnStartPhase"; public readonly phaseName = "TurnStartPhase";
/** /**
* This orders the active Pokemon on the field by speed into an BattlerIndex array and returns that array. * Helper method to retrieve the current speed order of the combattants.
* 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.
* @returns An array of {@linkcode BattlerIndex}es containing all on-field Pokemon sorted in speed order. * @returns The {@linkcode BattlerIndex}es of all on-field Pokemon, sorted in speed order.
*/ */
getSpeedOrder(): BattlerIndex[] { getSpeedOrder(): BattlerIndex[] {
const playerField = globalScene.getPlayerField().filter(p => p.isActive()); const playerField = globalScene.getPlayerField().filter(p => p.isActive());
@ -53,9 +53,9 @@ export class TurnStartPhase extends FieldPhase {
} }
/** /**
* This takes the result of getSpeedOrder and applies priority / bypass speed attributes to it. * This takes the result of {@linkcode getSpeedOrder} and applies priority / bypass speed attributes to it.
* This also considers the priority levels of various commands and changes the result of `getSpeedOrder` based on such. * This also considers the priority levels of various commands and changes the result of `getSpeedOrder` based on such.
* @returns An array of {@linkcode BattlerIndex}es containing all on-field Pokemon sorted in action order. * @returns The `BattlerIndex`es of all on-field Pokemon sorted in action order.
*/ */
getCommandOrder(): BattlerIndex[] { getCommandOrder(): BattlerIndex[] {
let moveOrder = this.getSpeedOrder(); let moveOrder = this.getSpeedOrder();
@ -164,7 +164,7 @@ export class TurnStartPhase extends FieldPhase {
// TODO: Remove `turnData.order` - // TODO: Remove `turnData.order` -
// it is used exclusively for Fusion Flare/Bolt // it is used exclusively for Fusion Flare/Bolt
// and uses a really jank implementation // and uses a really jank (and incorrect) implementation
if (turnCommand.command === Command.FIGHT) { if (turnCommand.command === Command.FIGHT) {
pokemon.turnData.order = index; pokemon.turnData.order = index;
} }