cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix resetting nature on starter screen when updating other properties

pull/27/head^2
Flashfyre 2024-04-02 14:32:51 -04:00
parent f540aeb804
commit b9b7afb3ee
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
private genMode: boolean; private genMode: boolean;
private statsMode: boolean; private statsMode: boolean;
private dexAttrCursor: bigint = 0n; private dexAttrCursor: bigint = 0n;
private natureCursor: integer = 0; private natureCursor: integer = -1;
private genCursor: integer = 0; private genCursor: integer = 0;
private genScrollCursor: integer = 0; private genScrollCursor: integer = 0;
private starterMoveset: StarterMoveset; private starterMoveset: StarterMoveset;
@ -1022,19 +1022,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
setSpeciesDetails(species: PokemonSpecies, shiny: boolean, formIndex: integer, female: boolean, abilityIndex: integer, natureIndex: integer, forSeen: boolean = false): void { setSpeciesDetails(species: PokemonSpecies, shiny: boolean, formIndex: integer, female: boolean, abilityIndex: integer, natureIndex: integer, forSeen: boolean = false): void {
const oldProps = species ? this.scene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor) : null; const oldProps = species ? this.scene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor) : null;
const oldNatureIndex = this.natureCursor > -1 ? this.natureCursor : this.scene.gameData.getSpeciesDefaultNature(species);
this.dexAttrCursor = 0n; this.dexAttrCursor = 0n;
this.natureCursor = -1;
if (species) { if (species) {
this.dexAttrCursor |= (shiny !== undefined ? !shiny : !(shiny = oldProps.shiny)) ? DexAttr.NON_SHINY : DexAttr.SHINY; this.dexAttrCursor |= (shiny !== undefined ? !shiny : !(shiny = oldProps.shiny)) ? DexAttr.NON_SHINY : DexAttr.SHINY;
this.dexAttrCursor |= (female !== undefined ? !female : !(female = oldProps.female)) ? DexAttr.MALE : DexAttr.FEMALE; this.dexAttrCursor |= (female !== undefined ? !female : !(female = oldProps.female)) ? DexAttr.MALE : DexAttr.FEMALE;
this.dexAttrCursor |= (abilityIndex !== undefined ? !abilityIndex : !(abilityIndex = oldProps.abilityIndex)) ? DexAttr.ABILITY_1 : species.ability2 && abilityIndex === 1 ? DexAttr.ABILITY_2 : DexAttr.ABILITY_HIDDEN; this.dexAttrCursor |= (abilityIndex !== undefined ? !abilityIndex : !(abilityIndex = oldProps.abilityIndex)) ? DexAttr.ABILITY_1 : species.ability2 && abilityIndex === 1 ? DexAttr.ABILITY_2 : DexAttr.ABILITY_HIDDEN;
this.dexAttrCursor |= this.scene.gameData.getFormAttr(formIndex !== undefined ? formIndex : (formIndex = oldProps.formIndex)); this.dexAttrCursor |= this.scene.gameData.getFormAttr(formIndex !== undefined ? formIndex : (formIndex = oldProps.formIndex));
if (natureIndex === undefined) this.natureCursor = natureIndex !== undefined ? natureIndex : (natureIndex = oldNatureIndex);
natureIndex = this.scene.gameData.getSpeciesDefaultNature(species);
} }
this.natureCursor = natureIndex;
this.pokemonSprite.setVisible(false); this.pokemonSprite.setVisible(false);
if (this.assetLoadCancelled) { if (this.assetLoadCancelled) {