From 63a66557591c6f1c26b5f640eea9bf1f809ab437 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Wed, 27 Mar 2024 23:44:11 -0400 Subject: [PATCH] Fix Transform and Imposter causing crash --- src/data/ability.ts | 2 +- src/data/move.ts | 2 +- src/field/pokemon.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index f7dbf645e..fe587d65b 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -762,7 +762,7 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr { pokemon.scene.playSound('PRSFX- Transform'); - pokemon.loadAssets().then(() => pokemon.playAnim()); + pokemon.loadAssets(false).then(() => pokemon.playAnim()); pokemon.scene.queueMessage(getPokemonMessage(pokemon, ` transformed\ninto ${target.name}!`)); diff --git a/src/data/move.ts b/src/data/move.ts index 501da12f2..b73cccc89 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2480,7 +2480,7 @@ export class TransformAttr extends MoveEffectAttr { user.scene.queueMessage(getPokemonMessage(user, ` transformed\ninto ${target.name}!`)); - user.loadAssets().then(() => { + user.loadAssets(false).then(() => { user.playAnim(); resolve(true); }); diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 6c4e34ffa..ce606b97f 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -275,7 +275,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { abstract getBattlerIndex(): BattlerIndex; - loadAssets(): Promise { + loadAssets(ignoreOveride: boolean = true): Promise { return new Promise(resolve => { const moveIds = this.getMoveset().map(m => m.getMove().id); Promise.allSettled(moveIds.map(m => initMoveAnim(m))) @@ -283,10 +283,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { loadMoveAnimAssets(this.scene, moveIds); this.getSpeciesForm().loadAssets(this.scene, this.getGender() === Gender.FEMALE, this.formIndex, this.shiny); if (this.isPlayer() || this.getFusionSpeciesForm()) - this.scene.loadPokemonAtlas(this.getBattleSpriteKey(true, true), this.getBattleSpriteAtlasPath(true, true)); + this.scene.loadPokemonAtlas(this.getBattleSpriteKey(true, ignoreOveride), this.getBattleSpriteAtlasPath(true, ignoreOveride)); if (this.getFusionSpeciesForm()) { this.getFusionSpeciesForm().loadAssets(this.scene, this.getFusionGender() === Gender.FEMALE, this.fusionFormIndex, this.fusionShiny); - this.scene.loadPokemonAtlas(this.getFusionBattleSpriteKey(true, true), this.getFusionBattleSpriteAtlasPath(true, true)); + this.scene.loadPokemonAtlas(this.getFusionBattleSpriteKey(true, ignoreOveride), this.getFusionBattleSpriteAtlasPath(true, ignoreOveride)); } this.scene.load.once(Phaser.Loader.Events.COMPLETE, () => { if (this.isPlayer()) {