From 3baaffd0578e3ac55119479163c0b60223edcd2d Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Tue, 22 Apr 2025 21:40:43 -0500 Subject: [PATCH] Move player and enemy battle info to their own files --- src/field/pokemon.ts | 4 +++- src/ui/battle-info/battle-info.ts | 14 -------------- src/ui/battle-info/enemy-battle-info.ts | 9 +++++++++ src/ui/battle-info/player-battle-info.ts | 8 ++++++++ 4 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 src/ui/battle-info/enemy-battle-info.ts create mode 100644 src/ui/battle-info/player-battle-info.ts diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 1ef2a2f9be3..08ad0f22caf 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -5,7 +5,9 @@ import { globalScene } from "#app/global-scene"; import type { Variant } from "#app/sprites/variant"; import { populateVariantColors, variantColorCache } from "#app/sprites/variant"; import { variantData } from "#app/sprites/variant"; -import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from "#app/ui/battle-info/battle-info"; +import BattleInfo from "#app/ui/battle-info/battle-info"; +import { EnemyBattleInfo } from "#app/ui/battle-info/enemy-battle-info"; +import { PlayerBattleInfo } from "#app/ui/battle-info/player-battle-info"; import type Move from "#app/data/moves/move"; import { HighCritAttr, diff --git a/src/ui/battle-info/battle-info.ts b/src/ui/battle-info/battle-info.ts index 5ced567f255..2875e8c38e6 100644 --- a/src/ui/battle-info/battle-info.ts +++ b/src/ui/battle-info/battle-info.ts @@ -970,17 +970,3 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.y = this.baseY; } } - -export class PlayerBattleInfo extends BattleInfo { - constructor() { - super(Math.floor(globalScene.game.canvas.width / 6) - 10, -72, true); - } -} - -export class EnemyBattleInfo extends BattleInfo { - constructor() { - super(140, -141, false); - } - - setMini(_mini: boolean): void {} // Always mini -} diff --git a/src/ui/battle-info/enemy-battle-info.ts b/src/ui/battle-info/enemy-battle-info.ts new file mode 100644 index 00000000000..3b5ef30b54f --- /dev/null +++ b/src/ui/battle-info/enemy-battle-info.ts @@ -0,0 +1,9 @@ +import BattleInfo from "./battle-info"; + +export class EnemyBattleInfo extends BattleInfo { + constructor() { + super(140, -141, false); + } + + setMini(_mini: boolean): void {} // Always mini +} diff --git a/src/ui/battle-info/player-battle-info.ts b/src/ui/battle-info/player-battle-info.ts new file mode 100644 index 00000000000..7c1db48217f --- /dev/null +++ b/src/ui/battle-info/player-battle-info.ts @@ -0,0 +1,8 @@ +import { globalScene } from "#app/global-scene"; +import BattleInfo from "./battle-info"; + +export class PlayerBattleInfo extends BattleInfo { + constructor() { + super(Math.floor(globalScene.game.canvas.width / 6) - 10, -72, true); + } +}