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

Proper navigation when filtering with forms

Browse Source
This commit is contained in:
Wlowscha 2025-03-29 02:42:57 +01:00
parent a2c4f7eaf4
commit 711306041f
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ui/pokedex-page-ui-handler.ts
View File

@ -681,9 +681,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
form: 0, form: 0,
}; };
this.formIndex = this.savedStarterAttributes.form ?? 0; this.formIndex = this.savedStarterAttributes.form ?? 0;
this.filteredIndices = args[2] ?? null; this.filteredIndices = args[2] ? [...args[2]] : null;
this.filteredFormIndices = args[3] ?? null; this.filteredFormIndices = args[3] ? [...args[3]] : null;
this.starterSetup();
if (args[4] instanceof Function) { if (args[4] instanceof Function) {
this.exitCallback = args[4]; this.exitCallback = args[4];
@ -699,11 +698,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
this.starterAttributes = this.initStarterPrefs(); this.starterAttributes = this.initStarterPrefs();
console.log(this.filteredIndices);
console.log(this.filteredFormIndices);
console.log(this.savedStarterAttributes);
console.log(this.starterAttributes);
if (this.filteredIndices) { if (this.filteredIndices) {
this.filteredIndex = this.filteredIndices.findIndex(id => id === this.species.speciesId); this.filteredIndex = this.filteredIndices.findIndex(id => id === this.species.speciesId);
} }
@ -711,10 +705,14 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
if (this.filteredFormIndices) { if (this.filteredFormIndices) {
const newForm = this.filteredFormIndices[this.filteredIndex]; const newForm = this.filteredFormIndices[this.filteredIndex];
if (!isNullOrUndefined(newForm)) { if (!isNullOrUndefined(newForm)) {
this.savedStarterAttributes.form = newForm;
this.starterAttributes.form = newForm; this.starterAttributes.form = newForm;
this.formIndex = newForm;
} }
} }
this.starterSetup();
this.menuOptions = Utils.getEnumKeys(MenuOptions).map(m => Number.parseInt(MenuOptions[m]) as MenuOptions); this.menuOptions = Utils.getEnumKeys(MenuOptions).map(m => Number.parseInt(MenuOptions[m]) as MenuOptions);
this.menuContainer.setVisible(true); this.menuContainer.setVisible(true);
@ -1164,7 +1162,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
const starterAttributes = this.previousStarterAttributes.pop(); const starterAttributes = this.previousStarterAttributes.pop();
this.moveInfoOverlay.clear(); this.moveInfoOverlay.clear();
this.clearText(); this.clearText();
ui.setModeForceTransition(Mode.POKEDEX_PAGE, species, starterAttributes); ui.setModeForceTransition(
Mode.POKEDEX_PAGE,
species,
starterAttributes,
this.filteredIndices,
this.filteredFormIndices,
);
success = true; success = true;
}); });
this.blockInput = false; this.blockInput = false;
@ -1608,7 +1612,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
this.savedStarterAttributes.form = newFormIndex; this.savedStarterAttributes.form = newFormIndex;
this.moveInfoOverlay.clear(); this.moveInfoOverlay.clear();
this.clearText(); this.clearText();
ui.setMode(Mode.POKEDEX_PAGE, newSpecies, this.savedStarterAttributes); ui.setMode(
Mode.POKEDEX_PAGE,
newSpecies,
this.savedStarterAttributes,
this.filteredIndices,
this.filteredFormIndices,
);
return true; return true;
}, },
onHover: () => this.showText(conditionText), onHover: () => this.showText(conditionText),
@ -1650,7 +1660,13 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
this.savedStarterAttributes.form = newFormIndex; this.savedStarterAttributes.form = newFormIndex;
this.moveInfoOverlay.clear(); this.moveInfoOverlay.clear();
this.clearText(); this.clearText();
ui.setMode(Mode.POKEDEX_PAGE, evoSpecies, this.savedStarterAttributes); ui.setMode(
Mode.POKEDEX_PAGE,
evoSpecies,
this.savedStarterAttributes,
this.filteredIndices,
this.filteredFormIndices,
);
return true; return true;
}, },
onHover: () => this.showText(conditionText), onHover: () => this.showText(conditionText),