ShuriZma
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bug] block input while waiting for transition to prevent changing starter during move select and in nature menu (#2342) 

* block input while waiting for transition

* block input while waiting for the nature menu
This commit is contained in:
scott 2024-07-30 13:12:50 -04:00 committed by GitHub
parent d3dba2ebe2
commit 3fbab84642
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ui/starter-select-ui-handler.ts
View File

@ -1239,6 +1239,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
}); });
if (this.speciesStarterMoves.length > 1) { // this lets you change the pokemon moves if (this.speciesStarterMoves.length > 1) { // this lets you change the pokemon moves
const showSwapOptions = (moveset: StarterMoveset) => { const showSwapOptions = (moveset: StarterMoveset) => {
this.blockInput = true;
ui.setMode(Mode.STARTER_SELECT).then(() => { ui.setMode(Mode.STARTER_SELECT).then(() => {
ui.showText(i18next.t("starterSelectUiHandler:selectMoveSwapOut"), null, () => { ui.showText(i18next.t("starterSelectUiHandler:selectMoveSwapOut"), null, () => {
this.moveInfoOverlay.show(allMoves[moveset[0]]); this.moveInfoOverlay.show(allMoves[moveset[0]]);
@ -1248,6 +1251,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
const option: OptionSelectItem = { const option: OptionSelectItem = {
label: allMoves[m].name, label: allMoves[m].name,
handler: () => { handler: () => {
this.blockInput = true;
ui.setMode(Mode.STARTER_SELECT).then(() => { ui.setMode(Mode.STARTER_SELECT).then(() => {
ui.showText(`${i18next.t("starterSelectUiHandler:selectMoveSwapWith")} ${allMoves[m].name}.`, null, () => { ui.showText(`${i18next.t("starterSelectUiHandler:selectMoveSwapWith")} ${allMoves[m].name}.`, null, () => {
const possibleMoves = this.speciesStarterMoves.filter((sm: Moves) => sm !== m); const possibleMoves = this.speciesStarterMoves.filter((sm: Moves) => sm !== m);
@ -1282,6 +1286,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
maxOptions: 8, maxOptions: 8,
yOffset: 19 yOffset: 19
}); });
this.blockInput = false;
}); });
}); });
return true; return true;
@ -1307,6 +1312,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
maxOptions: 8, maxOptions: 8,
yOffset: 19 yOffset: 19
}); });
this.blockInput = false;
}); });
}); });
}; };
@ -1324,6 +1330,9 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
if (this.canCycleNature) { if (this.canCycleNature) {
// if we could cycle natures, enable the improved nature menu // if we could cycle natures, enable the improved nature menu
const showNatureOptions = () => { const showNatureOptions = () => {
this.blockInput = true;
ui.setMode(Mode.STARTER_SELECT).then(() => { ui.setMode(Mode.STARTER_SELECT).then(() => {
ui.showText(i18next.t("starterSelectUiHandler:selectNature"), null, () => { ui.showText(i18next.t("starterSelectUiHandler:selectNature"), null, () => {
const natures = this.scene.gameData.getNaturesForAttr(this.speciesStarterDexEntry.natureAttr); const natures = this.scene.gameData.getNaturesForAttr(this.speciesStarterDexEntry.natureAttr);
@ -1341,6 +1350,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
ui.setMode(Mode.STARTER_SELECT); ui.setMode(Mode.STARTER_SELECT);
// set nature for starter // set nature for starter
this.setSpeciesDetails(this.lastSpecies, undefined, undefined, undefined, undefined, undefined, n, undefined); this.setSpeciesDetails(this.lastSpecies, undefined, undefined, undefined, undefined, undefined, n, undefined);
this.blockInput = false;
return true; return true;
} }
}; };
@ -1350,6 +1360,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
handler: () => { handler: () => {
this.clearText(); this.clearText();
ui.setMode(Mode.STARTER_SELECT); ui.setMode(Mode.STARTER_SELECT);
this.blockInput = false;
return true; return true;
} }
}), }),