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

[Fix] Implemented suggested cursor behavior and reworked test code

Browse Source
This commit is contained in:
Tiago Rodrigues 2025-07-14 14:42:21 +01:00
parent 4046623eb8
commit f2b6659277
2 changed files with 102 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ui/party-ui-handler.ts
View File

@ -185,6 +185,8 @@ export class PartyUiHandler extends MessageUiHandler {
private transferAll: boolean; private transferAll: boolean;
private lastCursor = 0; private lastCursor = 0;
private lastLeftPokemonCursor = 0;
private lastRightPokemonCursor = 0;
private selectCallback: PartySelectCallback | PartyModifierTransferSelectCallback | null; private selectCallback: PartySelectCallback | PartyModifierTransferSelectCallback | null;
private selectFilter: PokemonSelectFilter | PokemonModifierTransferSelectFilter; private selectFilter: PokemonSelectFilter | PokemonModifierTransferSelectFilter;
private moveSelectFilter: PokemonMoveSelectFilter; private moveSelectFilter: PokemonMoveSelectFilter;
@ -992,11 +994,9 @@ export class PartyUiHandler extends MessageUiHandler {
switch (this.partyUiMode) { switch (this.partyUiMode) {
case PartyUiMode.DISCARD: case PartyUiMode.DISCARD:
this.partyUiMode = PartyUiMode.MODIFIER_TRANSFER; this.partyUiMode = PartyUiMode.MODIFIER_TRANSFER;
ui.playSelect();
break; break;
case PartyUiMode.MODIFIER_TRANSFER: case PartyUiMode.MODIFIER_TRANSFER:
this.partyUiMode = PartyUiMode.DISCARD; this.partyUiMode = PartyUiMode.DISCARD;
ui.playSelect();
break; break;
default: default:
ui.playError(); ui.playError();
@ -1045,6 +1045,13 @@ export class PartyUiHandler extends MessageUiHandler {
const slotCount = this.partySlots.length; const slotCount = this.partySlots.length;
const battlerCount = globalScene.currentBattle.getBattlerCount(); const battlerCount = globalScene.currentBattle.getBattlerCount();
if (this.lastCursor < battlerCount) {
this.lastLeftPokemonCursor = this.lastCursor;
}
if (this.lastCursor >= battlerCount && this.lastCursor < 6) {
this.lastRightPokemonCursor = this.lastCursor;
}
let success = false; let success = false;
switch (button) { switch (button) {
case Button.UP: case Button.UP:
@ -1088,21 +1095,20 @@ export class PartyUiHandler extends MessageUiHandler {
success = this.setCursor(this.cursor < 6 ? (this.cursor < slotCount - 1 ? this.cursor + 1 : 6) : 0); success = this.setCursor(this.cursor < 6 ? (this.cursor < slotCount - 1 ? this.cursor + 1 : 6) : 0);
break; break;
case Button.LEFT: case Button.LEFT:
if (this.cursor >= battlerCount && this.cursor <= 6) { if (this.cursor === 6) {
success = this.setCursor(this.isItemManageMode() ? 7 : 0); success = this.setCursor(this.isItemManageMode() ? 7 : this.lastLeftPokemonCursor);
}
if (this.cursor >= battlerCount && this.cursor < 6) {
success = this.setCursor(this.lastLeftPokemonCursor);
} }
break; break;
case Button.RIGHT: case Button.RIGHT:
if ((this.cursor === 7 && this.isItemManageMode()) || slotCount === battlerCount) { if (this.cursor === 7 || slotCount <= battlerCount) {
success = this.setCursor(6); success = this.setCursor(6);
break; break;
} }
if (battlerCount >= 2 && slotCount > battlerCount && this.getCursor() === 0 && this.lastCursor === 1) {
success = this.setCursor(2);
break;
}
if (slotCount > battlerCount && this.cursor < battlerCount) { if (slotCount > battlerCount && this.cursor < battlerCount) {
success = this.setCursor(this.lastCursor < 6 ? this.lastCursor || battlerCount : battlerCount); success = this.setCursor(this.lastRightPokemonCursor || battlerCount);
break; break;
} }
} }

154
test/ui/item-manage-button.test.ts
View File

@ -3,9 +3,10 @@ import { Button } from "#enums/buttons";
import { MoveId } from "#enums/move-id"; import { MoveId } from "#enums/move-id";
import { SpeciesId } from "#enums/species-id"; import { SpeciesId } from "#enums/species-id";
import { UiMode } from "#enums/ui-mode"; import { UiMode } from "#enums/ui-mode";
import type { Pokemon } from "#field/pokemon";
import { GameManager } from "#test/testUtils/gameManager"; import { GameManager } from "#test/testUtils/gameManager";
import { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler"; import type { ModifierSelectUiHandler } from "#ui/modifier-select-ui-handler";
import { PartyUiHandler, PartyUiMode } from "#ui/party-ui-handler"; import type { PartyUiHandler } from "#ui/party-ui-handler";
import Phaser from "phaser"; import Phaser from "phaser";
import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
@ -33,104 +34,121 @@ describe("UI - Transfer Items", () => {
{ name: "BERRY", count: 2, type: BerryType.APICOT }, { name: "BERRY", count: 2, type: BerryType.APICOT },
{ name: "BERRY", count: 2, type: BerryType.LUM }, { name: "BERRY", count: 2, type: BerryType.LUM },
]) ])
.moveset([MoveId.DRAGON_CLAW])
.enemySpecies(SpeciesId.MAGIKARP) .enemySpecies(SpeciesId.MAGIKARP)
.enemyMoveset(MoveId.SPLASH); .enemyMoveset(MoveId.SPLASH);
await game.classicMode.startBattle([SpeciesId.RAYQUAZA, SpeciesId.RAYQUAZA, SpeciesId.RAYQUAZA]); await game.classicMode.startBattle([SpeciesId.RAYQUAZA, SpeciesId.RAYQUAZA, SpeciesId.RAYQUAZA]);
game.move.use(MoveId.DRAGON_CLAW); game.move.select(MoveId.DRAGON_CLAW);
await game.phaseInterceptor.to("EggLapsePhase");
await game.phaseInterceptor.run("SelectModifierPhase");
}); });
it("manage button exists in the proper screen", async () => { it("manage button exists in the proper screen", async () => {
game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => { let handlerLength: Phaser.GameObjects.GameObject[] | undefined;
expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler);
const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; await new Promise<void>(resolve => {
handler.setCursor(1); //select manage items menu
handler.processInput(Button.ACTION); game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => {
const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
handler.processInput(Button.DOWN);
handler.setCursor(1);
handler.processInput(Button.ACTION);
});
void game.scene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.MODIFIER_TRANSFER); //select manage button
game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
const handler = game.scene.ui.getHandler() as PartyUiHandler;
handler.processInput(Button.DOWN);
handler.processInput(Button.ACTION);
handlerLength = handler.optionsContainer.list;
resolve();
});
}); });
await game.phaseInterceptor.to("BattleEndPhase"); expect(handlerLength).toHaveLength(0); // should select manage button, which has no menu
game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
expect(game.scene.ui.getHandler()).toBeInstanceOf(PartyUiHandler);
const handler = game.scene.ui.getHandler() as PartyUiHandler;
handler.processInput(Button.DOWN);
handler.processInput(Button.ACTION);
expect(handler.optionsContainer.list).toHaveLength(0); // should select manage button, which has no menu
game.phaseInterceptor.unlock();
});
await game.phaseInterceptor.to("SelectModifierPhase");
}); });
it("manage button doesn't exist in the other screens", async () => { it("manage button doesn't exist in the other screens", async () => {
// Select and enter team summary menu let handlerLength: Phaser.GameObjects.GameObject[] | undefined;
game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => {
expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler);
const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; await new Promise<void>(resolve => {
handler.setCursor(2); //select check items menu
handler.processInput(Button.ACTION); game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => {
const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
handler.processInput(Button.DOWN);
handler.setCursor(2);
handler.processInput(Button.ACTION);
});
void game.scene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.MODIFIER_TRANSFER); //try to select manage button, select 2nd pokemon instead
game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
const handler = game.scene.ui.getHandler() as PartyUiHandler;
handler.processInput(Button.DOWN);
handler.processInput(Button.ACTION);
handlerLength = handler.optionsContainer.list;
resolve();
});
}); });
await game.phaseInterceptor.to("BattleEndPhase"); expect(handlerLength).toHaveLength(6); // should select 2nd pokemon (length is 5 options + image)
game.phaseInterceptor.addToNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
expect(game.scene.ui.getHandler()).toBeInstanceOf(PartyUiHandler);
const handler = game.scene.ui.getHandler() as PartyUiHandler;
handler.processInput(Button.DOWN);
handler.processInput(Button.ACTION);
expect(handler.optionsContainer.list.length).toBeGreaterThan(0); // should select a pokemon, which has at least the cancel option
game.phaseInterceptor.unlock();
});
await game.phaseInterceptor.to("SelectModifierPhase");
}); });
// Test that the manage button actually discards items, needs proofreading // Test that the manage button actually discards items, needs proofreading
it("should discard items when button is selected", async () => { it("should discard items when button is selected", async () => {
game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => { let pokemon: Pokemon | undefined;
expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler);
const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler; await new Promise<void>(resolve => {
handler.setCursor(1); //select manage items menu
handler.processInput(Button.ACTION); game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => {
const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
handler.processInput(Button.DOWN);
handler.setCursor(1);
handler.processInput(Button.ACTION);
});
void game.scene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.MODIFIER_TRANSFER); game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
const handler = game.scene.ui.getHandler() as PartyUiHandler;
// Enter discard mode and select first party member
handler.setCursor(7);
handler.processInput(Button.ACTION);
handler.setCursor(0);
handler.processInput(Button.ACTION);
pokemon = game.field.getPlayerPokemon();
resolve();
});
}); });
await game.phaseInterceptor.to("BattleEndPhase"); expect(pokemon).toBeDefined();
if (pokemon) {
game.phaseInterceptor.addToNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
expect(game.scene.ui.getHandler()).toBeInstanceOf(PartyUiHandler);
const handler = game.scene.ui.getHandler() as PartyUiHandler;
// Enter discard mode and select first party member
handler.setCursor(7);
handler.processInput(Button.ACTION);
handler.setCursor(0);
handler.processInput(Button.ACTION);
const pokemon = game.field.getPlayerPokemon();
expect(pokemon.getHeldItems()).toHaveLength(3); expect(pokemon.getHeldItems()).toHaveLength(3);
expect(pokemon.getHeldItems().map(h => h.stackCount)).toEqual([1, 2, 2]); expect(pokemon.getHeldItems().map(h => h.stackCount)).toEqual([1, 2, 2]);
}
await new Promise<void>(resolve => {
//discard the first option
game.onNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
const handler = game.scene.ui.getHandler() as PartyUiHandler;
handler.processInput(Button.ACTION);
pokemon = game.field.getPlayerPokemon();
resolve();
});
});
expect(pokemon).toBeDefined();
if (pokemon) {
// Sitrus berry was discarded, leaving 2 stacks of 2 berries behind // Sitrus berry was discarded, leaving 2 stacks of 2 berries behind
expect(pokemon.getHeldItems()).toHaveLength(2); expect(pokemon.getHeldItems()).toHaveLength(2);
expect(pokemon.getHeldItems().map(h => h.stackCount)).toEqual([2, 2]); expect(pokemon.getHeldItems().map(h => h.stackCount)).toEqual([2, 2]);
}
game.phaseInterceptor.unlock();
});
await game.phaseInterceptor.to("SelectModifierPhase");
}); });
}); });