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

Set Species call to give Pokemon Movesets

Browse Source 
- Added setSpecies call before selecting Pokemon in order to give the Pokemon their starting movesets
- As a side effect the last generated Pokemon information is shown
This commit is contained in:
Milly Wang 2024-05-19 12:23:16 -06:00
parent c09839a654
commit 58d44f5c6c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1919,11 +1919,13 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
// The value is guaranteed to be less than the value limit so no need to check, simple call suffices // The value is guaranteed to be less than the value limit so no need to check, simple call suffices
this.tryUpdateValue(this.scene.gameData.getSpeciesStarterValue(species.speciesId)); this.tryUpdateValue(this.scene.gameData.getSpeciesStarterValue(species.speciesId));
this.setSpecies(species);
// set cursor position for selected pokemon // set cursor position for selected pokemon
const cursorObj = this.starterCursorObjs[this.starterCursors.length]; const cursorObj = this.starterCursorObjs[this.starterCursors.length];
// set's the cursor off screen // set's the cursor off screen
cursorObj.setPosition(-100, -100); cursorObj.setPosition(-100, -100);
// Generate the nature, ability, and moveset for the pokemon // Generate the nature, ability, and moveset for the pokemon
// TODO: Add support for more than the default ability, natures, etc. // TODO: Add support for more than the default ability, natures, etc.
this.speciesStarterDexEntry = species ? this.scene.gameData.dexData[species.speciesId] : null; this.speciesStarterDexEntry = species ? this.scene.gameData.dexData[species.speciesId] : null;
@ -2004,6 +2006,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
if (!isDupe && this.tryUpdateValue(this.scene.gameData.getSpeciesStarterValue(species.speciesId))){ if (!isDupe && this.tryUpdateValue(this.scene.gameData.getSpeciesStarterValue(species.speciesId))){
// < 6 pokemon and the value is less than the limit check // < 6 pokemon and the value is less than the limit check
if (this.starterGens.length < 6 && this.value <= this.getValueLimit()) { if (this.starterGens.length < 6 && this.value <= this.getValueLimit()) {
this.setSpecies(species);
this.speciesStarterDexEntry = species ? this.scene.gameData.dexData[species.speciesId] : null; this.speciesStarterDexEntry = species ? this.scene.gameData.dexData[species.speciesId] : null;
this.dexAttrCursor = species ? this.scene.gameData.getSpeciesDefaultDexAttr(species, false, true) : 0n; this.dexAttrCursor = species ? this.scene.gameData.getSpeciesDefaultDexAttr(species, false, true) : 0n;
this.abilityCursor = species ? this.scene.gameData.getStarterSpeciesDefaultAbilityIndex(species) : 0; this.abilityCursor = species ? this.scene.gameData.getStarterSpeciesDefaultAbilityIndex(species) : 0;
@ -2015,6 +2019,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.starterAbilityIndexes.push(this.abilityCursor); this.starterAbilityIndexes.push(this.abilityCursor);
this.starterNatures.push(this.natureCursor as unknown as Nature); this.starterNatures.push(this.natureCursor as unknown as Nature);
this.starterMovesets.push(this.starterMoveset.slice(0) as StarterMoveset); this.starterMovesets.push(this.starterMoveset.slice(0) as StarterMoveset);
console.log(this.starterMovesets);
this.starterIcons[this.starterCursors.length].setTexture(species.getIconAtlasKey(props.formIndex, props.shiny, props.variant)); this.starterIcons[this.starterCursors.length].setTexture(species.getIconAtlasKey(props.formIndex, props.shiny, props.variant));
this.starterIcons[this.starterCursors.length].setFrame(species.getIconId(props.female, props.formIndex, props.shiny, props.variant)); this.starterIcons[this.starterCursors.length].setFrame(species.getIconId(props.female, props.formIndex, props.shiny, props.variant));
@ -2068,6 +2073,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.starterSelectCallback = null; this.starterSelectCallback = null;
originalStarterSelectCallback(new Array(this.starterGens.length).fill(0).map(function (_, i) { originalStarterSelectCallback(new Array(this.starterGens.length).fill(0).map(function (_, i) {
const starterSpecies = thisObj.genSpecies[thisObj.starterGens[i]][thisObj.starterCursors[i]]; const starterSpecies = thisObj.genSpecies[thisObj.starterGens[i]][thisObj.starterCursors[i]];
console.log(thisObj.starterMovesets[i]);
return { return {
species: starterSpecies, species: starterSpecies,
dexAttr: thisObj.starterAttr[i], dexAttr: thisObj.starterAttr[i],