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

More cleanup

Browse Source
This commit is contained in:
Wlowscha 2025-01-07 22:28:25 +01:00
parent cc3d518914
commit f86ab7bd46
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 15 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
private lastSpecies: PokemonSpecies; private lastSpecies: PokemonSpecies;
private lastFormIndex: number; private lastFormIndex: number;
private speciesLoaded: Map<Species, boolean> = new Map<Species, boolean>(); private speciesLoaded: Map<Species, boolean> = new Map<Species, boolean>();
public starterSpecies: PokemonSpecies[] = [];
private levelMoves: LevelMoves; private levelMoves: LevelMoves;
private eggMoves: Moves[] = []; private eggMoves: Moves[] = [];
private hasEggMoves: boolean[] = []; private hasEggMoves: boolean[] = [];
@ -291,8 +290,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
this.pokemonUncaughtText.setOrigin(0, 0); this.pokemonUncaughtText.setOrigin(0, 0);
this.starterSelectContainer.add(this.pokemonUncaughtText); this.starterSelectContainer.add(this.pokemonUncaughtText);
const starterSpecies: Species[] = [];
const starterBoxContainer = this.scene.add.container(speciesContainerX + 6, 9); //115 const starterBoxContainer = this.scene.add.container(speciesContainerX + 6, 9); //115
for (const species of allSpecies) { for (const species of allSpecies) {
@ -300,7 +297,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
continue; continue;
} }
starterSpecies.push(species.speciesId);
this.speciesLoaded.set(species.speciesId, false); this.speciesLoaded.set(species.speciesId, false);
this.allSpecies.push(species); this.allSpecies.push(species);
@ -859,44 +855,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
} }
} }
/**
* Determines if a passive upgrade is available for the given species ID
* @param speciesId The ID of the species to check the passive of
* @returns true if the user has enough candies and a passive has not been unlocked already
*/
isPassiveAvailable(speciesId: number): boolean {
// Get this species ID's starter data
const starterData = this.scene.gameData.starterData[this.getStarterSpeciesId(speciesId)];
return starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[this.getStarterSpeciesId(speciesId)])
&& !(starterData.passiveAttr & PassiveAttr.UNLOCKED);
}
/**
* Determines if a value reduction upgrade is available for the given species ID
* @param speciesId The ID of the species to check the value reduction of
* @returns true if the user has enough candies and all value reductions have not been unlocked already
*/
isValueReductionAvailable(speciesId: number): boolean {
// Get this species ID's starter data
const starterData = this.scene.gameData.starterData[this.getStarterSpeciesId(speciesId)];
return starterData.candyCount >= getValueReductionCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(speciesId)])[starterData.valueReduction]
&& starterData.valueReduction < valueReductionMax;
}
/**
* Determines if an same species egg can be bought for the given species ID
* @param speciesId The ID of the species to check the value reduction of
* @returns true if the user has enough candies
*/
isSameSpeciesEggAvailable(speciesId: number): boolean {
// Get this species ID's starter data
const starterData = this.scene.gameData.starterData[this.getStarterSpeciesId(speciesId)];
return starterData.candyCount >= getSameSpeciesEggCandyCounts(speciesStarterCosts[this.getStarterSpeciesId(speciesId)]);
}
getFormString(formKey: string, species: PokemonSpecies, append: boolean = false): string { getFormString(formKey: string, species: PokemonSpecies, append: boolean = false): string {
let label: string; let label: string;
const formText = capitalizeString(formKey, "-", false, false) ?? ""; const formText = capitalizeString(formKey, "-", false, false) ?? "";
@ -1574,7 +1532,7 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
case Button.STATS: case Button.STATS:
if (!this.speciesStarterDexEntry?.caughtAttr) { if (!this.speciesStarterDexEntry?.caughtAttr) {
error = true; error = true;
} else if (this.starterSpecies.length <= 6) { // checks to see if the party has 6 or fewer pokemon } else { // checks to see if the party has 6 or fewer pokemon
const ui = this.getUi(); const ui = this.getUi();
const options: any[] = []; // TODO: add proper type const options: any[] = []; // TODO: add proper type
@ -1978,22 +1936,8 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
} }
const starterIndex = this.starterSpecies.indexOf(species);
let props: StarterAttributes;
if (starterIndex > -1) {
props = this.starterAttributes;
this.setSpeciesDetails(species, {
shiny: props.shiny,
formIndex: props.form,
female: props.female,
variant: props.variant ?? 0,
});
} else {
const defaultDexAttr = this.getCurrentDexProps(species.speciesId);
// load default nature from stater save data, if set // load default nature from stater save data, if set
props = this.scene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr); const props: StarterAttributes = this.scene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
if (starterAttributes?.variant && !isNaN(starterAttributes.variant)) { if (starterAttributes?.variant && !isNaN(starterAttributes.variant)) {
if (props.shiny) { if (props.shiny) {
props.variant = starterAttributes.variant as Variant; props.variant = starterAttributes.variant as Variant;
@ -2008,7 +1952,6 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
female: props.female, female: props.female,
variant: props.variant ?? 0, variant: props.variant ?? 0,
}); });
}
const speciesForm = getPokemonSpeciesForm(species.speciesId, props.form ?? 0); const speciesForm = getPokemonSpeciesForm(species.speciesId, props.form ?? 0);
this.setTypeIcons(speciesForm.type1, speciesForm.type2); this.setTypeIcons(speciesForm.type1, speciesForm.type2);