diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 340831d1b9b..8e25c951af4 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -812,16 +812,16 @@ export default class BattleScene extends SceneBase { } public getPlayerParty(fakeShininess: boolean = true): PlayerPokemon[] { - const party = this.party - if(!fakeShininess){ - party.map(pokemon => { - pokemon.shiny = pokemon.isShiny() - pokemon.variant = pokemon.getVariant() - pokemon.name = pokemon.getNameToRender() - if(pokemon.isFusion()){ - pokemon.fusionVariant = pokemon.battleData?.illusion.basePokemon!.fusionVariant ?? pokemon.fusionVariant; - pokemon.fusionShiny = pokemon.battleData?.illusion.basePokemon!.fusionShiny ?? pokemon.fusionShiny; - } + const party = this.party; + if (!fakeShininess) { + party.map(pokemon => { + pokemon.shiny = pokemon.isShiny(); + pokemon.variant = pokemon.getVariant(); + pokemon.name = pokemon.getNameToRender(); + if (pokemon.isFusion()) { + pokemon.fusionVariant = pokemon.battleData?.illusion.basePokemon!.fusionVariant ?? pokemon.fusionVariant; + pokemon.fusionShiny = pokemon.battleData?.illusion.basePokemon!.fusionShiny ?? pokemon.fusionShiny; + } }); } return party; diff --git a/src/data/ability.ts b/src/data/ability.ts index c2db17a6a0d..fc4495fe719 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -4778,7 +4778,7 @@ export class IllusionPostBattleAbAttr extends PostBattleAbAttr { * @returns {boolean} - Whether the illusion was applied. */ applyPostBattle(pokemon: Pokemon, passive: boolean, simulated:boolean, args: any[]): boolean { - console.log("POSTBATTLE") + console.log("POSTBATTLE"); pokemon.breakIllusion(); pokemon.battleData.illusion.available = true; return true; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index b09e647b9c5..6b707a9757b 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -455,7 +455,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { fusionGender: lastPokemon.fusionGender }; - console.log("GENERATE ILLUSION ", this.battleData.illusion.basePokemon!.name) + console.log("GENERATE ILLUSION ", this.battleData.illusion.basePokemon!.name); this.name = lastPokemon.name; this.nickname = lastPokemon.nickname; @@ -509,7 +509,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.shiny) { this.initShinySparkle(); } - if(!toSave){ + if (!toSave) { this.loadAssets(false).then(() => this.playAnim()); this.updateInfo(true); } @@ -3966,12 +3966,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } resetBattleData(): void { - console.log("RESETBATTLEDATA : ", this.getNameToRender(false)) + console.log("RESETBATTLEDATA : ", this.getNameToRender(false)); const illusionActive: boolean = this.battleData?.illusion.active; this.breakIllusion(); this.battleData = new PokemonBattleData(); - if(illusionActive){ - this.generateIllusion() + if (illusionActive) { + this.generateIllusion(); } } diff --git a/src/phases/encounter-phase.ts b/src/phases/encounter-phase.ts index d0d6c1d92ad..c00c0fc35f5 100644 --- a/src/phases/encounter-phase.ts +++ b/src/phases/encounter-phase.ts @@ -11,7 +11,7 @@ import { TrainerSlot } from "#app/data/trainer-config"; import { getRandomWeatherType } from "#app/data/weather"; import { EncounterPhaseEvent } from "#app/events/battle-scene"; import type Pokemon from "#app/field/pokemon"; -import { FieldPosition, PlayerPokemon } from "#app/field/pokemon"; +import { FieldPosition } from "#app/field/pokemon"; import { getPokemonNameWithAffix } from "#app/messages"; import { BoostBugSpawnModifier, IvScannerModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier"; import { ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type"; @@ -203,7 +203,7 @@ export class EncounterPhase extends BattlePhase { } if (e < (battle.double ? 2 : 1)) { if (battle.battleType === BattleType.WILD) { - for(const pokemon of globalScene.getPlayerField()){ + for (const pokemon of globalScene.getPlayerField()) { applyPreSummonAbAttrs(PreSummonAbAttr, pokemon, []); } applyPreSummonAbAttrs(PreSummonAbAttr, enemyPokemon, []);