From fe732bbbe601bf41a75eef24607ae20b53f14376 Mon Sep 17 00:00:00 2001 From: Frede Date: Wed, 5 Jun 2024 16:09:06 +0200 Subject: [PATCH] [QoL] Pokemon Info Container hides Enemy Modifier Bar (#1820) * Added "Skip Dialogues" option (if at least 1 classic win) * Removed error sound and hide option instead when classic wins = 0 * Add skip dialogues option to Unlockables and show unlocked message on first classic win * Only skips seen dialogues, removed dialogue option from unlockables, seen dialogues get saved to local storage * oops * dont show charSprite when skipping a dialogue, small fixes * pokemonInfoContainer always on top of battle UI when shown * removed setDepth and rather hide enemyModifierBar --------- Co-authored-by: Frederik Hobein --- src/battle-scene.ts | 8 ++++++++ src/ui/pokemon-info-container.ts | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 957052d9881..f1ccbbc17ec 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1313,6 +1313,14 @@ export default class BattleScene extends SceneBase { }); } + showEnemyModifierBar(): void { + this.enemyModifierBar.setVisible(true); + } + + hideEnemyModifierBar(): void { + this.enemyModifierBar.setVisible(false); + } + updateBiomeWaveText(): void { const isBoss = !(this.currentBattle.waveIndex % 10); const biomeString: string = getBiomeName(this.arena.biomeType); diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts index 41992b42212..1ffa32d2394 100644 --- a/src/ui/pokemon-info-container.ts +++ b/src/ui/pokemon-info-container.ts @@ -262,6 +262,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.setVisible(true); this.shown = true; + this.scene.hideEnemyModifierBar(); }); } @@ -282,6 +283,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { hide(speedMultiplier: number = 1): Promise { return new Promise(resolve => { if (!this.shown) { + this.scene.showEnemyModifierBar(); return resolve(); } @@ -302,6 +304,7 @@ export default class PokemonInfoContainer extends Phaser.GameObjects.Container { this.pokemonShinyIcon.off("pointerover"); this.pokemonShinyIcon.off("pointerout"); (this.scene as BattleScene).ui.hideTooltip(); + this.scene.showEnemyModifierBar(); resolve(); } });