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

New Upper Hand tests + some nit fixes

Browse Source
This commit is contained in:
innerthunder 2024-11-04 18:10:04 -08:00
parent 4a4e5ba44e
commit 3a803bb1df
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phases/turn-start-phase.ts
View File

@ -113,7 +113,7 @@ export class TurnStartPhase extends FieldPhase {
if (isSameBracket && battlerBypassSpeed[a].value !== battlerBypassSpeed[b].value) {
return battlerBypassSpeed[a].value ? -1 : 1;
}
return aPriority < bPriority ? 1 : -1;
return (aPriority < bPriority) ? 1 : -1;
}
}

20
src/test/moves/upper_hand.test.ts
View File

@ -1,10 +1,11 @@
import { allMoves } from "#app/data/move";
import { MoveResult } from "#app/field/pokemon";
import { Abilities } from "#enums/abilities";
import { Moves } from "#enums/moves";
import { Species } from "#enums/species";
import GameManager from "#test/utils/gameManager";
import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
describe("Moves - Upper Hand", () => {
let phaserGame: Phaser.Game;
@ -50,7 +51,7 @@ describe("Moves - Upper Hand", () => {
it.each([
{ descriptor: "non-priority attack", move: Moves.TACKLE },
{ descriptor: "status move", move: Moves.SPLASH }
{ descriptor: "status move", move: Moves.BABY_DOLL_EYES }
])("should fail when the opponent selects a $descriptor", async ({ move }) => {
game.override.enemyMoveset(move);
@ -81,4 +82,19 @@ describe("Moves - Upper Hand", () => {
expect(magikarp.isFullHp()).toBeFalsy();
expect(feebas.isFullHp()).toBeTruthy();
});
it("should fail if the target has already moved", async () => {
game.override.enemyMoveset(Moves.TACKLE);
vi.spyOn(allMoves[Moves.TACKLE], "priority", "get").mockReturnValue(4);
await game.classicMode.startBattle([ Species.FEEBAS ]);
const feebas = game.scene.getPlayerPokemon()!;
game.move.select(Moves.UPPER_HAND);
await game.phaseInterceptor.to("BerryPhase");
expect(feebas.getLastXMoves()[0].result).toBe(MoveResult.FAIL);
expect(feebas.isFullHp()).toBeFalsy();
});
});