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

getStarterSpecies now looks at speciesStarterCosts to determine what is a starter instead of looking at game data (exception for Pikachu)

Browse Source
This commit is contained in:
Wlowscha 2025-02-09 10:19:25 +01:00
parent ff99da1de0
commit 8e5ec4a4e0
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,7 +558,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
this.species = args[0]; this.species = args[0];
this.formIndex = args[1] ?? 0; this.formIndex = args[1] ?? 0;
this.savedStarterAttributes = args[2] ?? { shiny:false, female:true, variant:0, form:0 }; this.savedStarterAttributes = args[2] ?? { shiny:false, female:true, variant:0, form:0 };
this.starterId = this.getStarterSpeciesId(this.species.speciesId);
this.starterSetup(); this.starterSetup();
} }
@ -595,6 +594,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
const species = this.species; const species = this.species;
const formIndex = this.formIndex ?? 0; const formIndex = this.formIndex ?? 0;
this.starterId = this.getStarterSpeciesId(this.species.speciesId);
const allEvolutions = pokemonEvolutions.hasOwnProperty(species.speciesId) ? pokemonEvolutions[species.speciesId] : []; const allEvolutions = pokemonEvolutions.hasOwnProperty(species.speciesId) ? pokemonEvolutions[species.speciesId] : [];
if (species.forms.length > 0) { if (species.forms.length > 0) {
@ -876,7 +877,14 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
* @returns the id of the corresponding starter * @returns the id of the corresponding starter
*/ */
getStarterSpeciesId(speciesId): number { getStarterSpeciesId(speciesId): number {
if (globalScene.gameData.starterData.hasOwnProperty(speciesId)) { if (speciesId === Species.PIKACHU) {
if ([ 0, 1, 8 ].includes(this.formIndex)) {
return Species.PICHU;
} else {
return Species.PIKACHU;
}
}
if (speciesStarterCosts.hasOwnProperty(speciesId)) {
return speciesId; return speciesId;
} else { } else {
return pokemonStarters[speciesId]; return pokemonStarters[speciesId];
@ -884,7 +892,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
} }
getStarterSpecies(species): PokemonSpecies { getStarterSpecies(species): PokemonSpecies {
if (globalScene.gameData.starterData.hasOwnProperty(species.speciesId)) { if (speciesStarterCosts.hasOwnProperty(species.speciesId)) {
return species; return species;
} else { } else {
return allSpecies.find(sp => sp.speciesId === pokemonStarters[species.speciesId]) ?? species; return allSpecies.find(sp => sp.speciesId === pokemonStarters[species.speciesId]) ?? species;