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 changes in test/discard text prompt

Browse Source
This commit is contained in:
Tiago Rodrigues 2025-07-04 19:44:04 +01:00
parent a8fd71f92b
commit 2315ea5916
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -666,8 +666,9 @@ export default class PartyUiHandler extends MessageUiHandler {
let success = true;
if (this.optionsCursor === itemModifiers.length) {
for (let i = 0; i < itemModifiers.length; i++) {
success = globalScene.tryDiscardHeldItemModifier(itemModifiers[i], this.transferQuantities[i]);
globalScene.tryDiscardHeldItemModifier(itemModifiers[i], this.transferQuantities[i]);
}
success = this.getTransferrableItemsFromPokemon(pokemon).length === 0;
} else {
success = globalScene.tryDiscardHeldItemModifier(
itemModifiers[this.optionsCursor],
@ -678,10 +679,6 @@ export default class PartyUiHandler extends MessageUiHandler {
if (success) {
this.showText(
i18next.t("partyUiHandler:discardItemConfirmation", { pokemonName: getPokemonNameWithAffix(pokemon) }),
undefined,
() => this.showText("", 0),
null,
true,
);
ui.playSelect();
} else {

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

@ -46,7 +46,7 @@ describe("UI - Transfer Items", () => {
expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler);
const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
handler.setCursor(1); // Select/click manage items button
handler.setCursor(1);
handler.processInput(Button.ACTION);
void game.scene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.MODIFIER_TRANSFER);
@ -74,7 +74,7 @@ describe("UI - Transfer Items", () => {
expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler);
const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
handler.setCursor(2); //check team menu,manage button shouldn't exist
handler.setCursor(2);
handler.processInput(Button.ACTION);
void game.scene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.MODIFIER_TRANSFER);
@ -97,12 +97,12 @@ describe("UI - Transfer Items", () => {
});
// Test that the manage button actually discards items, needs proofreading
it("should actually discard items", async () => {
it("should discard items when button is selected", async () => {
game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => {
expect(game.scene.ui.getHandler()).toBeInstanceOf(ModifierSelectUiHandler);
const handler = game.scene.ui.getHandler() as ModifierSelectUiHandler;
handler.setCursor(1); //check team menu,manage button shouldn't exist
handler.setCursor(1);
handler.processInput(Button.ACTION);
void game.scene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.MODIFIER_TRANSFER);
@ -111,20 +111,22 @@ describe("UI - Transfer Items", () => {
await game.phaseInterceptor.to("BattleEndPhase");
game.phaseInterceptor.addToNextPrompt("SelectModifierPhase", UiMode.PARTY, () => {
expect(game.scene.ui.getHandler()).toBeInstanceOf(Number.POSITIVE_INFINITY);
expect(game.scene.ui.getHandler()).toBeInstanceOf(PartyUiHandler);
const handler = game.scene.ui.getHandler() as PartyUiHandler;
handler.processInput(Button.DOWN);
handler.processInput(Button.ACTION); //activate discard mode
handler.processInput(Button.UP);
handler.processInput(Button.ACTION); //select pokemon's items
// 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();
const pokemon = game.scene.getPlayerParty()[0];
expect.soft(pokemon.getHeldItems()[0].stackCount).toBe(1);
handler.processInput(Button.ACTION); //discard the items
expect(pokemon.getHeldItems()).toHaveLength(3);
expect(pokemon.getHeldItems().map(h => h.stackCount)).toEqual([1, 2, 2]);
handler.processInput(Button.ACTION); //reselect pokemon's items
expect.soft(pokemon.getHeldItems()[0].stackCount).toBe(2); //second item has a different count
// Sitrus berry was discarded, leaving 2 stacks of 2 berries behind
expect(pokemon.getHeldItems()).toHaveLength(2);
expect(pokemon.getHeldItems().map(h => h.stackCount)).toEqual([2, 2]);
game.phaseInterceptor.unlock();
});