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

bugfix

Browse Source
This commit is contained in:
Lylian 2025-01-22 16:51:26 +01:00
parent 1034eddfed
commit 4ba36e0a78
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/field/pokemon.ts
View File

@ -681,8 +681,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return this.getSpeciesForm(ignoreOverride, false).getSpriteKey( return this.getSpeciesForm(ignoreOverride, false).getSpriteKey(
this.getGender(ignoreOverride) === Gender.FEMALE, this.getGender(ignoreOverride) === Gender.FEMALE,
this.formIndex, this.formIndex,
this.battleData?.illusion.basePokemon!.shiny ?? this.shiny, this.battleData?.illusion.basePokemon?.shiny ?? this.shiny,
this.battleData?.illusion.basePokemon!.variant ?? this.variant this.battleData?.illusion.basePokemon?.variant ?? this.variant
); );
} }
@ -1281,7 +1281,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
isShiny(useIllusion: boolean = false): boolean { isShiny(useIllusion: boolean = false): boolean {
if (!useIllusion && this.battleData?.illusion.active) { if (!useIllusion && this.battleData?.illusion.active) {
return this.battleData?.illusion.basePokemon!.shiny || (!!this.battleData?.illusion.fusionSpecies && this.battleData?.illusion.basePokemon!.fusionShiny) || false; return this.battleData?.illusion.basePokemon?.shiny || (!!this.battleData?.illusion.fusionSpecies && this.battleData?.illusion.basePokemon?.fusionShiny) || false;
} else { } else {
return this.shiny || (this.isFusion(useIllusion) && this.fusionShiny); return this.shiny || (this.isFusion(useIllusion) && this.fusionShiny);
} }