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

Merge branch 'charge-move-overhaul' of https://github.com/innerthunder/pokerogue into charge-move-overhaul

Browse Source
This commit is contained in:
innerthunder 2024-10-20 02:08:44 -07:00
commit 3c425396f5
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/phases/move-phase.ts
View File

@ -310,11 +310,31 @@ export class MovePhase extends BattlePhase {
/** Queues a {@linkcode MoveChargePhase} for this phase's invoked move. */ /** Queues a {@linkcode MoveChargePhase} for this phase's invoked move. */
protected chargeMove() { protected chargeMove() {
// Protean and Libero apply on the charging turn of charge moves const move = this.move.getMove();
applyPreAttackAbAttrs(PokemonTypeChangeAbAttr, this.pokemon, null, this.move.getMove()); const targets = this.getActiveTargetPokemon();
this.showMoveText(); if (move.applyConditions(this.pokemon, targets[0], move)) {
this.scene.unshiftPhase(new MoveChargePhase(this.scene, this.pokemon.getBattlerIndex(), this.targets[0], this.move)); // Protean and Libero apply on the charging turn of charge moves
applyPreAttackAbAttrs(PokemonTypeChangeAbAttr, this.pokemon, null, this.move.getMove());
this.showMoveText();
this.scene.unshiftPhase(new MoveChargePhase(this.scene, this.pokemon.getBattlerIndex(), this.targets[0], this.move));
} else {
// Copied from useMove()
this.pokemon.pushMoveHistory({ move: this.move.moveId, targets: this.targets, result: MoveResult.FAIL, virtual: this.move.virtual });
let failedText: string | undefined;
const failureMessage = move.getFailedText(this.pokemon, targets[0], move, new BooleanHolder(false));
if (failureMessage) {
failedText = failureMessage;
}
this.showFailedText(failedText);
// Remove the user from its semi-invulnerable state (if applicable)
this.pokemon.lapseTags(BattlerTagLapseType.MOVE_EFFECT);
}
} }
/** /**