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

Cleaned up some TODOs

Browse Source
This commit is contained in:
Wlowscha 2025-05-15 23:22:30 +02:00
parent 33c21a0b0d
commit c75d406bcf
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -588,7 +588,7 @@ export default class PartyUiHandler extends MessageUiHandler {
return false; return false;
} }
// TODO: Might need a check here actually for when this.transferMode is active... // TODO: Might need to check here for when this.transferMode is active.
processModifierTransferModeLeftRightInput(button: Button) { processModifierTransferModeLeftRightInput(button: Button) {
let success = false; let success = false;
const option = this.options[this.optionsCursor]; const option = this.options[this.optionsCursor];
@ -622,7 +622,7 @@ export default class PartyUiHandler extends MessageUiHandler {
return success; return success;
} }
// TODO: Might need a check here actually for when this.transferMode is active... // TODO: Might need to check here for when this.transferMode is active.
processModifierTransferModeUpDownInput(button: Button.UP | Button.DOWN) { processModifierTransferModeUpDownInput(button: Button.UP | Button.DOWN) {
let success = false; let success = false;
const option = this.options[this.optionsCursor]; const option = this.options[this.optionsCursor];
@ -787,7 +787,6 @@ export default class PartyUiHandler extends MessageUiHandler {
if (option === PartyOption.SPLICE) { if (option === PartyOption.SPLICE) {
(this.selectCallback as PartyModifierSpliceSelectCallback)(this.transferCursor, this.cursor); (this.selectCallback as PartyModifierSpliceSelectCallback)(this.transferCursor, this.cursor);
this.clearTransfer(); this.clearTransfer();
// TODO: Surely this else should specify some other option too...
} else if (option === PartyOption.APPLY) { } else if (option === PartyOption.APPLY) {
this.startTransfer(); this.startTransfer();
} }
@ -913,6 +912,10 @@ export default class PartyUiHandler extends MessageUiHandler {
return false; return false;
} }
allowCancel(): boolean {
return !(this.partyUiMode === PartyUiMode.FAINT_SWITCH || this.partyUiMode === PartyUiMode.REVIVAL_BLESSING);
}
processPartyActionInput(): boolean { processPartyActionInput(): boolean {
const ui = this.getUi(); const ui = this.getUi();
if (this.cursor < 6) { if (this.cursor < 6) {
@ -932,8 +935,7 @@ export default class PartyUiHandler extends MessageUiHandler {
} }
// Pressing return button // Pressing return button
if (this.cursor === 6) { if (this.cursor === 6) {
// TODO: define an "allowCancel (PartyUiMode) method to check here and below" if (!this.allowCancel()) {
if (this.partyUiMode === PartyUiMode.FAINT_SWITCH || this.partyUiMode === PartyUiMode.REVIVAL_BLESSING) {
ui.playError(); ui.playError();
} else { } else {
return this.processInput(Button.CANCEL); return this.processInput(Button.CANCEL);
@ -950,7 +952,7 @@ export default class PartyUiHandler extends MessageUiHandler {
) { ) {
this.clearTransfer(); this.clearTransfer();
ui.playSelect(); ui.playSelect();
} else if (this.partyUiMode !== PartyUiMode.FAINT_SWITCH && this.partyUiMode !== PartyUiMode.REVIVAL_BLESSING) { } else if (this.allowCancel()) {
if (this.selectCallback) { if (this.selectCallback) {
const selectCallback = this.selectCallback; const selectCallback = this.selectCallback;
this.selectCallback = null; this.selectCallback = null;
@ -1177,12 +1179,11 @@ export default class PartyUiHandler extends MessageUiHandler {
} }
getItemModifiers(pokemon: Pokemon): PokemonHeldItemModifier[] { getItemModifiers(pokemon: Pokemon): PokemonHeldItemModifier[] {
// TODO: This conditional has no reason to be here return (
return this.partyUiMode === PartyUiMode.MODIFIER_TRANSFER (globalScene.findModifiers(
? (globalScene.findModifiers( m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id,
m => m instanceof PokemonHeldItemModifier && m.isTransferable && m.pokemonId === pokemon.id, ) as PokemonHeldItemModifier[]) ?? []
) as PokemonHeldItemModifier[]) );
: [];
} }
updateOptionsWithRememberMoveModifierMode(pokemon): void { updateOptionsWithRememberMoveModifierMode(pokemon): void {