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

Hiding shiny star and hidden ability icon, showing correct nature

Browse Source
This commit is contained in:
Wlowscha 2025-08-16 21:55:18 +02:00
parent 344ec58a5b
commit 4aa6699e8f
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
3 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/challenge.ts
View File

@ -829,7 +829,7 @@ export class FreshStartChallenge extends Challenge {
(1 << (Nature.SERIOUS + 1)) | (1 << (Nature.SERIOUS + 1)) |
(1 << (Nature.BASHFUL + 1)) | (1 << (Nature.BASHFUL + 1)) |
(1 << (Nature.QUIRKY + 1)); (1 << (Nature.QUIRKY + 1));
dexEntry.natureAttr &= neutralNaturesAttr; dexEntry.natureAttr = neutralNaturesAttr;
// Set all ivs to 15 // Set all ivs to 15
dexEntry.ivs = [15, 15, 15, 15, 15, 15]; dexEntry.ivs = [15, 15, 15, 15, 15, 15];

6
src/system/game-data.ts
View File

@ -2110,8 +2110,10 @@ export class GameData {
return abilityAttr & AbilityAttr.ABILITY_1 ? 0 : !species.ability2 || abilityAttr & AbilityAttr.ABILITY_2 ? 1 : 2; return abilityAttr & AbilityAttr.ABILITY_1 ? 0 : !species.ability2 || abilityAttr & AbilityAttr.ABILITY_2 ? 1 : 2;
} }
getSpeciesDefaultNature(species: PokemonSpecies): Nature { getSpeciesDefaultNature(species: PokemonSpecies, dexEntry?: DexEntry): Nature {
const dexEntry = this.dexData[species.speciesId]; if (isNullOrUndefined(dexEntry)) {
dexEntry = this.dexData[species.speciesId];
}
for (let n = 0; n < 25; n++) { for (let n = 0; n < 25; n++) {
if (dexEntry.natureAttr & (1 << (n + 1))) { if (dexEntry.natureAttr & (1 << (n + 1))) {
return n as Nature; return n as Nature;

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

@ -3254,12 +3254,12 @@ export class StarterSelectUiHandler extends MessageUiHandler {
onScreenFirstIndex + maxRows * maxColumns - 1, onScreenFirstIndex + maxRows * maxColumns - 1,
); );
const gameData = globalScene.gameData;
this.starterSelectScrollBar.setScrollCursor(this.scrollCursor); this.starterSelectScrollBar.setScrollCursor(this.scrollCursor);
let pokerusCursorIndex = 0; let pokerusCursorIndex = 0;
this.filteredStarterContainers.forEach((container, i) => { this.filteredStarterContainers.forEach((container, i) => {
const { dexEntry, starterDataEntry } = this.getSpeciesData(container.species.speciesId);
const pos = calcStarterPosition(i, this.scrollCursor); const pos = calcStarterPosition(i, this.scrollCursor);
container.setPosition(pos.x, pos.y); container.setPosition(pos.x, pos.y);
if (i < onScreenFirstIndex || i > onScreenLastIndex) { if (i < onScreenFirstIndex || i > onScreenLastIndex) {
@ -3295,10 +3295,8 @@ export class StarterSelectUiHandler extends MessageUiHandler {
container.label.setVisible(true); container.label.setVisible(true);
const speciesVariants = const speciesVariants =
speciesId && gameData.dexData[speciesId].caughtAttr & DexAttr.SHINY speciesId && dexEntry.caughtAttr & DexAttr.SHINY
? [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter( ? [DexAttr.DEFAULT_VARIANT, DexAttr.VARIANT_2, DexAttr.VARIANT_3].filter(v => !!(dexEntry.caughtAttr & v))
v => !!(gameData.dexData[speciesId].caughtAttr & v),
)
: []; : [];
for (let v = 0; v < 3; v++) { for (let v = 0; v < 3; v++) {
const hasVariant = speciesVariants.length > v; const hasVariant = speciesVariants.length > v;
@ -3312,15 +3310,11 @@ export class StarterSelectUiHandler extends MessageUiHandler {
} }
} }
container.starterPassiveBgs.setVisible(!!gameData.starterData[speciesId].passiveAttr); container.starterPassiveBgs.setVisible(!!starterDataEntry.passiveAttr);
container.hiddenAbilityIcon.setVisible( container.hiddenAbilityIcon.setVisible(!!dexEntry.caughtAttr && !!(starterDataEntry.abilityAttr & 4));
!!gameData.dexData[speciesId].caughtAttr && !!(gameData.starterData[speciesId].abilityAttr & 4),
);
container.classicWinIcon container.classicWinIcon
.setVisible(gameData.starterData[speciesId].classicWinCount > 0) .setVisible(starterDataEntry.classicWinCount > 0)
.setTexture( .setTexture(dexEntry.ribbons.has(RibbonData.NUZLOCKE) ? "champion_ribbon_emerald" : "champion_ribbon");
gameData.dexData[speciesId].ribbons.has(RibbonData.NUZLOCKE) ? "champion_ribbon_emerald" : "champion_ribbon",
);
container.favoriteIcon.setVisible(this.starterPreferences[speciesId]?.favorite ?? false); container.favoriteIcon.setVisible(this.starterPreferences[speciesId]?.favorite ?? false);
// 'Candy Icon' mode // 'Candy Icon' mode
@ -3421,14 +3415,19 @@ export class StarterSelectUiHandler extends MessageUiHandler {
setSpecies(species: PokemonSpecies | null) { setSpecies(species: PokemonSpecies | null) {
this.speciesStarterDexEntry = null; this.speciesStarterDexEntry = null;
this.dexAttrCursor = 0n;
this.abilityCursor = 0;
this.natureCursor = 0;
this.teraCursor = PokemonType.UNKNOWN;
if (species) { if (species) {
const { dexEntry } = this.getSpeciesData(species.speciesId); const { dexEntry } = this.getSpeciesData(species.speciesId);
this.speciesStarterDexEntry = dexEntry; this.speciesStarterDexEntry = dexEntry;
this.dexAttrCursor = this.getCurrentDexProps(species.speciesId);
this.abilityCursor = globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
this.natureCursor = globalScene.gameData.getSpeciesDefaultNature(species, dexEntry);
this.teraCursor = species.type1;
} }
this.dexAttrCursor = species ? this.getCurrentDexProps(species.speciesId) : 0n;
this.abilityCursor = species ? globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species) : 0;
this.natureCursor = species ? globalScene.gameData.getSpeciesDefaultNature(species) : 0;
this.teraCursor = species ? species.type1 : PokemonType.UNKNOWN;
if (!species && globalScene.ui.getTooltip().visible) { if (!species && globalScene.ui.getTooltip().visible) {
globalScene.ui.hideTooltip(); globalScene.ui.hideTooltip();
@ -3593,11 +3592,12 @@ export class StarterSelectUiHandler extends MessageUiHandler {
teraType: this.starterTeras[starterIndex], teraType: this.starterTeras[starterIndex],
}); });
} else { } else {
const defaultDexAttr = this.getCurrentDexProps(species.speciesId);
const defaultAbilityIndex = const defaultAbilityIndex =
starterAttributes?.ability ?? globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species); starterAttributes?.ability ?? globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
// load default nature from stater save data, if set // load default nature from stater save data, if set
const defaultNature = starterAttributes?.nature || globalScene.gameData.getSpeciesDefaultNature(species); const { dexEntry } = this.getSpeciesData(species.speciesId);
const defaultNature =
starterAttributes?.nature || globalScene.gameData.getSpeciesDefaultNature(species, dexEntry);
props = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr); props = globalScene.gameData.getSpeciesDexAttrProps(species, defaultDexAttr);
if (starterAttributes?.variant && !Number.isNaN(starterAttributes.variant)) { if (starterAttributes?.variant && !Number.isNaN(starterAttributes.variant)) {
if (props.shiny) { if (props.shiny) {
@ -3711,12 +3711,13 @@ export class StarterSelectUiHandler extends MessageUiHandler {
setSpeciesDetails(species: PokemonSpecies, options: SpeciesDetails = {}): void { setSpeciesDetails(species: PokemonSpecies, options: SpeciesDetails = {}): void {
let { shiny, formIndex, female, variant, abilityIndex, natureIndex, teraType } = options; let { shiny, formIndex, female, variant, abilityIndex, natureIndex, teraType } = options;
const { dexEntry, starterDataEntry } = this.getSpeciesData(species.speciesId);
const forSeen: boolean = options.forSeen ?? false; const forSeen: boolean = options.forSeen ?? false;
const oldProps = species ? globalScene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor) : null; const oldProps = species ? globalScene.gameData.getSpeciesDexAttrProps(species, this.dexAttrCursor) : null;
const oldAbilityIndex = const oldAbilityIndex =
this.abilityCursor > -1 ? this.abilityCursor : globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species); this.abilityCursor > -1 ? this.abilityCursor : globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
const oldNatureIndex = const oldNatureIndex =
this.natureCursor > -1 ? this.natureCursor : globalScene.gameData.getSpeciesDefaultNature(species); this.natureCursor > -1 ? this.natureCursor : globalScene.gameData.getSpeciesDefaultNature(species, dexEntry);
this.dexAttrCursor = 0n; this.dexAttrCursor = 0n;
this.abilityCursor = -1; this.abilityCursor = -1;
this.natureCursor = -1; this.natureCursor = -1;
@ -3786,14 +3787,13 @@ export class StarterSelectUiHandler extends MessageUiHandler {
this.speciesStarterMoves = []; this.speciesStarterMoves = [];
if (species) { if (species) {
const { dexEntry, starterDataEntry } = this.getSpeciesData(species.speciesId);
const caughtAttr = dexEntry.caughtAttr || BigInt(0); const caughtAttr = dexEntry.caughtAttr || BigInt(0);
const abilityAttr = starterDataEntry.abilityAttr; const abilityAttr = starterDataEntry.abilityAttr;
if (!caughtAttr) { if (!caughtAttr) {
const props = globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)); const props = globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId));
const defaultAbilityIndex = globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species); const defaultAbilityIndex = globalScene.gameData.getStarterSpeciesDefaultAbilityIndex(species);
const defaultNature = globalScene.gameData.getSpeciesDefaultNature(species); const defaultNature = globalScene.gameData.getSpeciesDefaultNature(species, dexEntry);
if (shiny === undefined || shiny !== props.shiny) { if (shiny === undefined || shiny !== props.shiny) {
shiny = props.shiny; shiny = props.shiny;