Skip to content

Commit

Permalink
bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
PyGaVS committed Jan 22, 2025
1 parent 1034edd commit 4ba36e0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/field/pokemon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -681,8 +681,8 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return this.getSpeciesForm(ignoreOverride, false).getSpriteKey(
this.getGender(ignoreOverride) === Gender.FEMALE,
this.formIndex,
this.battleData?.illusion.basePokemon!.shiny ?? this.shiny,
this.battleData?.illusion.basePokemon!.variant ?? this.variant
this.battleData?.illusion.basePokemon?.shiny ?? this.shiny,
this.battleData?.illusion.basePokemon?.variant ?? this.variant
);
}

Expand Down Expand Up @@ -1281,7 +1281,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {

isShiny(useIllusion: boolean = false): boolean {
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 {
return this.shiny || (this.isFusion(useIllusion) && this.fusionShiny);
}
Expand Down

0 comments on commit 4ba36e0

Please sign in to comment.