Show battle info for both in double battles

src/battle-phases.ts

@@ -210,8 +210,9 @@ export class EncounterPhase extends BattlePhase {
     Promise.all(loadEnemyAssets).then(() => {
       battle.enemyField.forEach((enemyPokemon, e) => {
         this.scene.field.add(enemyPokemon);
-        if (this.scene.getPlayerPokemon().visible)
+        const playerPokemon = this.scene.getPlayerPokemon();
-          this.scene.field.moveBelow(enemyPokemon, this.scene.getPlayerPokemon());
+        if (playerPokemon.visible)
+          this.scene.field.moveBelow(enemyPokemon, playerPokemon);
         enemyPokemon.tint(0, 0.5);
         if (battle.enemyField.length > 1)
           enemyPokemon.setFieldPosition(e ? FieldPosition.RIGHT : FieldPosition.LEFT);

src/battle-scene.ts

@@ -156,7 +156,8 @@ export default class BattleScene extends Phaser.Scene {
 		this.loadAtlas('prompt', 'ui');
 		this.loadImage('cursor', 'ui');
 		this.loadImage('pbinfo_player', 'ui');
-		this.loadImage('pbinfo_enemy', 'ui');
+		this.loadImage('pbinfo_player_mini', 'ui');
+		this.loadImage('pbinfo_enemy_mini', 'ui');
 		this.loadImage('overlay_lv', 'ui');
 		this.loadAtlas('numbers', 'ui');
 		this.loadAtlas('overlay_hp', 'ui');

src/pokemon.ts

@@ -149,7 +149,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
     this.fieldPosition = FieldPosition.CENTER;
 
-    scene.fieldUI.addAt(this.battleInfo, 0);
+    scene.fieldUI.add(this.battleInfo);
     
     this.battleInfo.initInfo(this);
 
@@ -300,6 +300,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
 
       this.fieldPosition = fieldPosition;
 
+      this.battleInfo.setMini(fieldPosition !== FieldPosition.CENTER);
+      this.battleInfo.setOffset(fieldPosition === FieldPosition.RIGHT);
+
       const newOffset = this.getFieldPositionOffset();
 
       let relX = newOffset[0] - initialOffset[0];

src/ui/battle-info.ts

@@ -4,10 +4,12 @@ import * as Utils from '../utils';
 import { addTextObject, TextStyle } from './text';
 import { getGenderSymbol, getGenderColor } from '../data/gender';
 import { StatusEffect } from '../data/status-effect';
-import BattleScene, { maxExpLevel } from '../battle-scene';
+import { maxExpLevel } from '../battle-scene';
 
 export default class BattleInfo extends Phaser.GameObjects.Container {
   private player: boolean;
+  private mini: boolean;
+  private offset: boolean;
   private lastName: string;
   private lastStatus: StatusEffect;
   private lastHp: integer;
@@ -17,9 +19,10 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
   private lastLevelExp: integer;
   private lastLevel: integer;
 
+  private box: Phaser.GameObjects.Sprite;
   private nameText: Phaser.GameObjects.Text;
   private genderText: Phaser.GameObjects.Text;
-  private ownedIcon: Phaser.GameObjects.Image;
+  private ownedIcon: Phaser.GameObjects.Sprite;
   private statusIndicator: Phaser.GameObjects.Sprite;
   private levelContainer: Phaser.GameObjects.Container;
   private hpBar: Phaser.GameObjects.Image;
@@ -30,6 +33,8 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
   constructor(scene: Phaser.Scene, x: number, y: number, player: boolean) {
     super(scene, x, y);
     this.player = player;
+    this.mini = !player;
+    this.offset = false;
     this.lastName = null;
     this.lastStatus = StatusEffect.NONE;
     this.lastHp = -1;
@@ -42,9 +47,9 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     // Initially invisible and shown via Pokemon.showInfo
     this.setVisible(false);
 
-    const box = this.scene.add.image(0, 0, `pbinfo_${player ? 'player' : 'enemy'}`);
+    this.box = this.scene.add.sprite(0, 0, this.getTextureName());
-    box.setOrigin(1, 0.5);
+    this.box.setOrigin(1, 0.5);
-    this.add(box);
+    this.add(this.box);
 
     this.nameText = addTextObject(this.scene, player ? -115 : -124, player ? -15.2 : -11.2, '', TextStyle.BATTLE_INFO);
     this.nameText.setOrigin(0, 0);
@@ -56,7 +61,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     this.add(this.genderText);
 
     if (!this.player) {
-      this.ownedIcon = this.scene.add.image(0, 0, 'icon_owned');
+      this.ownedIcon = this.scene.add.sprite(0, 0, 'icon_owned');
       this.ownedIcon.setVisible(false);
       this.ownedIcon.setOrigin(0, 0);
       this.ownedIcon.setPositionRelative(this.nameText, 0, 11.5);
@@ -131,6 +136,36 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
     }
   }
 
+  getTextureName(): string {
+    return `pbinfo_${this.player ? 'player' : 'enemy'}${this.mini ? '_mini' : ''}`;
+  }
+
+  setMini(mini: boolean): void {
+    if (this.mini === mini)
+      return;
+
+    this.mini = mini;
+
+    this.box.setTexture(this.getTextureName());
+
+    if (this.player) {
+      this.y -= 12 * (mini ? 1 : -1);
+    }
+
+    const toggledElements = [ this.hpNumbersContainer, this.expBar ];
+    toggledElements.forEach(el => el.setVisible(!mini));
+  }
+  
+  setOffset(offset: boolean): void {
+    if (this.offset === offset)
+      return;
+    
+    this.offset = offset;
+
+    this.x += 10 * (offset === this.player ? 1 : -1);
+    this.y += 27 * (offset ? 1 : -1);
+  }
+
   updateInfo(pokemon: Pokemon, instant?: boolean): Promise<void> {
     return new Promise(resolve => {
       if (!this.scene) {
@@ -290,4 +325,6 @@ export class EnemyBattleInfo extends BattleInfo {
   constructor(scene: Phaser.Scene) {
     super(scene, 140, -141, false);
   }
+
+  setMini(mini: boolean): void { } // Always mini
 }