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

Correctly displaying prevolutions for Pikachu and Gholdengo

Browse Source
This commit is contained in:
Wlowscha 2025-01-17 00:58:18 +01:00
parent 05e97806b5
commit 07010dd703
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,7 +651,19 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
if (preSpecies) { if (preSpecies) {
const preEvolutions = pokemonEvolutions.hasOwnProperty(preSpecies.speciesId) ? pokemonEvolutions[preSpecies.speciesId] : []; const preEvolutions = pokemonEvolutions.hasOwnProperty(preSpecies.speciesId) ? pokemonEvolutions[preSpecies.speciesId] : [];
this.prevolutions = preEvolutions.filter( this.prevolutions = preEvolutions.filter(
e => e.speciesId === species.speciesId && ((e.evoFormKey === "" || e.evoFormKey === null) || e.evoFormKey === species.forms[formIndex]?.formKey)); e => e.speciesId === species.speciesId && (
(
(e.evoFormKey === "" || e.evoFormKey === null) &&
(
// This takes care of Cosplay Pikachu (Pichu is not shown)
(preSpecies.forms.some(form => form.formKey === species.forms[formIndex]?.formKey)) ||
// This takes care of Gholdengo
(preSpecies.forms.length > 0 && species.forms.length === 0)
)
)
// This takes care of Burmy, Shellos etc
|| e.evoFormKey === species.forms[formIndex]?.formKey)
);
} }
} }
@ -1311,7 +1323,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
handler: () => { handler: () => {
const newSpecies = allSpecies.find(species => species.speciesId === pokemonPrevolutions[pre.speciesId]); const newSpecies = allSpecies.find(species => species.speciesId === pokemonPrevolutions[pre.speciesId]);
// Attempts to find the formIndex of the evolved species // Attempts to find the formIndex of the evolved species
const newFormKey = pre.evoFormKey ? pre.evoFormKey : (this.species.forms.length > 0 ? this.species.forms[this.formIndex].formKey : ""); const newFormKey = pre.preFormKey ? pre.preFormKey : (this.species.forms.length > 0 ? this.species.forms[this.formIndex].formKey : "");
const matchingForm = newSpecies?.forms.find(form => form.formKey === newFormKey); const matchingForm = newSpecies?.forms.find(form => form.formKey === newFormKey);
const newFormIndex = matchingForm ? matchingForm.formIndex : 0; const newFormIndex = matchingForm ? matchingForm.formIndex : 0;
this.starterAttributes.form = newFormIndex; this.starterAttributes.form = newFormIndex;