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

[UI/UX] Baton shows on top, De/Activate form shows on bottom (#6104)

Browse Source 
[UI/UX] Batton shows on top, De/Activate form shows on bottom
This commit is contained in:
SmhMyHead 2025-07-18 05:36:53 +02:00 committed by GitHub
parent a6e4459ecd
commit def80f2e10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1284,17 +1284,18 @@ export class PartyUiHandler extends MessageUiHandler {
const allowBatonModifierSwitch = this.allowBatonModifierSwitch();
const isBatonPassMove = this.isBatonPassMove();
if (allowBatonModifierSwitch && !isBatonPassMove) {
// the BATON modifier gives an extra switch option for
// pokemon-command switches, allowing buffs to be optionally passed
this.options.push(PartyOption.PASS_BATON);
}
// isBatonPassMove and allowBatonModifierSwitch shouldn't ever be true
// at the same time, because they both explicitly check for a mutually
// exclusive partyUiMode. But better safe than sorry.
this.options.push(
isBatonPassMove && !allowBatonModifierSwitch ? PartyOption.PASS_BATON : PartyOption.SEND_OUT,
);
if (allowBatonModifierSwitch && !isBatonPassMove) {
// the BATON modifier gives an extra switch option for
// pokemon-command switches, allowing buffs to be optionally passed
this.options.push(PartyOption.PASS_BATON);
}
}
this.addCommonOptions(pokemon);
if (this.partyUiMode === PartyUiMode.SWITCH) {
@ -1334,13 +1335,13 @@ export class PartyUiHandler extends MessageUiHandler {
this.addCommonOptions(pokemon);
break;
case PartyUiMode.CHECK:
this.addCommonOptions(pokemon);
if (globalScene.phaseManager.getCurrentPhase()?.is("SelectModifierPhase")) {
const formChangeItemModifiers = this.getFormChangeItemsModifiers(pokemon);
for (let i = 0; i < formChangeItemModifiers.length; i++) {
this.options.push(PartyOption.FORM_CHANGE_ITEM + i);
}
}
this.addCommonOptions(pokemon);
break;
case PartyUiMode.SELECT:
this.options.push(PartyOption.SELECT);