From c822a89878d40c05460d5f086ff77ad4c56268fc Mon Sep 17 00:00:00 2001 From: Matthew Olker Date: Thu, 30 May 2024 11:27:17 -0400 Subject: [PATCH] Fix money text hidden in select modifiers --- src/battle-scene.ts | 19 ++++++++++++++++++- src/ui/modifier-select-ui-handler.ts | 7 ++++++- src/utils.ts | 10 ++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 394c768d0c1..803313a023c 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -300,6 +300,7 @@ export default class BattleScene extends SceneBase { this.field = field; const fieldUI = this.add.container(0, this.game.canvas.height); + fieldUI.setName("container-field-ui"); fieldUI.setDepth(1); fieldUI.setScale(6); @@ -323,6 +324,7 @@ export default class BattleScene extends SceneBase { this.add.existing(transition); const uiContainer = this.add.container(0, 0); + uiContainer.setName("container-ui"); uiContainer.setDepth(2); uiContainer.setScale(6); @@ -331,6 +333,7 @@ export default class BattleScene extends SceneBase { const overlayWidth = this.game.canvas.width / 6; const overlayHeight = (this.game.canvas.height / 6) - 48; this.fieldOverlay = this.add.rectangle(0, overlayHeight * -1 - 48, overlayWidth, overlayHeight, 0x424242); + this.fieldOverlay.setName("rect-field-overlay"); this.fieldOverlay.setOrigin(0, 0); this.fieldOverlay.setAlpha(0); this.fieldUI.add(this.fieldOverlay); @@ -339,57 +342,70 @@ export default class BattleScene extends SceneBase { this.enemyModifiers = []; this.modifierBar = new ModifierBar(this); + this.modifierBar.setName("container-modifier-bar"); this.add.existing(this.modifierBar); uiContainer.add(this.modifierBar); this.enemyModifierBar = new ModifierBar(this, true); + this.enemyModifierBar.setName("container-enemy-modifier-bar"); this.add.existing(this.enemyModifierBar); uiContainer.add(this.enemyModifierBar); this.charSprite = new CharSprite(this); + this.charSprite.setName("sprite-char"); this.charSprite.setup(); this.fieldUI.add(this.charSprite); this.pbTray = new PokeballTray(this, true); + this.pbTray.setName("container-pb-tray"); this.pbTray.setup(); this.pbTrayEnemy = new PokeballTray(this, false); + this.pbTrayEnemy.setName("container-enemy-pb-tray"); this.pbTrayEnemy.setup(); this.fieldUI.add(this.pbTray); this.fieldUI.add(this.pbTrayEnemy); this.abilityBar = new AbilityBar(this); + this.abilityBar.setName("container-ability-bar"); this.abilityBar.setup(); this.fieldUI.add(this.abilityBar); this.partyExpBar = new PartyExpBar(this); + this.partyExpBar.setName("container-party-exp-bar"); this.partyExpBar.setup(); this.fieldUI.add(this.partyExpBar); this.candyBar = new CandyBar(this); + this.candyBar.setName("container-candy-bar"); this.candyBar.setup(); this.fieldUI.add(this.candyBar); this.biomeWaveText = addTextObject(this, (this.game.canvas.width / 6) - 2, 0, startingWave.toString(), TextStyle.BATTLE_INFO); + this.biomeWaveText.setName("text-biome-wave"); this.biomeWaveText.setOrigin(1, 0); this.fieldUI.add(this.biomeWaveText); this.moneyText = addTextObject(this, (this.game.canvas.width / 6) - 2, 0, "", TextStyle.MONEY); + this.moneyText.setName("text-money"); this.moneyText.setOrigin(1, 0); this.fieldUI.add(this.moneyText); this.scoreText = addTextObject(this, (this.game.canvas.width / 6) - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" }); + this.scoreText.setName("text-score"); this.scoreText.setOrigin(1, 0); this.fieldUI.add(this.scoreText); this.luckText = addTextObject(this, (this.game.canvas.width / 6) - 2, 0, "", TextStyle.PARTY, { fontSize: "54px" }); + this.luckText.setName("text-luck"); this.luckText.setOrigin(1, 0); this.luckText.setVisible(false); this.fieldUI.add(this.luckText); this.luckLabelText = addTextObject(this, (this.game.canvas.width / 6) - 2, 0, "Luck:", TextStyle.PARTY, { fontSize: "54px" }); + this.luckLabelText.setName("text-luck-label"); this.luckLabelText.setOrigin(1, 0); this.luckLabelText.setVisible(false); this.fieldUI.add(this.luckLabelText); @@ -1305,7 +1321,8 @@ export default class BattleScene extends SceneBase { this.scoreText.setVisible(this.gameMode.isDaily); } - updateAndShowLuckText(duration: integer): void { + updateAndShowText(duration: integer): void { + this.fieldUI.moveBelow(this.moneyText, this.luckText); const labels = [ this.luckLabelText, this.luckText ]; labels.map(t => { t.setAlpha(0); diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts index 99a8546b52a..f347979aaaf 100644 --- a/src/ui/modifier-select-ui-handler.ts +++ b/src/ui/modifier-select-ui-handler.ts @@ -41,22 +41,27 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { ui.add(this.modifierContainer); this.transferButtonContainer = this.scene.add.container((this.scene.game.canvas.width / 6) - 1, -64); + this.transferButtonContainer.setName("container-transfer-btn"); this.transferButtonContainer.setVisible(false); ui.add(this.transferButtonContainer); const transferButtonText = addTextObject(this.scene, -4, -2, "Transfer", TextStyle.PARTY); + transferButtonText.setName("text-transfer-btn"); transferButtonText.setOrigin(1, 0); this.transferButtonContainer.add(transferButtonText); this.rerollButtonContainer = this.scene.add.container(16, -64); + this.rerollButtonContainer.setName("container-reroll-brn"); this.rerollButtonContainer.setVisible(false); ui.add(this.rerollButtonContainer); const rerollButtonText = addTextObject(this.scene, -4, -2, "Reroll", TextStyle.PARTY); + rerollButtonText.setName("text-reroll-btn"); rerollButtonText.setOrigin(0, 0); this.rerollButtonContainer.add(rerollButtonText); this.rerollCostText = addTextObject(this.scene, 0, 0, "", TextStyle.MONEY); + this.rerollCostText.setName("text-reroll-cost"); this.rerollCostText.setOrigin(0, 0); this.rerollCostText.setPositionRelative(rerollButtonText, rerollButtonText.displayWidth + 5, 1); this.rerollButtonContainer.add(this.rerollCostText); @@ -141,7 +146,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler { const maxUpgradeCount = typeOptions.map(to => to.upgradeCount).reduce((max, current) => Math.max(current, max), 0); this.scene.showFieldOverlay(750); - this.scene.updateAndShowLuckText(750); + this.scene.updateAndShowText(750); let i = 0; diff --git a/src/utils.ts b/src/utils.ts index cfdbfc2a942..14161908fd0 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -412,3 +412,13 @@ export function verifyLang(lang?: string): boolean { return false; } } + +/** + * Prints the type and name of all game objects in a container for debuggin purposes + * @param container container with game objects inside it + */ +export function printContainerList(container: Phaser.GameObjects.Container): void { + console.log(container.list.map(go => { + return {type: go.type, name: go.name}; + })); +}