mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-16 21:32:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reverted changes, added biome text to line one and renamed wavecounttext to a more standard name.

Browse Source
This commit is contained in:
Jon Studders 2024-05-18 13:26:05 +01:00
parent 254ef71eb7
commit 4b7a40b1a2
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/battle-scene.ts
View File

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