From 13922aac5153d07f7218170b0c6af9ef4d4f6f36 Mon Sep 17 00:00:00 2001 From: William Burleson <72857839+Admiral-Billy@users.noreply.github.com> Date: Sun, 19 May 2024 20:45:34 -0400 Subject: [PATCH] Reformat variable --- src/overrides.ts | 9 ++++++--- src/ui/title-ui-handler.ts | 10 +++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/overrides.ts b/src/overrides.ts index d5319cbbeb3..57f006a76d3 100644 --- a/src/overrides.ts +++ b/src/overrides.ts @@ -12,10 +12,13 @@ import { Stat } from './data/pokemon-stat'; import { PokeballCounts } from './battle-scene'; import { PokeballType } from './data/pokeball'; +export const MENU_MESSAGE: { active: boolean, text: string, textColor: string, backgroundColor: string } = { + active: true, + text: "Shiny event active!", + textColor: "#FFD700", + backgroundColor: "#FAFAD2" +} -export const MENU_MESSAGE: string = ""; -export const MENU_MESSAGE_TEXT_COLOR: string = ""; -export const MENU_MESSAGE_BACKGROUND_COLOR: string = ""; /** * Overrides for testing different in game situations * if an override name starts with "STARTING", it will apply when a new run begins diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts index b28e028da55..d96019c2c82 100644 --- a/src/ui/title-ui-handler.ts +++ b/src/ui/title-ui-handler.ts @@ -6,7 +6,7 @@ import * as Utils from "../utils"; import { TextStyle, addTextObject } from "./text"; import { getBattleCountSplashMessage, getSplashMessages } from "../data/splash-messages"; import i18next from "i18next"; -import { MENU_MESSAGE, MENU_MESSAGE_TEXT_COLOR, MENU_MESSAGE_BACKGROUND_COLOR } from "../overrides"; +import * as Overrides from '../overrides'; export default class TitleUiHandler extends OptionSelectUiHandler { private titleContainer: Phaser.GameObjects.Container; @@ -43,11 +43,11 @@ export default class TitleUiHandler extends OptionSelectUiHandler { this.playerCountLabel.setOrigin(1, 0); this.titleContainer.add(this.playerCountLabel); - if (MENU_MESSAGE !== "") { - this.menuMessage = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - 100, MENU_MESSAGE, TextStyle.MESSAGE, { + if (Overrides.MENU_MESSAGE.active) { + this.menuMessage = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - 100, Overrides.MENU_MESSAGE.text, TextStyle.MESSAGE, { fontSize: '54px', - backgroundColor: MENU_MESSAGE_BACKGROUND_COLOR, - color: MENU_MESSAGE_TEXT_COLOR !== "" ? MENU_MESSAGE_TEXT_COLOR : "#FFFFFF" + backgroundColor: Overrides.MENU_MESSAGE.backgroundColor, + color: Overrides.MENU_MESSAGE.textColor !== "" ? Overrides.MENU_MESSAGE.textColor : "#FFFFFF" }); this.menuMessage.setOrigin(1, 0); this.titleContainer.add(this.menuMessage);