From 4b7a40b1a26b2108227e1e1b16a25ece74d7e1a3 Mon Sep 17 00:00:00 2001
From: Jon Studders <jonstudders1@gmail.com>
Date: Sat, 18 May 2024 13:26:05 +0100
Subject: [PATCH] Reverted changes, added biome text to line one and renamed
 wavecounttext to a more standard name.

---
 src/battle-scene.ts | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 111e5439b12..a29434d5044 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -156,7 +156,7 @@ export default class BattleScene extends SceneBase {
 	public money: integer;
 	public pokemonInfoContainer: PokemonInfoContainer;
 	private party: PlayerPokemon[];
-	private waveCountText: Phaser.GameObjects.Text;
+	private lineOneText: Phaser.GameObjects.Text;
 	private moneyText: Phaser.GameObjects.Text;
 	private scoreText: Phaser.GameObjects.Text;
 	private luckLabelText: Phaser.GameObjects.Text;
@@ -348,9 +348,9 @@ export default class BattleScene extends SceneBase {
 		this.candyBar.setup();
 		this.fieldUI.add(this.candyBar);
 
-		this.waveCountText = addTextObject(this, (this.game.canvas.width / 6) - 2, 0, startingWave.toString(), TextStyle.BATTLE_INFO);
-		this.waveCountText.setOrigin(1, 0);
-		this.fieldUI.add(this.waveCountText);
+		this.lineOneText = addTextObject(this, (this.game.canvas.width / 6) - 2, 0, startingWave.toString(), TextStyle.BATTLE_INFO);
+		this.lineOneText.setOrigin(1, 0);
+		this.fieldUI.add(this.lineOneText);
 
 		this.moneyText = addTextObject(this, (this.game.canvas.width / 6) - 2, 0, '', TextStyle.MONEY);
 		this.moneyText.setOrigin(1, 0);
@@ -467,7 +467,7 @@ export default class BattleScene extends SceneBase {
 			}
 		});
 
-		this.updateWaveCountText();
+		this.updateLineOneText();
 		this.updateMoneyText();
 		this.updateScoreText();
 	}
@@ -758,8 +758,8 @@ export default class BattleScene extends SceneBase {
 			
 		this.currentBattle = null;
 
-		this.waveCountText.setText(startingWave.toString());
-		this.waveCountText.setVisible(false);
+		this.lineOneText.setText(startingWave.toString());
+		this.lineOneText.setVisible(false);
 
 		this.updateMoneyText();
 		this.moneyText.setVisible(false);
@@ -1183,12 +1183,13 @@ export default class BattleScene extends SceneBase {
 		});
 	}
 
-	updateWaveCountText(): void {
+	updateLineOneText(): void {
 		const isBoss = !(this.currentBattle.waveIndex % 10);
-		this.waveCountText.setText(this.currentBattle.waveIndex.toString());
-		this.waveCountText.setColor(!isBoss ? '#404040' : '#f89890');
-		this.waveCountText.setShadowColor(!isBoss ? '#ded6b5' : '#984038');
-		this.waveCountText.setVisible(true);
+		const biomeString: string = getBiomeName(this.arena.biomeType);
+		this.lineOneText.setText( this.currentBattle.waveIndex.toString() + " - " + biomeString);
+		this.lineOneText.setColor(!isBoss ? '#404040' : '#f89890');
+		this.lineOneText.setShadowColor(!isBoss ? '#ded6b5' : '#984038');
+		this.lineOneText.setVisible(true);
 	}
 
 	updateMoneyText(): void {
@@ -1235,8 +1236,8 @@ export default class BattleScene extends SceneBase {
 
 	updateUIPositions(): void {
 		const enemyModifierCount = this.enemyModifiers.filter(m => m.isIconVisible(this)).length;
-		this.waveCountText.setY(-(this.game.canvas.height / 6) + (enemyModifierCount ? enemyModifierCount <= 12 ? 15 : 24 : 0));
-		this.moneyText.setY(this.waveCountText.y + 10);
+		this.lineOneText.setY(-(this.game.canvas.height / 6) + (enemyModifierCount ? enemyModifierCount <= 12 ? 15 : 24 : 0));
+		this.moneyText.setY(this.lineOneText.y + 10);
 		this.scoreText.setY(this.moneyText.y + 10);
 		[ this.luckLabelText, this.luckText ].map(l => l.setY((this.scoreText.visible ? this.scoreText : this.moneyText).y + 10));
 		const offsetY = (this.scoreText.visible ? this.scoreText : this.moneyText).y + 15;