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

Merge e20d7047f7 into 5bfcb1d379

Browse Source
This commit is contained in:
Acelynn Zhang 2025-08-04 19:44:11 -04:00 committed by GitHub
commit 273fd1f111
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,14 +120,8 @@ export class MovePhase extends BattlePhase {
console.log(MoveId[this.move.moveId], enumValueToKey(MoveUseMode, this.useMode));
// Check if move is unusable (e.g. running out of PP due to a mid-turn Spite
// or the user no longer being on field), ending the phase early if not.
if (!this.canMove(true)) {
if (this.pokemon.isActive(true)) {
this.fail();
this.showMoveText();
this.showFailedText();
}
if (!this.pokemon.isActive(true)) {
this.cancel();
this.end();
return;
}
@ -155,6 +149,7 @@ export class MovePhase extends BattlePhase {
this.resolveCounterAttackTarget();
// Check status cancellation from sleep, freeze, etc.
this.resolvePreMoveStatusEffects();
this.lapsePreMoveAndMoveTags();
@ -180,6 +175,18 @@ export class MovePhase extends BattlePhase {
const targets = this.getActiveTargetPokemon();
const moveQueue = this.pokemon.getMoveQueue();
// Check if move is unusable (e.g. running out of PP due to a mid-turn Spite
// or the user no longer being on field)
if (!this.canMove(true)) {
if (this.pokemon.isActive(true)) {
this.fail();
this.showMoveText();
this.showFailedText();
}
return;
}
if (
(targets.length === 0 && !this.move.getMove().hasAttr("AddArenaTrapTagAttr")) ||
(moveQueue.length > 0 && moveQueue[0].move === MoveId.NONE)

31
test/data/status-effect.test.ts
View File

@ -353,7 +353,7 @@ describe("Status Effects", () => {
beforeEach(() => {
game = new GameManager(phaserGame);
game.override
.moveset([MoveId.SPLASH])
.moveset([MoveId.SPLASH, MoveId.DRAGON_CHEER])
.ability(AbilityId.BALL_FETCH)
.battleStyle("single")
.criticalHits(false)
@ -390,6 +390,35 @@ describe("Status Effects", () => {
expect(player.status).toBeFalsy();
expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.SUCCESS);
});
it("Sleep turns should tick down when failing to use ally-targeting moves", async () => {
await game.classicMode.startBattle([SpeciesId.FEEBAS]);
const player = game.field.getPlayerPokemon();
player.status = new Status(StatusEffect.SLEEP, 0, 4);
game.move.select(MoveId.DRAGON_CHEER);
await game.toNextTurn();
expect(player.status.effect).toBe(StatusEffect.SLEEP);
game.move.select(MoveId.DRAGON_CHEER);
await game.toNextTurn();
expect(player.status.effect).toBe(StatusEffect.SLEEP);
game.move.select(MoveId.DRAGON_CHEER);
await game.toNextTurn();
expect(player.status.effect).toBe(StatusEffect.SLEEP);
expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.FAIL);
game.move.select(MoveId.DRAGON_CHEER);
await game.toNextTurn();
expect(player.status).toBeFalsy();
expect(player.getLastXMoves(1)[0].result).toBe(MoveResult.FAIL);
});
});
describe("Behavior", () => {