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

Wild Pokémon cannot be shiny if in end and uncatchable

Browse Source
This commit is contained in:
Wlowscha 2025-03-26 01:41:28 +01:00
parent f78015d757
commit 8b8a92e017
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/phases/encounter-phase.ts
View File

@ -39,6 +39,7 @@ import { overrideHeldItems, overrideModifiers } from "#app/modifier/modifier";
import i18next from "i18next"; import i18next from "i18next";
import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters"; import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters";
import { getNatureName } from "#app/data/nature"; import { getNatureName } from "#app/data/nature";
import { speciesStarterCosts } from "#app/data/balance/starters";
export class EncounterPhase extends BattlePhase { export class EncounterPhase extends BattlePhase {
private loaded: boolean; private loaded: boolean;
@ -125,11 +126,25 @@ export class EncounterPhase extends BattlePhase {
) { ) {
enemySpecies = getGoldenBugNetSpecies(level); enemySpecies = getGoldenBugNetSpecies(level);
} }
let isCatchable = true;
if (globalScene.arena.biomeType === Biome.END) {
const canCatch =
globalScene.gameData.dexData[enemySpecies.speciesId].caughtAttr ||
(enemySpecies.speciesId === Species.ETERNATUS &&
globalScene.gameData.getStarterCount(d => !!d.caughtAttr) >=
Object.keys(speciesStarterCosts).length - 1);
if (!globalScene.gameMode.isClassic || globalScene.gameMode.isFreshStartChallenge() || !canCatch) {
isCatchable = false;
}
}
battle.enemyParty[e] = globalScene.addEnemyPokemon( battle.enemyParty[e] = globalScene.addEnemyPokemon(
enemySpecies, enemySpecies,
level, level,
TrainerSlot.NONE, TrainerSlot.NONE,
!!globalScene.getEncounterBossSegments(battle.waveIndex, level, enemySpecies), !!globalScene.getEncounterBossSegments(battle.waveIndex, level, enemySpecies),
!isCatchable, // shiny locking if the mon is uncatchable
); );
if (globalScene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) { if (globalScene.currentBattle.battleSpec === BattleSpec.FINAL_BOSS) {
battle.enemyParty[e].ivs = new Array(6).fill(31); battle.enemyParty[e].ivs = new Array(6).fill(31);