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

Fix disable.test.ts conflicts

Browse Source
This commit is contained in:
Bertie690 2025-06-03 08:41:22 -04:00 committed by GitHub
parent 3c1e1a6c75
commit 46aa3043a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/moves/disable.test.ts
View File

@ -34,17 +34,16 @@ describe("Moves - Disable", () => {
}); });
it("should restrict the last move used", async () => { it("should restrict the last move used", async () => {
game.override.enemyMoveset([Moves.GROWL, Moves.SPLASH]);
await game.classicMode.startBattle([Species.PIKACHU]); await game.classicMode.startBattle([Species.PIKACHU]);
const enemyMon = game.scene.getEnemyPokemon()!; const enemyMon = game.field.getEnemyPokemon();
game.move.select(Moves.SPLASH); game.move.select(Moves.SPLASH);
await game.forceEnemyMove(Moves.GROWL); await game.move.forceEnemyMove(Moves.GROWL);
await game.toNextTurn(); await game.toNextTurn();
game.move.select(Moves.DISABLE); game.move.select(Moves.DISABLE);
await game.forceEnemyMove(Moves.SPLASH); await game.move.forceEnemyMove(Moves.SPLASH);
await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
await game.toNextTurn(); await game.toNextTurn();
@ -56,8 +55,8 @@ describe("Moves - Disable", () => {
it("should fail if enemy has no move history", async () => { it("should fail if enemy has no move history", async () => {
await game.classicMode.startBattle([Species.PIKACHU]); await game.classicMode.startBattle([Species.PIKACHU]);
const playerMon = game.scene.getPlayerPokemon()!; const playerMon = game.field.getPlayerPokemon();
const enemyMon = game.scene.getEnemyPokemon()!; const enemyMon = game.field.getEnemyPokemon();
game.move.select(Moves.DISABLE); game.move.select(Moves.DISABLE);
await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]);
@ -73,7 +72,7 @@ describe("Moves - Disable", () => {
it("causes STRUGGLE if all usable moves are disabled", async () => { it("causes STRUGGLE if all usable moves are disabled", async () => {
await game.classicMode.startBattle([Species.PIKACHU]); await game.classicMode.startBattle([Species.PIKACHU]);
const enemyMon = game.scene.getEnemyPokemon()!; const enemyMon = game.field.getEnemyPokemon();
game.move.select(Moves.DISABLE); game.move.select(Moves.DISABLE);
await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
@ -88,13 +87,13 @@ describe("Moves - Disable", () => {
}); });
it("should fail if it would otherwise disable struggle", async () => { it("should fail if it would otherwise disable struggle", async () => {
game.override.enemyMoveset([Moves.STRUGGLE]);
await game.classicMode.startBattle([Species.PIKACHU]); await game.classicMode.startBattle([Species.PIKACHU]);
const playerMon = game.scene.getPlayerPokemon()!; const playerMon = game.field.getPlayerPokemon();
const enemyMon = game.scene.getEnemyPokemon()!; const enemyMon = game.field.getEnemyPokemon();
game.move.select(Moves.DISABLE); game.move.select(Moves.DISABLE);
await game.move.forceEnemyMove(Moves.STRUGGLE);
await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
await game.toNextTurn(); await game.toNextTurn();
@ -106,7 +105,7 @@ describe("Moves - Disable", () => {
it("should interrupt target's move if used first", async () => { it("should interrupt target's move if used first", async () => {
await game.classicMode.startBattle([Species.PIKACHU]); await game.classicMode.startBattle([Species.PIKACHU]);
const enemyMon = game.scene.getEnemyPokemon()!; const enemyMon = game.field.getEnemyPokemon();
// add splash to enemy move history // add splash to enemy move history
enemyMon.pushMoveHistory({ enemyMon.pushMoveHistory({
move: Moves.SPLASH, move: Moves.SPLASH,
@ -137,6 +136,7 @@ describe("Moves - Disable", () => {
game.scene.currentBattle.lastMove = Moves.SPLASH; game.scene.currentBattle.lastMove = Moves.SPLASH;
game.move.select(Moves.DISABLE); game.move.select(Moves.DISABLE);
await game.move.forceEnemyMove(moveId);
await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]); await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
await game.toNextTurn(); await game.toNextTurn();
@ -170,7 +170,7 @@ describe("Moves - Disable", () => {
// Dancer-induced Swords Dance was ignored in favor of splash, // Dancer-induced Swords Dance was ignored in favor of splash,
// leaving the subsequent _normal_ swords dance free to work as normal // leaving the subsequent _normal_ swords dance free to work as normal
const shuckle = game.scene.getEnemyPokemon()!; const shuckle = game.field.getEnemyPokemon();
expect.soft(shuckle.isMoveRestricted(Moves.SPLASH)).toBe(true); expect.soft(shuckle.isMoveRestricted(Moves.SPLASH)).toBe(true);
expect.soft(shuckle.isMoveRestricted(Moves.SWORDS_DANCE)).toBe(false); expect.soft(shuckle.isMoveRestricted(Moves.SWORDS_DANCE)).toBe(false);
expect(shuckle.getLastXMoves()[0]).toMatchObject({ move: Moves.SWORDS_DANCE, result: MoveResult.SUCCESS }); expect(shuckle.getLastXMoves()[0]).toMatchObject({ move: Moves.SWORDS_DANCE, result: MoveResult.SUCCESS });