From 9b7da35fdce606286840764525c5a94e9289e511 Mon Sep 17 00:00:00 2001 From: Mikhail Shueb Date: Wed, 11 Jun 2025 15:46:46 +0100 Subject: [PATCH 1/6] [feature]Implemented needed parts for discard function from issue #4780: -TryDiscardFunction in battlescene; -Created a party discard mode button; -Updated Transfer button in modifier-select-ui-handler to Manage items; -Created tests for the discard function in test/ui; -Added images for the new discard and transfer buttons to loading-scene; -Created placeholder messages for discard feature in party-ui-handler; Co-authored-by: Tiago Rodrigues --- public/images/ui/legacy/party_discard.json | 62 +++++++ public/images/ui/legacy/party_discard.png | Bin 0 -> 5922 bytes public/images/ui/legacy/party_transfer.json | 62 +++++++ public/images/ui/legacy/party_transfer.png | Bin 0 -> 5980 bytes public/images/ui/party_discard.json | 62 +++++++ public/images/ui/party_discard.png | Bin 0 -> 5922 bytes public/images/ui/party_transfer.json | 62 +++++++ public/images/ui/party_transfer.png | Bin 0 -> 5980 bytes src/battle-scene.ts | 13 ++ src/loading-scene.ts | 2 + src/ui/modifier-select-ui-handler.ts | 4 +- src/ui/party-ui-handler.ts | 184 ++++++++++++++++++-- test/ui/item-manage-button.test.ts | 98 +++++++++++ 13 files changed, 537 insertions(+), 12 deletions(-) create mode 100644 public/images/ui/legacy/party_discard.json create mode 100644 public/images/ui/legacy/party_discard.png create mode 100644 public/images/ui/legacy/party_transfer.json create mode 100644 public/images/ui/legacy/party_transfer.png create mode 100644 public/images/ui/party_discard.json create mode 100644 public/images/ui/party_discard.png create mode 100644 public/images/ui/party_transfer.json create mode 100644 public/images/ui/party_transfer.png create mode 100644 test/ui/item-manage-button.test.ts diff --git a/public/images/ui/legacy/party_discard.json b/public/images/ui/legacy/party_discard.json new file mode 100644 index 00000000000..308fe51cee3 --- /dev/null +++ b/public/images/ui/legacy/party_discard.json @@ -0,0 +1,62 @@ +{ + "textures": [ + { + "image": "party_discard.png", + "format": "RGBA8888", + "size": { + "w": 75, + "h": 46 + }, + "scale": 1, + "frames": [ + { + "filename": "normal", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 75, + "h": 23 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 75, + "h": 23 + }, + "frame": { + "x": 0, + "y": 0, + "w": 75, + "h": 23 + } + }, + { + "filename": "selected", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 75, + "h": 23 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 75, + "h": 23 + }, + "frame": { + "x": 0, + "y": 23, + "w": 75, + "h": 23 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:17219773dfffd6b1204d988fea3f9462:1127ad21d64bc7ebb9df4fc28f3d2d39:7ad46e8fb4648c3d3d84a746ecb371ea$" + } +} diff --git a/public/images/ui/legacy/party_discard.png b/public/images/ui/legacy/party_discard.png new file mode 100644 index 0000000000000000000000000000000000000000..6e3dc638b718f2dc929f69c24da77cdc67d1073c GIT binary patch literal 5922 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 K?=sJ*jQ<5F>Mkt+ literal 0 HcmV?d00001 diff --git a/public/images/ui/party_discard.json b/public/images/ui/party_discard.json new file mode 100644 index 00000000000..308fe51cee3 --- /dev/null +++ b/public/images/ui/party_discard.json @@ -0,0 +1,62 @@ +{ + "textures": [ + { + "image": "party_discard.png", + "format": "RGBA8888", + "size": { + "w": 75, + "h": 46 + }, + "scale": 1, + "frames": [ + { + "filename": "normal", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 75, + "h": 23 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 75, + "h": 23 + }, + "frame": { + "x": 0, + "y": 0, + "w": 75, + "h": 23 + } + }, + { + "filename": "selected", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 75, + "h": 23 + }, + "spriteSourceSize": { + "x": 0, + "y": 0, + "w": 75, + "h": 23 + }, + "frame": { + "x": 0, + "y": 23, + "w": 75, + "h": 23 + } + } + ] + } + ], + "meta": { + "app": "https://www.codeandweb.com/texturepacker", + "version": "3.0", + "smartupdate": "$TexturePacker:SmartUpdate:17219773dfffd6b1204d988fea3f9462:1127ad21d64bc7ebb9df4fc28f3d2d39:7ad46e8fb4648c3d3d84a746ecb371ea$" + } +} diff --git a/public/images/ui/party_discard.png b/public/images/ui/party_discard.png new file mode 100644 index 0000000000000000000000000000000000000000..6e3dc638b718f2dc929f69c24da77cdc67d1073c GIT binary patch literal 5922 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 K?=sJ*jQ<5F>Mkt+ literal 0 HcmV?d00001 diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 34d26b3975c..f9dd78d5618 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -3118,6 +3118,19 @@ export default class BattleScene extends SceneBase { return false; } + tryDiscardHeldItemModifier(itemModifier: PokemonHeldItemModifier, discardQuantity = 1): boolean { + const countTaken = Math.min(discardQuantity, itemModifier.stackCount); + itemModifier.stackCount -= countTaken; + + const removeOld = itemModifier.stackCount === 0; + + if (removeOld) { + return this.removeModifier(itemModifier); + } + + return true; + } + canTransferHeldItemModifier(itemModifier: PokemonHeldItemModifier, target: Pokemon, transferQuantity = 1): boolean { const mod = itemModifier.clone() as PokemonHeldItemModifier; const source = mod.pokemonId ? mod.getPokemon() : null; diff --git a/src/loading-scene.ts b/src/loading-scene.ts index 67ca9a28bc5..a9bd6db335f 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -136,6 +136,8 @@ export class LoadingScene extends SceneBase { this.loadAtlas("party_slot_hp_overlay", "ui"); this.loadAtlas("party_pb", "ui"); this.loadAtlas("party_cancel", "ui"); + this.loadAtlas("party_discard", "ui"); + this.loadAtlas("party_transfer", "ui"); this.loadImage("summary_bg", "ui"); this.loadImage("summary_overlay_shiny", "ui"); diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts index 7f5bf997f88..a709404061f 100644 --- a/src/ui/modifier-select-ui-handler.ts +++ b/src/ui/modifier-select-ui-handler.ts @@ -68,7 +68,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { if (context) { context.font = styleOptions.fontSize + "px " + styleOptions.fontFamily; - this.transferButtonWidth = context.measureText(i18next.t("modifierSelectUiHandler:transfer")).width; + this.transferButtonWidth = context.measureText("Manage Items").width; // Missing "Manage Items" call from locales. this.checkButtonWidth = context.measureText(i18next.t("modifierSelectUiHandler:checkTeam")).width; } @@ -80,7 +80,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { this.transferButtonContainer.setVisible(false); ui.add(this.transferButtonContainer); - const transferButtonText = addTextObject(-4, -2, i18next.t("modifierSelectUiHandler:transfer"), TextStyle.PARTY); + const transferButtonText = addTextObject(-4, -2, "Manage Items", TextStyle.PARTY); // Missing "Manage Items" call from locales. transferButtonText.setName("text-transfer-btn"); transferButtonText.setOrigin(1, 0); this.transferButtonContainer.add(transferButtonText); diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 452ffcf5192..028e053351a 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -104,6 +104,11 @@ export enum PartyUiMode { * This is generally used in for Mystery Encounter or special effects that require the player to select a Pokemon */ SELECT, + /** + * Indicates that the party UI is open to select a party member from which to discard an item from + * This type of selection can be cancelled. + */ + DISCARD, } export enum PartyOption { @@ -122,6 +127,7 @@ export enum PartyOption { RELEASE, RENAME, SELECT, + DISCARD, SCROLL_UP = 1000, SCROLL_DOWN = 1001, FORM_CHANGE_ITEM = 2000, @@ -156,6 +162,7 @@ export default class PartyUiHandler extends MessageUiHandler { private partySlotsContainer: Phaser.GameObjects.Container; private partySlots: PartySlot[]; private partyCancelButton: PartyCancelButton; + private PartyDiscardModeButton: PartyDiscardModeButton; private partyMessageBox: Phaser.GameObjects.NineSlice; private moveInfoOverlay: MoveInfoOverlay; @@ -309,6 +316,11 @@ export default class PartyUiHandler extends MessageUiHandler { this.iconAnimHandler = new PokemonIconAnimHandler(); this.iconAnimHandler.setup(); + const partyDiscardModeButton = new PartyDiscardModeButton(60, -globalScene.game.canvas.height / 15 - 1); + partyContainer.add(partyDiscardModeButton); + + this.PartyDiscardModeButton = partyDiscardModeButton; + // prepare move overlay. in case it appears to be too big, set the overlayScale to .5 const overlayScale = 1; this.moveInfoOverlay = new MoveInfoOverlay({ @@ -352,6 +364,7 @@ export default class PartyUiHandler extends MessageUiHandler { this.partyContainer.setVisible(true); this.partyBg.setTexture(`party_bg${globalScene.currentBattle.double ? "_double" : ""}`); this.populatePartySlots(); + this.PartyDiscardModeButton.toggleIcon(this.partyUiMode); this.setCursor(0); return true; @@ -596,7 +609,7 @@ export default class PartyUiHandler extends MessageUiHandler { const option = this.options[this.optionsCursor]; if (button === Button.LEFT) { /** Decrease quantity for the current item and update UI */ - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + if (this.isItemManageMode()) { this.transferQuantities[option] = this.transferQuantities[option] === 1 ? this.transferQuantitiesMax[option] @@ -610,7 +623,7 @@ export default class PartyUiHandler extends MessageUiHandler { if (button === Button.RIGHT) { /** Increase quantity for the current item and update UI */ - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + if (this.isItemManageMode()) { this.transferQuantities[option] = this.transferQuantities[option] === this.transferQuantitiesMax[option] ? 1 @@ -640,6 +653,34 @@ export default class PartyUiHandler extends MessageUiHandler { return success; } + private processDiscardMenuInput(pokemon: PlayerPokemon) { + const ui = this.getUi(); + this.clearOptions(); + + const itemModifiers = this.getTransferrableItemsFromPokemon(pokemon); + + let success = true; + if (this.optionsCursor === itemModifiers.length) { + for (let i = 0; i < itemModifiers.length; i++) { + success = globalScene.tryDiscardHeldItemModifier(itemModifiers[i], this.transferQuantities[i]); + } + } else { + success = globalScene.tryDiscardHeldItemModifier( + itemModifiers[this.optionsCursor], + this.transferQuantities[this.optionsCursor], + ); + } + + if (success) { + this.showText("Item has been discarded.", undefined, () => this.showText("", 0), null, true); // missing confirm message call from i18next.t. + ui.playSelect(); + } else { + ui.playError(); + } + + return success; + } + private moveOptionCursor(button: Button.UP | Button.DOWN): boolean { if (button === Button.UP) { return this.setCursor(this.optionsCursor ? this.optionsCursor - 1 : this.options.length - 1); @@ -726,6 +767,10 @@ export default class PartyUiHandler extends MessageUiHandler { return this.processModifierTransferModeInput(pokemon); } + if (this.partyUiMode === PartyUiMode.DISCARD) { + return this.processDiscardMenuInput(pokemon); + } + // options specific to the mode (moves) if (this.partyUiMode === PartyUiMode.REMEMBER_MOVE_MODIFIER) { return this.processRememberMoveModeInput(pokemon); @@ -865,7 +910,7 @@ export default class PartyUiHandler extends MessageUiHandler { } if (button === Button.LEFT || button === Button.RIGHT) { - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + if (this.isItemManageMode()) { return this.processModifierTransferModeLeftRightInput(button); } } @@ -920,10 +965,17 @@ export default class PartyUiHandler extends MessageUiHandler { return !(this.partyUiMode === PartyUiMode.FAINT_SWITCH || this.partyUiMode === PartyUiMode.REVIVAL_BLESSING); } + private isItemManageMode(): boolean { + return this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER || this.partyUiMode === PartyUiMode.DISCARD; + } + private processPartyActionInput(): boolean { const ui = this.getUi(); if (this.cursor < 6) { - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode) { + if ( + (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && !this.transferMode) || + this.partyUiMode === PartyUiMode.DISCARD + ) { /** Initialize item quantities for the selected Pokemon */ const itemModifiers = globalScene.findModifiers( m => @@ -937,6 +989,24 @@ export default class PartyUiHandler extends MessageUiHandler { this.showOptions(); ui.playSelect(); } + + if (this.cursor === 7) { + switch (this.partyUiMode) { + case PartyUiMode.DISCARD: + this.partyUiMode = PartyUiMode.MODIFIER_TRANSFER; + ui.playSelect(); + break; + case PartyUiMode.MODIFIER_TRANSFER: + this.partyUiMode = PartyUiMode.DISCARD; + ui.playSelect(); + break; + default: + ui.playError(); + break; + } + this.PartyDiscardModeButton.toggleIcon(this.partyUiMode); + ui.playSelect(); + } // Pressing return button if (this.cursor === 6) { if (!this.allowCancel()) { @@ -957,6 +1027,7 @@ export default class PartyUiHandler extends MessageUiHandler { this.clearTransfer(); ui.playSelect(); } else if (this.allowCancel()) { + this.PartyDiscardModeButton.clear(); if (this.selectCallback) { const selectCallback = this.selectCallback; this.selectCallback = null; @@ -978,9 +1049,19 @@ export default class PartyUiHandler extends MessageUiHandler { let success = false; switch (button) { case Button.UP: + if (this.cursor === 7 && this.isItemManageMode()) { + success = this.setCursor(0); + break; + } success = this.setCursor(this.cursor ? (this.cursor < 6 ? this.cursor - 1 : slotCount - 1) : 6); break; case Button.DOWN: + if (this.cursor === 0) { + if (this.isItemManageMode()) { + success = this.setCursor(7); + break; + } + } success = this.setCursor(this.cursor < 6 ? (this.cursor < slotCount - 1 ? this.cursor + 1 : 6) : 0); break; case Button.LEFT: @@ -989,7 +1070,7 @@ export default class PartyUiHandler extends MessageUiHandler { } break; case Button.RIGHT: - if (slotCount === battlerCount) { + if ((this.cursor === 7 && this.isItemManageMode()) || slotCount === battlerCount) { success = this.setCursor(6); break; } @@ -1045,11 +1126,15 @@ export default class PartyUiHandler extends MessageUiHandler { this.partySlots[this.lastCursor].deselect(); } else if (this.lastCursor === 6) { this.partyCancelButton.deselect(); + } else if (this.lastCursor === 7) { + this.PartyDiscardModeButton.deselect(); } if (cursor < 6) { this.partySlots[cursor].select(); } else if (cursor === 6) { this.partyCancelButton.select(); + } else if (cursor === 7) { + this.PartyDiscardModeButton.select(); } } return changed; @@ -1144,14 +1229,16 @@ export default class PartyUiHandler extends MessageUiHandler { optionsMessage = i18next.t("partyUiHandler:selectAnotherPokemonToSplice"); } break; + case PartyUiMode.DISCARD: + optionsMessage = "Select a held item to discard.\nUse < and > to change quantity."; //Missing discard i18next.t call message } this.showText(optionsMessage, 0); this.updateOptions(); - /** When an item is being selected for transfer, the message box is taller as the message occupies two lines */ - if (this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER) { + /** When an item is being selected for transfer or discard, the message box is taller as the message occupies two lines */ + if (this.isItemManageMode()) { this.partyMessageBox.setSize(262 - Math.max(this.optionsBg.displayWidth - 56, 0), 42); } else { this.partyMessageBox.setSize(262 - Math.max(this.optionsBg.displayWidth - 56, 0), 30); @@ -1278,6 +1365,10 @@ export default class PartyUiHandler extends MessageUiHandler { this.addCommonOptions(pokemon); } break; + case PartyUiMode.DISCARD: + this.updateOptionsWithModifierTransferMode(pokemon); + //maybe change the name, this is the item selection menu + break; // TODO: This still needs to be broken up. // It could use a rework differentiating different kind of switches // to treat baton passing separately from switching on faint. @@ -1382,7 +1473,8 @@ export default class PartyUiHandler extends MessageUiHandler { optionName = "↓"; } else if ( (this.partyUiMode !== PartyUiMode.REMEMBER_MOVE_MODIFIER && - (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode)) || + (this.partyUiMode !== PartyUiMode.MODIFIER_TRANSFER || this.transferMode) && + this.partyUiMode !== PartyUiMode.DISCARD) || option === PartyOption.CANCEL ) { switch (option) { @@ -1443,7 +1535,7 @@ export default class PartyUiHandler extends MessageUiHandler { const itemModifiers = this.getItemModifiers(pokemon); const itemModifier = itemModifiers[option]; if ( - this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER && + this.isItemManageMode() && this.transferQuantitiesMax[option] > 1 && !this.transferMode && itemModifier !== undefined && @@ -1473,7 +1565,6 @@ export default class PartyUiHandler extends MessageUiHandler { optionText.x = 15 - this.optionsBg.width; } } - startTransfer(): void { this.transferMode = true; this.transferCursor = this.cursor; @@ -1965,3 +2056,76 @@ class PartyCancelButton extends Phaser.GameObjects.Container { this.partyCancelPb.setFrame("party_pb"); } } + +class PartyDiscardModeButton extends Phaser.GameObjects.Container { + private selected: boolean; + + private transferIcon: Phaser.GameObjects.Sprite; + private discardIcon: Phaser.GameObjects.Sprite; + private textBox: Phaser.GameObjects.Text; + + constructor(x: number, y: number) { + super(globalScene, x, y); + + this.setup(); + } + + setup() { + this.transferIcon = globalScene.add.sprite(0, 0, "party_transfer", "normal"); + this.discardIcon = globalScene.add.sprite(0, 0, "party_discard", "normal"); + this.textBox = addTextObject(-8, -7, "Transfer", TextStyle.PARTY); + + this.add(this.transferIcon); + this.add(this.discardIcon); + this.add(this.textBox); + + this.clear(); + } + + select() { + if (this.selected) { + return; + } + + this.selected = true; + + this.transferIcon.setFrame("selected"); + this.discardIcon.setFrame("selected"); + } + + deselect() { + if (!this.selected) { + return; + } + + this.selected = false; + + this.transferIcon.setFrame("normal"); + this.discardIcon.setFrame("normal"); + } + + toggleIcon(partyMode: number) { + switch (partyMode) { + case PartyUiMode.DISCARD: + this.transferIcon.setVisible(true); + this.discardIcon.setVisible(false); + this.textBox.setVisible(true); + this.textBox.setText("Transfer"); + break; + case PartyUiMode.MODIFIER_TRANSFER: + this.transferIcon.setVisible(false); + this.discardIcon.setVisible(true); + this.textBox.setVisible(true); + this.textBox.setText("Discard"); + break; + default: + return; + } + } + + clear() { + this.transferIcon.setVisible(false); + this.discardIcon.setVisible(false); + this.textBox.setVisible(false); + } +} diff --git a/test/ui/item-manage-button.test.ts b/test/ui/item-manage-button.test.ts new file mode 100644 index 00000000000..6d598729fb0 --- /dev/null +++ b/test/ui/item-manage-button.test.ts @@ -0,0 +1,98 @@ +import { BerryType } from "#app/enums/berry-type"; +import { Button } from "#app/enums/buttons"; +import { MoveId } from "#enums/move-id"; +import { SpeciesId } from "#enums/species-id"; +import ModifierSelectUiHandler from "#app/ui/modifier-select-ui-handler"; +import PartyUiHandler, { PartyUiMode } from "#app/ui/party-ui-handler"; +import { UiMode } from "#enums/ui-mode"; +import GameManager from "#test/testUtils/gameManager"; +import Phaser from "phaser"; +import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest"; + +describe("UI - Transfer Items", () => { + let phaserGame: Phaser.Game; + let game: GameManager; + + beforeAll(() => { + phaserGame = new Phaser.Game({ + type: Phaser.HEADLESS, + }); + }); + + afterEach(() => { + game.phaseInterceptor.restoreOg(); + }); + + beforeEach(async () => { + game = new GameManager(phaserGame); + game.override.battleStyle("single"); + game.override.startingLevel(100); + game.override.startingWave(1); + game.override.startingHeldItems([ + { name: "BERRY", count: 1, type: BerryType.SITRUS }, + { name: "BERRY", count: 2, type: BerryType.APICOT }, + { name: "BERRY", count: 2, type: BerryType.LUM }, + ]); + game.override.moveset([MoveId.DRAGON_CLAW]); + game.override.enemySpecies(SpeciesId.MAGIKARP); + game.override.enemyMoveset([MoveId.SPLASH]); + + await game.classicMode.startBattle([SpeciesId.RAYQUAZA, SpeciesId.RAYQUAZA, SpeciesId.RAYQUAZA]); + + game.move.select(MoveId.DRAGON_CLAW); + }); + + it("manage button exists in the proper screen", 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); //manage items menu, manage button should exist + handler.processInput(Button.ACTION); + + void game.scene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.MODIFIER_TRANSFER); + }); + + await game.phaseInterceptor.to("BattleEndPhase"); + + 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).toBe(0); //should select manage button,which has no menu + + game.phaseInterceptor.unlock(); + }); + + await game.phaseInterceptor.to("SelectModifierPhase"); + }, 20000); + + it("manage button doesn't exist in the other screens", async () => { + game.onNextPrompt("SelectModifierPhase", UiMode.MODIFIER_SELECT, () => { + 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.processInput(Button.ACTION); + + void game.scene.ui.setModeWithoutClear(UiMode.PARTY, PartyUiMode.MODIFIER_TRANSFER); + }); + + await game.phaseInterceptor.to("BattleEndPhase"); + + 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"); + }, 20000); +}); From a265c37a6159aa1680113e07a79d865cc9e8775e Mon Sep 17 00:00:00 2001 From: Tiago Rodrigues Date: Mon, 16 Jun 2025 19:42:01 +0100 Subject: [PATCH 2/6] [Fix] Updated icon for dynamic messaging --- src/ui/party-ui-handler.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index fda26155045..52fe3992e60 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -1363,7 +1363,6 @@ export default class PartyUiHandler extends MessageUiHandler { break; case PartyUiMode.DISCARD: this.updateOptionsWithModifierTransferMode(pokemon); - //maybe change the name, this is the item selection menu break; // TODO: This still needs to be broken up. // It could use a rework differentiating different kind of switches @@ -2071,7 +2070,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { setup() { this.transferIcon = globalScene.add.sprite(0, 0, "party_transfer", "normal"); this.discardIcon = globalScene.add.sprite(0, 0, "party_discard", "normal"); - this.textBox = addTextObject(-8, -7, "Transfer", TextStyle.PARTY); + this.textBox = addTextObject(-8, -7, i18next.t("partyUiHandler:TRANSFER"), TextStyle.PARTY); this.add(this.transferIcon); this.add(this.discardIcon); @@ -2108,13 +2107,15 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { this.transferIcon.setVisible(true); this.discardIcon.setVisible(false); this.textBox.setVisible(true); - this.textBox.setText("Transfer"); + this.textBox.setText(i18next.t("partyUiHandler:TRANSFER")); + this.transferIcon.displayWidth = this.textBox.text.length * 9 + 3; break; case PartyUiMode.MODIFIER_TRANSFER: this.transferIcon.setVisible(false); this.discardIcon.setVisible(true); this.textBox.setVisible(true); this.textBox.setText("Discard"); + this.discardIcon.displayWidth = this.textBox.text.length * 9 + 3; break; default: return; From 87c84203e7f34dc469cabc71e46d0fe38701f665 Mon Sep 17 00:00:00 2001 From: Tiago Rodrigues Date: Mon, 16 Jun 2025 21:32:22 +0100 Subject: [PATCH 3/6] [Fix] Corrected legacy mode icons and adjusted double-battle button location --- public/images/ui/legacy/party_discard.json | 30 +++++++------- public/images/ui/legacy/party_discard.png | Bin 5922 -> 214 bytes public/images/ui/legacy/party_transfer.json | 32 +++++++-------- public/images/ui/legacy/party_transfer.png | Bin 5980 -> 214 bytes public/images/ui/party_transfer.json | 2 +- src/ui/party-ui-handler.ts | 42 ++++++++++++++++---- 6 files changed, 66 insertions(+), 40 deletions(-) diff --git a/public/images/ui/legacy/party_discard.json b/public/images/ui/legacy/party_discard.json index 308fe51cee3..f6ba017cdf5 100644 --- a/public/images/ui/legacy/party_discard.json +++ b/public/images/ui/legacy/party_discard.json @@ -4,8 +4,8 @@ "image": "party_discard.png", "format": "RGBA8888", "size": { - "w": 75, - "h": 46 + "w": 52, + "h": 32 }, "scale": 1, "frames": [ @@ -14,20 +14,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 75, - "h": 23 + "w": 52, + "h": 16 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 75, - "h": 23 + "w": 52, + "h": 16 }, "frame": { "x": 0, "y": 0, - "w": 75, - "h": 23 + "w": 52, + "h": 16 } }, { @@ -35,20 +35,20 @@ "rotated": false, "trimmed": false, "sourceSize": { - "w": 75, - "h": 23 + "w": 52, + "h": 16 }, "spriteSourceSize": { "x": 0, "y": 0, - "w": 75, - "h": 23 + "w": 52, + "h": 16 }, "frame": { "x": 0, - "y": 23, - "w": 75, - "h": 23 + "y": 16, + "w": 52, + "h": 16 } } ] diff --git a/public/images/ui/legacy/party_discard.png b/public/images/ui/legacy/party_discard.png index 6e3dc638b718f2dc929f69c24da77cdc67d1073c..4219c8d33c4cee2bd5dbf9ba3263f1482e8f0815 100644 GIT binary patch literal 214 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 K?=sJ*jQ<5F>Mkt+ diff --git a/public/images/ui/party_transfer.json b/public/images/ui/party_transfer.json index 308fe51cee3..a9d0e66c9c8 100644 --- a/public/images/ui/party_transfer.json +++ b/public/images/ui/party_transfer.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "party_discard.png", + "image": "party_transfer.png", "format": "RGBA8888", "size": { "w": 75, diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 52fe3992e60..ca68759e71b 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -314,6 +314,7 @@ export default class PartyUiHandler extends MessageUiHandler { this.iconAnimHandler.setup(); const partyDiscardModeButton = new PartyDiscardModeButton(60, -globalScene.game.canvas.height / 15 - 1); + partyContainer.add(partyDiscardModeButton); this.PartyDiscardModeButton = partyDiscardModeButton; @@ -1046,9 +1047,17 @@ export default class PartyUiHandler extends MessageUiHandler { let success = false; switch (button) { case Button.UP: - if (this.cursor === 7 && this.isItemManageMode()) { - success = this.setCursor(0); - break; + if (this.cursor === 1) { + if (this.isItemManageMode()) { + success = this.setCursor(7); + break; + } + } + if (this.cursor === 7) { + if (this.isItemManageMode()) { + success = this.setCursor(0); + break; + } } success = this.setCursor(this.cursor ? (this.cursor < 6 ? this.cursor - 1 : slotCount - 1) : 6); break; @@ -1059,6 +1068,12 @@ export default class PartyUiHandler extends MessageUiHandler { break; } } + if (this.cursor === 7) { + if (this.isItemManageMode()) { + success = this.setCursor(1); + break; + } + } success = this.setCursor(this.cursor < 6 ? (this.cursor < slotCount - 1 ? this.cursor + 1 : 6) : 0); break; case Button.LEFT: @@ -1750,7 +1765,7 @@ class PartySlot extends Phaser.GameObjects.Container { ? -184 + (globalScene.currentBattle.double ? -40 : 0) + (28 + (globalScene.currentBattle.double ? 8 : 0)) * slotIndex - : -124 + (globalScene.currentBattle.double ? -8 : 0) + slotIndex * 64, + : -124 + (globalScene.currentBattle.double ? -20 : 0) + slotIndex * 76, ); this.slotIndex = slotIndex; @@ -2006,7 +2021,6 @@ class PartySlot extends Phaser.GameObjects.Container { class PartyCancelButton extends Phaser.GameObjects.Container { private selected: boolean; - private partyCancelBg: Phaser.GameObjects.Sprite; private partyCancelPb: Phaser.GameObjects.Sprite; @@ -2015,7 +2029,6 @@ class PartyCancelButton extends Phaser.GameObjects.Container { this.setup(); } - setup() { const partyCancelBg = globalScene.add.sprite(0, 0, "party_cancel"); this.add(partyCancelBg); @@ -2059,6 +2072,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { private transferIcon: Phaser.GameObjects.Sprite; private discardIcon: Phaser.GameObjects.Sprite; + private partyDiscardPb: Phaser.GameObjects.Sprite; private textBox: Phaser.GameObjects.Text; constructor(x: number, y: number) { @@ -2068,12 +2082,14 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { } setup() { - this.transferIcon = globalScene.add.sprite(0, 0, "party_transfer", "normal"); - this.discardIcon = globalScene.add.sprite(0, 0, "party_discard", "normal"); + this.transferIcon = globalScene.add.sprite(0, 0, "party_transfer"); + this.discardIcon = globalScene.add.sprite(0, 0, "party_discard"); + this.partyDiscardPb = globalScene.add.sprite(-20, 0, "party_pb"); this.textBox = addTextObject(-8, -7, i18next.t("partyUiHandler:TRANSFER"), TextStyle.PARTY); this.add(this.transferIcon); this.add(this.discardIcon); + this.add(this.partyDiscardPb); this.add(this.textBox); this.clear(); @@ -2088,6 +2104,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { this.transferIcon.setFrame("selected"); this.discardIcon.setFrame("selected"); + this.partyDiscardPb.setFrame("party_pb_sel"); } deselect() { @@ -2099,6 +2116,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { this.transferIcon.setFrame("normal"); this.discardIcon.setFrame("normal"); + this.partyDiscardPb.setFrame("party_pb"); } toggleIcon(partyMode: number) { @@ -2108,6 +2126,10 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { this.discardIcon.setVisible(false); this.textBox.setVisible(true); this.textBox.setText(i18next.t("partyUiHandler:TRANSFER")); + this.setPosition( + globalScene.currentBattle.double ? 64 : 60, + globalScene.currentBattle.double ? -106 : -globalScene.game.canvas.height / 15 - 1, + ); this.transferIcon.displayWidth = this.textBox.text.length * 9 + 3; break; case PartyUiMode.MODIFIER_TRANSFER: @@ -2115,6 +2137,10 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { this.discardIcon.setVisible(true); this.textBox.setVisible(true); this.textBox.setText("Discard"); + this.setPosition( + globalScene.currentBattle.double ? 64 : 60, + globalScene.currentBattle.double ? -106 : -globalScene.game.canvas.height / 15 - 1, + ); this.discardIcon.displayWidth = this.textBox.text.length * 9 + 3; break; default: From 51930f87cc963706396b7b0288219de1c25b18c5 Mon Sep 17 00:00:00 2001 From: Mikhail Shueb Date: Tue, 17 Jun 2025 17:01:11 +0100 Subject: [PATCH 4/6] [Fix]Adjusted button positioning and mapping after review. Mapping requires debugging. --- src/ui/party-ui-handler.ts | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index ca68759e71b..1e3724921ec 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -1049,13 +1049,21 @@ export default class PartyUiHandler extends MessageUiHandler { case Button.UP: if (this.cursor === 1) { if (this.isItemManageMode()) { - success = this.setCursor(7); + if (globalScene.currentBattle.double === false) { + success = this.setCursor(7); + } else { + success = this.setCursor(0); + } break; } } if (this.cursor === 7) { if (this.isItemManageMode()) { - success = this.setCursor(0); + if (globalScene.currentBattle.double === true) { + success = this.setCursor(this.cursor ? (this.cursor - 2 < 6 ? 1 : slotCount - 1) : 6); + } else { + success = this.setCursor(0); + } break; } } @@ -1064,13 +1072,27 @@ export default class PartyUiHandler extends MessageUiHandler { case Button.DOWN: if (this.cursor === 0) { if (this.isItemManageMode()) { - success = this.setCursor(7); - break; + if (globalScene.currentBattle.double === false) { + success = this.setCursor(7); + break; + } + } + } + if (this.cursor === 1) { + if (this.isItemManageMode()) { + if (globalScene.currentBattle.double === true) { + success = this.setCursor(7); + break; + } } } if (this.cursor === 7) { if (this.isItemManageMode()) { - success = this.setCursor(1); + if (globalScene.currentBattle.double === false) { + success = this.setCursor(this.cursor - 2 < 6 ? (this.cursor - 2 < slotCount - 1 ? 1 : 6) : 0); + } else { + success = this.setCursor(this.cursor - 2 < 6 ? (this.cursor - 2 < slotCount - 1 ? 2 : 6) : 0); + } break; } } @@ -1765,7 +1787,7 @@ class PartySlot extends Phaser.GameObjects.Container { ? -184 + (globalScene.currentBattle.double ? -40 : 0) + (28 + (globalScene.currentBattle.double ? 8 : 0)) * slotIndex - : -124 + (globalScene.currentBattle.double ? -20 : 0) + slotIndex * 76, + : -124 + (globalScene.currentBattle.double ? -20 : 0) + slotIndex * 55, ); this.slotIndex = slotIndex; @@ -2128,7 +2150,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { this.textBox.setText(i18next.t("partyUiHandler:TRANSFER")); this.setPosition( globalScene.currentBattle.double ? 64 : 60, - globalScene.currentBattle.double ? -106 : -globalScene.game.canvas.height / 15 - 1, + globalScene.currentBattle.double ? -48 : -globalScene.game.canvas.height / 15 - 1, ); this.transferIcon.displayWidth = this.textBox.text.length * 9 + 3; break; @@ -2139,7 +2161,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { this.textBox.setText("Discard"); this.setPosition( globalScene.currentBattle.double ? 64 : 60, - globalScene.currentBattle.double ? -106 : -globalScene.game.canvas.height / 15 - 1, + globalScene.currentBattle.double ? -48 : -globalScene.game.canvas.height / 15 - 1, ); this.discardIcon.displayWidth = this.textBox.text.length * 9 + 3; break; From 2691d4e39170e56d272194a4d779c393f0442a25 Mon Sep 17 00:00:00 2001 From: Tiago Rodrigues Date: Wed, 18 Jun 2025 17:45:51 +0100 Subject: [PATCH 5/6] [Fix] Fixed visible pokeball in legacy mode and key mapping --- src/ui/party-ui-handler.ts | 47 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 1e3724921ec..041adcc1c85 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -1049,21 +1049,25 @@ export default class PartyUiHandler extends MessageUiHandler { case Button.UP: if (this.cursor === 1) { if (this.isItemManageMode()) { - if (globalScene.currentBattle.double === false) { - success = this.setCursor(7); - } else { - success = this.setCursor(0); - } + success = this.setCursor(globalScene.currentBattle.double ? 0 : 7); + break; + } + } + if (this.cursor === 2) { + if (this.isItemManageMode()) { + success = this.setCursor(globalScene.currentBattle.double ? 7 : 1); + break; + } + } + if (this.cursor === 6) { + if (this.isItemManageMode()) { + success = this.setCursor(slotCount <= globalScene.currentBattle.getBattlerCount() ? 7 : slotCount - 1); break; } } if (this.cursor === 7) { if (this.isItemManageMode()) { - if (globalScene.currentBattle.double === true) { - success = this.setCursor(this.cursor ? (this.cursor - 2 < 6 ? 1 : slotCount - 1) : 6); - } else { - success = this.setCursor(0); - } + success = this.setCursor(globalScene.currentBattle.double && slotCount > 1 ? 1 : 0); break; } } @@ -1072,27 +1076,21 @@ export default class PartyUiHandler extends MessageUiHandler { case Button.DOWN: if (this.cursor === 0) { if (this.isItemManageMode()) { - if (globalScene.currentBattle.double === false) { - success = this.setCursor(7); - break; - } + success = this.setCursor(globalScene.currentBattle.double && slotCount > 1 ? 1 : 7); + break; } } if (this.cursor === 1) { if (this.isItemManageMode()) { - if (globalScene.currentBattle.double === true) { - success = this.setCursor(7); - break; - } + success = this.setCursor(globalScene.currentBattle.double ? 7 : slotCount > 2 ? 2 : 6); + break; } } if (this.cursor === 7) { if (this.isItemManageMode()) { - if (globalScene.currentBattle.double === false) { - success = this.setCursor(this.cursor - 2 < 6 ? (this.cursor - 2 < slotCount - 1 ? 1 : 6) : 0); - } else { - success = this.setCursor(this.cursor - 2 < 6 ? (this.cursor - 2 < slotCount - 1 ? 2 : 6) : 0); - } + success = this.setCursor( + slotCount > globalScene.currentBattle.getBattlerCount() ? globalScene.currentBattle.getBattlerCount() : 6, + ); break; } } @@ -2146,6 +2144,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { case PartyUiMode.DISCARD: this.transferIcon.setVisible(true); this.discardIcon.setVisible(false); + this.partyDiscardPb.setVisible(true); this.textBox.setVisible(true); this.textBox.setText(i18next.t("partyUiHandler:TRANSFER")); this.setPosition( @@ -2157,6 +2156,7 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { case PartyUiMode.MODIFIER_TRANSFER: this.transferIcon.setVisible(false); this.discardIcon.setVisible(true); + this.partyDiscardPb.setVisible(true); this.textBox.setVisible(true); this.textBox.setText("Discard"); this.setPosition( @@ -2174,5 +2174,6 @@ class PartyDiscardModeButton extends Phaser.GameObjects.Container { this.transferIcon.setVisible(false); this.discardIcon.setVisible(false); this.textBox.setVisible(false); + this.partyDiscardPb.setVisible(false); } } From a4e721fe2a5c34082723d31ab296e756e43fb74e Mon Sep 17 00:00:00 2001 From: Tiago Rodrigues Date: Fri, 20 Jun 2025 07:10:20 +0100 Subject: [PATCH 6/6] [Fix] Background fixes,manage menu is the only one affected by changes now --- .../images/ui/legacy/party_bg_double_manage.png | Bin 0 -> 2885 bytes public/images/ui/party_bg_double_manage.png | Bin 0 -> 4029 bytes src/loading-scene.ts | 1 + src/ui/party-ui-handler.ts | 11 +++++++++-- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 public/images/ui/legacy/party_bg_double_manage.png create mode 100644 public/images/ui/party_bg_double_manage.png diff --git a/public/images/ui/legacy/party_bg_double_manage.png b/public/images/ui/legacy/party_bg_double_manage.png new file mode 100644 index 0000000000000000000000000000000000000000..f449ef4e6e5a7892a0feadca8c6c65349ea76572 GIT binary patch literal 2885 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 RW5NG%z~0)ys@wvf_#aaqWPShu literal 0 HcmV?d00001 diff --git a/src/loading-scene.ts b/src/loading-scene.ts index c93afe0ea3f..1995b7e8868 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -131,6 +131,7 @@ export class LoadingScene extends SceneBase { this.loadImage("party_bg", "ui"); this.loadImage("party_bg_double", "ui"); + this.loadImage("party_bg_double_manage", "ui"); this.loadAtlas("party_slot_main", "ui"); this.loadAtlas("party_slot", "ui"); this.loadImage("party_slot_overlay_lv", "ui"); diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 041adcc1c85..0879d8d1914 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -360,7 +360,12 @@ export default class PartyUiHandler extends MessageUiHandler { this.showMovePp = args.length > 6 && args[6]; this.partyContainer.setVisible(true); - this.partyBg.setTexture(`party_bg${globalScene.currentBattle.double ? "_double" : ""}`); + if (this.isItemManageMode()) { + this.partyBg.setTexture(`party_bg${globalScene.currentBattle.double ? "_double_manage" : ""}`); + } else { + this.partyBg.setTexture(`party_bg${globalScene.currentBattle.double ? "_double" : ""}`); + } + this.populatePartySlots(); this.PartyDiscardModeButton.toggleIcon(this.partyUiMode); this.setCursor(0); @@ -1785,7 +1790,9 @@ class PartySlot extends Phaser.GameObjects.Container { ? -184 + (globalScene.currentBattle.double ? -40 : 0) + (28 + (globalScene.currentBattle.double ? 8 : 0)) * slotIndex - : -124 + (globalScene.currentBattle.double ? -20 : 0) + slotIndex * 55, + : partyUiMode === PartyUiMode.MODIFIER_TRANSFER + ? -124 + (globalScene.currentBattle.double ? -20 : 0) + slotIndex * 55 + : -124 + (globalScene.currentBattle.double ? -8 : 0) + slotIndex * 64, ); this.slotIndex = slotIndex;