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

Don't increment seen shiny count for trainers

pull/239/head
Flashfyre 2024-04-22 11:28:13 -04:00
parent 184a028e66
commit 26b1bb5f03
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phases.ts
View File

@ -702,7 +702,7 @@ export class EncounterPhase extends BattlePhase {
} }
if (!this.loaded) if (!this.loaded)
this.scene.gameData.setPokemonSeen(enemyPokemon); this.scene.gameData.setPokemonSeen(enemyPokemon, true, battle.battleType === BattleType.TRAINER);
if (enemyPokemon.species.speciesId === Species.ETERNATUS) { if (enemyPokemon.species.speciesId === Species.ETERNATUS) {
if (this.scene.gameMode.isClassic && (battle.battleSpec === BattleSpec.FINAL_BOSS || this.scene.gameMode.isWaveFinal(battle.waveIndex))) { if (this.scene.gameMode.isClassic && (battle.battleSpec === BattleSpec.FINAL_BOSS || this.scene.gameMode.isWaveFinal(battle.waveIndex))) {

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

@ -993,13 +993,13 @@ export class GameData {
this.starterData = starterData; this.starterData = starterData;
} }
setPokemonSeen(pokemon: Pokemon, incrementCount: boolean = true): void { setPokemonSeen(pokemon: Pokemon, incrementCount: boolean = true, trainer: boolean = false): void {
const dexEntry = this.dexData[pokemon.species.speciesId]; const dexEntry = this.dexData[pokemon.species.speciesId];
dexEntry.seenAttr |= pokemon.getDexAttr(); dexEntry.seenAttr |= pokemon.getDexAttr();
if (incrementCount) { if (incrementCount) {
dexEntry.seenCount++; dexEntry.seenCount++;
this.gameStats.pokemonSeen++; this.gameStats.pokemonSeen++;
if (pokemon.isShiny()) if (!trainer && pokemon.isShiny())
this.gameStats.shinyPokemonSeen++; this.gameStats.shinyPokemonSeen++;
} }
} }