mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-07 16:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor touchups

Browse Source
This commit is contained in:
Sirz Benjie 2025-05-26 16:41:58 -05:00
parent 958eb00566
commit 22d2b4a436
No known key found for this signature in database
GPG Key ID: 4A524B4D196C759E
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,8 +249,7 @@ export class CommandPhase extends FieldPhase {
const playerPokemon = this.getPokemon();
const ignorePP = isIgnorePP(useMode);
/** Whether or not to display an error message instead of attempting to initiate the command selection process */
let canUse = cursor !== -1 || !playerPokemon.trySelectMove(cursor, ignorePP);
let canUse = cursor === -1 || playerPokemon.trySelectMove(cursor, ignorePP);
const useStruggle = canUse
? false
@ -291,7 +290,7 @@ export class CommandPhase extends FieldPhase {
console.log(moveTargets, getPokemonNameWithAffix(playerPokemon));
if (moveTargets.multiple) {
if (moveTargets.targets.length > 1 && moveTargets.multiple) {
globalScene.phaseManager.unshiftNew("SelectTargetPhase", this.fieldIndex);
}
@ -419,7 +418,7 @@ export class CommandPhase extends FieldPhase {
}
/**
* Common helper method to handle the logic for effects that prevent the pokemon from leaving the field
* Helper method to handle the logic for effects that prevent the pokemon from leaving the field
* due to trapping abilities or effects.
*
* This method queues the proper messages in the case of trapping abilities or effects
@ -478,11 +477,16 @@ export class CommandPhase extends FieldPhase {
private tryLeaveField(cursor?: number, isBatonSwitch = false): boolean {
const currentBattle = globalScene.currentBattle;
if (isBatonSwitch && !this.handleTrap()) {
currentBattle.turnCommands[this.fieldIndex] = {
command: this.isSwitch ? Command.POKEMON : Command.RUN,
cursor: cursor,
};
if (isBatonSwitch || !this.handleTrap()) {
currentBattle.turnCommands[this.fieldIndex] = this.isSwitch
? {
command: Command.POKEMON,
cursor: cursor,
args: [isBatonSwitch],
}
: {
command: Command.RUN,
};
if (!this.isSwitch && this.fieldIndex) {
currentBattle.turnCommands[this.fieldIndex - 1]!.skip = true;
}
@ -537,7 +541,7 @@ export class CommandPhase extends FieldPhase {
);
}
// Overloads for handleCommand to provide a more specific type signature for the different options
// Overloads for handleCommand to provide a more specific signature for the different options
handleCommand(command: Command.FIGHT | Command.TERA, cursor: number, useMode?: MoveUseMode, move?: TurnMove): boolean;
handleCommand(command: Command.BALL, cursor: number): boolean;
handleCommand(command: Command.POKEMON, cursor: number, useBaton: boolean): boolean;