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

QOL update for running in double battle

Browse Source
This commit is contained in:
Matthew Olker 2024-05-16 17:19:08 -04:00
parent 3f571a366a
commit d8fe0b1c22
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/phases.ts
View File

@ -2047,12 +2047,20 @@ export class TurnStartPhase extends FieldPhase {
this.scene.unshiftPhase(new AttemptCapturePhase(this.scene, turnCommand.targets[0] % 2, turnCommand.cursor)); this.scene.unshiftPhase(new AttemptCapturePhase(this.scene, turnCommand.targets[0] % 2, turnCommand.cursor));
break; break;
case Command.POKEMON: case Command.POKEMON:
this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, pokemon.getFieldIndex(), turnCommand.cursor, true, turnCommand.args[0] as boolean, pokemon.isPlayer()));
break;
case Command.RUN: case Command.RUN:
const isSwitch = turnCommand.command === Command.POKEMON; let runningPokemon = pokemon;
if (isSwitch) // check if either active player pokemon has run away
this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, pokemon.getFieldIndex(), turnCommand.cursor, true, turnCommand.args[0] as boolean, pokemon.isPlayer())); if (this.scene.currentBattle.double) {
else const playerPokemon = field.filter(pokemon => pokemon.isPlayer());
this.scene.unshiftPhase(new AttemptRunPhase(this.scene, pokemon.getFieldIndex())); // use the faster stats if not
const fasterPokemon = playerPokemon[0].stats[Stat.SPD] > playerPokemon[1].stats[Stat.SPD] ? playerPokemon[0] : playerPokemon[1];
const hasRunAway = playerPokemon.find(p => p.hasAbility(Abilities.RUN_AWAY));
runningPokemon = hasRunAway != undefined ? hasRunAway : fasterPokemon;
}
console.log(runningPokemon.name)
this.scene.unshiftPhase(new AttemptRunPhase(this.scene, runningPokemon.getFieldIndex()));
break; break;
} }
} }