From 1b22cafee3949d0ccd243ea7dbf95b880a7ed63b Mon Sep 17 00:00:00 2001 From: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:31:20 -0400 Subject: [PATCH] Undo all changes --- src/battle-scene.ts | 10 ------ src/ui/trainer-team-bar.ts | 72 -------------------------------------- 2 files changed, 82 deletions(-) delete mode 100644 src/ui/trainer-team-bar.ts diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 4b517dc4d88..ba0720baab2 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -54,7 +54,6 @@ import {InputsController} from "./inputs-controller"; import {UiInputs} from "./ui-inputs"; import { NewArenaEvent } from "./events/battle-scene"; import ArenaFlyout from "./ui/arena-flyout"; -import TeamBar from "./ui/trainer-team-bar"; import { EaseType } from "#enums/ease-type"; import { Abilities } from "#enums/abilities"; import { BattleSpec } from "#enums/battle-spec"; @@ -221,7 +220,6 @@ export default class BattleScene extends SceneBase { private modifierBar: ModifierBar; private enemyModifierBar: ModifierBar; public arenaFlyout: ArenaFlyout; - public trainerBar: TeamBar; private fieldOverlay: Phaser.GameObjects.Rectangle; private shopOverlay: Phaser.GameObjects.Rectangle; @@ -472,9 +470,6 @@ export default class BattleScene extends SceneBase { this.luckLabelText.setVisible(false); this.fieldUI.add(this.luckLabelText); - this.trainerBar = new TeamBar(this); - this.fieldUI.add(this.trainerBar); - this.fieldUI.moveBelow(this.trainerBar, this.fieldOverlay); this.arenaFlyout = new ArenaFlyout(this); this.fieldUI.add(this.arenaFlyout); this.fieldUI.moveBelow(this.arenaFlyout, this.fieldOverlay); @@ -1400,11 +1395,6 @@ export default class BattleScene extends SceneBase { this.fieldUI.moveBelow(gameObject, this.fieldOverlay); } processInfoButton(pressed: boolean): void { - if (pressed) { - this.trainerBar.tempToggleFlyout(false) - } else { - this.trainerBar.revertFlyout() - } this.arenaFlyout.toggleFlyout(pressed); } diff --git a/src/ui/trainer-team-bar.ts b/src/ui/trainer-team-bar.ts deleted file mode 100644 index 4407b4557a1..00000000000 --- a/src/ui/trainer-team-bar.ts +++ /dev/null @@ -1,72 +0,0 @@ -import BattleScene from "../battle-scene"; -import {addTextObject, TextStyle} from "./text"; -import i18next from "i18next"; -import * as Utils from "#app/utils"; -import { EnemyPokemon } from "#app/field/pokemon.js"; - -export default class TeamBar extends Phaser.GameObjects.Container { - // Public vars - public party: EnemyPokemon[]; - public gamescene: BattleScene; - - // Private vars - private bg: Phaser.GameObjects.NineSlice; - private teamIcons: Array = []; - private tween: Phaser.Tweens.Tween; - private components: any[] = []; - private shown: boolean = false; - private overridden: boolean = false; - - // Constructor - constructor(scene: Phaser.Scene) { - super(scene, -200, -107); - this.gamescene = scene as BattleScene; - this.components = [this] - this.bg = this.scene.add.nineslice(-5, -5, "ability_bar_left", null, 200, 70, 10, 10); - this.bg.setOrigin(0, 0); - this.add(this.bg); - } - - /* - Show or hide the BGM bar. - @param {boolean} visible Whether to show or hide the BGM bar. - */ - public toggleFlyout(visible: boolean): void { - //console.log("Update team bar", visible) - if (this.overridden) return; // Don't toggle the state if it has been overridden - this.shown = visible - this.scene.tweens.add({ - targets: this, - x: visible ? -100 : -200, - duration: 500, - ease: "Sine.easeInOut", - onUpdate: () => { - } - }); - } - public tempToggleFlyout(visible: boolean): void { - this.overridden = true - //console.log("Update team bar", visible) - this.scene.tweens.add({ - targets: this, - x: visible ? -100 : -200, - duration: 500, - ease: "Sine.easeInOut", - onUpdate: () => { - } - }); - } - public revertFlyout(): void { - var visible = this.shown - this.overridden = false - //console.log("Update team bar", visible) - this.scene.tweens.add({ - targets: this, - x: visible ? -100 : -200, - duration: 500, - ease: "Sine.easeInOut", - onUpdate: () => { - } - }); - } -} \ No newline at end of file