diff --git a/src/@types/ui.ts b/src/@types/ui.ts new file mode 100644 index 00000000000..10dab01c616 --- /dev/null +++ b/src/@types/ui.ts @@ -0,0 +1,10 @@ +import type Phaser from "phaser"; +import type InputText from "phaser3-rex-plugins/plugins/gameobjects/dom/inputtext/InputText"; + +export interface TextStyleOptions { + scale: number; + styleOptions: Phaser.Types.GameObjects.Text.TextStyle | InputText.IConfig; + shadowColor: string; + shadowXpos: number; + shadowYpos: number; +} diff --git a/src/battle-scene.ts b/src/battle-scene.ts index b802466ee19..27037701ca8 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -51,7 +51,8 @@ import type { Phase } from "#app/phase"; import { initGameSpeed } from "#app/system/game-speed"; import { Arena, ArenaBase } from "#app/field/arena"; import { GameData } from "#app/system/game-data"; -import { addTextObject, getTextColor, TextStyle } from "#app/ui/text"; +import { addTextObject, getTextColor } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { allMoves } from "./data/data-lists"; import { MusicPreference } from "#app/system/settings/settings"; import { diff --git a/src/data/mystery-encounters/mystery-encounter-dialogue.ts b/src/data/mystery-encounters/mystery-encounter-dialogue.ts index 71e1b382f61..eb7e8735c11 100644 --- a/src/data/mystery-encounters/mystery-encounter-dialogue.ts +++ b/src/data/mystery-encounters/mystery-encounter-dialogue.ts @@ -1,4 +1,4 @@ -import type { TextStyle } from "#app/ui/text"; +import type { TextStyle } from "#enums/text-style"; export class TextDisplay { speaker?: string; diff --git a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts index e1055f57496..1a674956260 100644 --- a/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts +++ b/src/data/mystery-encounters/utils/encounter-dialogue-utils.ts @@ -1,5 +1,5 @@ import { globalScene } from "#app/global-scene"; -import type { TextStyle } from "#app/ui/text"; +import type { TextStyle } from "#enums/text-style"; import { getTextWithColors } from "#app/ui/text"; import { UiTheme } from "#enums/ui-theme"; import { isNullOrUndefined } from "#app/utils/common"; diff --git a/src/data/nature.ts b/src/data/nature.ts index 83b3ee7538d..2fb6d738330 100644 --- a/src/data/nature.ts +++ b/src/data/nature.ts @@ -1,5 +1,6 @@ import { toReadableString } from "#app/utils/common"; -import { TextStyle, getBBCodeFrag } from "../ui/text"; +import { getBBCodeFrag } from "../ui/text"; +import { TextStyle } from "#enums/text-style"; import { Nature } from "#enums/nature"; import { UiTheme } from "#enums/ui-theme"; import i18next from "i18next"; diff --git a/src/enums/text-style.ts b/src/enums/text-style.ts new file mode 100644 index 00000000000..330fc379cdc --- /dev/null +++ b/src/enums/text-style.ts @@ -0,0 +1,42 @@ +export const TextStyle = Object.freeze({ + MESSAGE: 1, + WINDOW: 2, + WINDOW_ALT: 3, + BATTLE_INFO: 4, + PARTY: 5, + PARTY_RED: 6, + SUMMARY: 7, + SUMMARY_ALT: 8, + SUMMARY_RED: 9, + SUMMARY_BLUE: 10, + SUMMARY_PINK: 11, + SUMMARY_GOLD: 12, + SUMMARY_GRAY: 13, + SUMMARY_GREEN: 14, + MONEY: 15, // Money default styling (pale yellow) + /** Money displayed in Windows (needs different colors based on theme) */ + MONEY_WINDOW: 16, + STATS_LABEL: 17, + STATS_VALUE: 18, + SETTINGS_VALUE: 19, + SETTINGS_LABEL: 20, + SETTINGS_SELECTED: 21, + SETTINGS_LOCKED: 22, + TOOLTIP_TITLE: 23, + TOOLTIP_CONTENT: 24, + MOVE_INFO_CONTENT: 25, + MOVE_PP_FULL: 26, + MOVE_PP_HALF_FULL: 27, + MOVE_PP_NEAR_EMPTY: 28, + MOVE_PP_EMPTY: 29, + SMALLER_WINDOW_ALT: 30, + BGM_BAR: 31, + PERFECT_IV: 32, + /** Default style for choices in ME */ + ME_OPTION_DEFAULT: 33, + /** Style for choices with special requirements in ME */ + ME_OPTION_SPECIAL: 34, + SHADOW_TEXT: 35 + +}) +export type TextStyle = typeof TextStyle[keyof typeof TextStyle]; \ No newline at end of file diff --git a/src/field/damage-number-handler.ts b/src/field/damage-number-handler.ts index b8b3ed76e18..a2eff336696 100644 --- a/src/field/damage-number-handler.ts +++ b/src/field/damage-number-handler.ts @@ -1,4 +1,5 @@ -import { TextStyle, addTextObject } from "../ui/text"; +import { addTextObject } from "../ui/text"; +import { TextStyle } from "#enums/text-style"; import type { DamageResult } from "./pokemon"; import type Pokemon from "./pokemon"; import { HitResult } from "#enums/hit-result"; diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 54b7323569a..70391eee513 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -13,7 +13,8 @@ import Overrides from "#app/overrides"; import { LearnMoveType } from "#enums/learn-move-type"; import type { VoucherType } from "#app/system/voucher"; import { Command } from "#enums/command"; -import { addTextObject, TextStyle } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { BooleanHolder, hslToHex, isNullOrUndefined, NumberHolder, randSeedFloat, toDmgValue } from "#app/utils/common"; import { BattlerTagType } from "#enums/battler-tag-type"; import { BerryType } from "#enums/berry-type"; diff --git a/src/phases/end-card-phase.ts b/src/phases/end-card-phase.ts index bb64969514f..40e195884f2 100644 --- a/src/phases/end-card-phase.ts +++ b/src/phases/end-card-phase.ts @@ -1,7 +1,8 @@ import { globalScene } from "#app/global-scene"; import { PlayerGender } from "#app/enums/player-gender"; import { Phase } from "#app/phase"; -import { addTextObject, TextStyle } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import i18next from "i18next"; export class EndCardPhase extends Phase { diff --git a/src/phases/scan-ivs-phase.ts b/src/phases/scan-ivs-phase.ts index d296d87ca88..2dfd523fb52 100644 --- a/src/phases/scan-ivs-phase.ts +++ b/src/phases/scan-ivs-phase.ts @@ -2,7 +2,8 @@ import { globalScene } from "#app/global-scene"; import type { BattlerIndex } from "#enums/battler-index"; import { PERMANENT_STATS, Stat } from "#app/enums/stat"; import { getPokemonNameWithAffix } from "#app/messages"; -import { getTextColor, TextStyle } from "#app/ui/text"; +import { getTextColor } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import i18next from "i18next"; import { PokemonPhase } from "./pokemon-phase"; diff --git a/src/timed-event-manager.ts b/src/timed-event-manager.ts index f73c6dab1b2..10834ff188b 100644 --- a/src/timed-event-manager.ts +++ b/src/timed-event-manager.ts @@ -1,5 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import type { nil } from "#app/utils/common"; import { isNullOrUndefined } from "#app/utils/common"; import i18next from "i18next"; diff --git a/src/ui/ability-bar.ts b/src/ui/ability-bar.ts index 5481791de64..759da8afa0e 100644 --- a/src/ui/ability-bar.ts +++ b/src/ui/ability-bar.ts @@ -1,5 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import i18next from "i18next"; const barWidth = 118; diff --git a/src/ui/abstact-option-select-ui-handler.ts b/src/ui/abstact-option-select-ui-handler.ts index e1263bc088c..c3e3601a419 100644 --- a/src/ui/abstact-option-select-ui-handler.ts +++ b/src/ui/abstact-option-select-ui-handler.ts @@ -1,5 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { TextStyle, addBBCodeTextObject, getTextColor, getTextStyleOptions } from "./text"; +import { addBBCodeTextObject, getTextColor, getTextStyleOptions } from "./text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import UiHandler from "./ui-handler"; import { addWindow } from "./ui-theme"; diff --git a/src/ui/achv-bar.ts b/src/ui/achv-bar.ts index 1e068157afa..9d5ed2b7db6 100644 --- a/src/ui/achv-bar.ts +++ b/src/ui/achv-bar.ts @@ -1,7 +1,8 @@ import { globalScene } from "#app/global-scene"; import { Achv, getAchievementDescription } from "../system/achv"; import { Voucher } from "../system/voucher"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import type { PlayerGender } from "#enums/player-gender"; export default class AchvBar extends Phaser.GameObjects.Container { diff --git a/src/ui/achvs-ui-handler.ts b/src/ui/achvs-ui-handler.ts index 8588530d370..6df3e27d2a8 100644 --- a/src/ui/achvs-ui-handler.ts +++ b/src/ui/achvs-ui-handler.ts @@ -5,7 +5,8 @@ import { achvs, getAchievementDescription } from "#app/system/achv"; import type { Voucher } from "#app/system/voucher"; import { getVoucherTypeIcon, getVoucherTypeName, vouchers } from "#app/system/voucher"; import MessageUiHandler from "#app/ui/message-ui-handler"; -import { addTextObject, TextStyle } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; import { addWindow } from "#app/ui/ui-theme"; import { ScrollBar } from "#app/ui/scroll-bar"; diff --git a/src/ui/admin-ui-handler.ts b/src/ui/admin-ui-handler.ts index c8c8e43802b..62f1be38481 100644 --- a/src/ui/admin-ui-handler.ts +++ b/src/ui/admin-ui-handler.ts @@ -4,7 +4,7 @@ import { formatText } from "#app/utils/common"; import type { InputFieldConfig } from "./form-modal-ui-handler"; import { FormModalUiHandler } from "./form-modal-ui-handler"; import type { ModalConfig } from "./modal-ui-handler"; -import { TextStyle } from "./text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { globalScene } from "#app/global-scene"; diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index fec02ffb660..acfe7924a55 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -1,4 +1,5 @@ -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { globalScene } from "#app/global-scene"; import { ArenaTrapTag } from "#app/data/arena-tag"; import { ArenaTagSide } from "#enums/arena-tag-side"; diff --git a/src/ui/ball-ui-handler.ts b/src/ui/ball-ui-handler.ts index 11fb485164a..98b22fedf43 100644 --- a/src/ui/ball-ui-handler.ts +++ b/src/ui/ball-ui-handler.ts @@ -1,5 +1,6 @@ import { getPokeballName } from "../data/pokeball"; -import { addTextObject, getTextStyleOptions, TextStyle } from "./text"; +import { addTextObject, getTextStyleOptions } from "./text"; +import { TextStyle } from "#enums/text-style"; import { Command } from "#enums/command"; import { UiMode } from "#enums/ui-mode"; import UiHandler from "./ui-handler"; diff --git a/src/ui/base-stats-overlay.ts b/src/ui/base-stats-overlay.ts index 0541ae766e5..4fb9d068a36 100644 --- a/src/ui/base-stats-overlay.ts +++ b/src/ui/base-stats-overlay.ts @@ -1,5 +1,6 @@ import type { InfoToggle } from "../battle-scene"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { addWindow } from "./ui-theme"; import { fixedInt } from "#app/utils/common"; import i18next from "i18next"; diff --git a/src/ui/battle-flyout.ts b/src/ui/battle-flyout.ts index 9a2180eccee..a6bcdfa8ea4 100644 --- a/src/ui/battle-flyout.ts +++ b/src/ui/battle-flyout.ts @@ -1,5 +1,6 @@ import type { EnemyPokemon, default as Pokemon } from "../field/pokemon"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { fixedInt } from "#app/utils/common"; import { globalScene } from "#app/global-scene"; import type Move from "#app/data/moves/move"; diff --git a/src/ui/battle-info/battle-info.ts b/src/ui/battle-info/battle-info.ts index e67000bb243..0bde280b5e8 100644 --- a/src/ui/battle-info/battle-info.ts +++ b/src/ui/battle-info/battle-info.ts @@ -1,6 +1,7 @@ import type { default as Pokemon } from "../../field/pokemon"; import { getLocalizedSpriteKey, fixedInt, getShinyDescriptor } from "#app/utils/common"; -import { addTextObject, TextStyle } from "../text"; +import { addTextObject } from "../text"; +import { TextStyle } from "#enums/text-style"; import { getGenderSymbol, getGenderColor, Gender } from "../../data/gender"; import { StatusEffect } from "#enums/status-effect"; import { globalScene } from "#app/global-scene"; diff --git a/src/ui/battle-info/enemy-battle-info.ts b/src/ui/battle-info/enemy-battle-info.ts index 7c16f01ac38..00047637110 100644 --- a/src/ui/battle-info/enemy-battle-info.ts +++ b/src/ui/battle-info/enemy-battle-info.ts @@ -1,6 +1,7 @@ import { globalScene } from "#app/global-scene"; import BattleFlyout from "../battle-flyout"; -import { addTextObject, TextStyle } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { addWindow, WindowVariant } from "#app/ui/ui-theme"; import { Stat } from "#enums/stat"; import i18next from "i18next"; diff --git a/src/ui/battle-message-ui-handler.ts b/src/ui/battle-message-ui-handler.ts index d1102bbe53e..5a6ba5c5b67 100644 --- a/src/ui/battle-message-ui-handler.ts +++ b/src/ui/battle-message-ui-handler.ts @@ -1,5 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "./text"; +import { addBBCodeTextObject, addTextObject, getTextColor } from "./text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import MessageUiHandler from "./message-ui-handler"; import { addWindow } from "./ui-theme"; diff --git a/src/ui/bgm-bar.ts b/src/ui/bgm-bar.ts index e331d82f6d9..a666c619b3c 100644 --- a/src/ui/bgm-bar.ts +++ b/src/ui/bgm-bar.ts @@ -1,4 +1,5 @@ -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import i18next from "i18next"; import { formatText } from "#app/utils/common"; import { globalScene } from "#app/global-scene"; diff --git a/src/ui/candy-bar.ts b/src/ui/candy-bar.ts index 189a418eec8..f0513f337bc 100644 --- a/src/ui/candy-bar.ts +++ b/src/ui/candy-bar.ts @@ -1,6 +1,7 @@ import { starterColors } from "#app/global-vars/starter-colors"; import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { argbFromRgba } from "@material/material-color-utilities"; import { rgbHexToRgba } from "#app/utils/common"; import type { SpeciesId } from "#enums/species-id"; diff --git a/src/ui/challenges-select-ui-handler.ts b/src/ui/challenges-select-ui-handler.ts index b02bf4abaef..be37507f4b6 100644 --- a/src/ui/challenges-select-ui-handler.ts +++ b/src/ui/challenges-select-ui-handler.ts @@ -1,4 +1,5 @@ -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; import UiHandler from "./ui-handler"; import { addWindow } from "./ui-theme"; diff --git a/src/ui/command-ui-handler.ts b/src/ui/command-ui-handler.ts index 8df399b6d9b..0b2990b7e92 100644 --- a/src/ui/command-ui-handler.ts +++ b/src/ui/command-ui-handler.ts @@ -1,4 +1,5 @@ -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import PartyUiHandler, { PartyUiMode } from "./party-ui-handler"; import { UiMode } from "#enums/ui-mode"; import UiHandler from "./ui-handler"; diff --git a/src/ui/daily-run-scoreboard.ts b/src/ui/daily-run-scoreboard.ts index e19882b09cc..b16f83ee08d 100644 --- a/src/ui/daily-run-scoreboard.ts +++ b/src/ui/daily-run-scoreboard.ts @@ -1,7 +1,8 @@ import i18next from "i18next"; import { globalScene } from "#app/global-scene"; import { getEnumKeys, executeIf } from "#app/utils/common"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { WindowVariant, addWindow } from "./ui-theme"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; diff --git a/src/ui/dropdown.ts b/src/ui/dropdown.ts index 2cbd1f0dfa9..63a6f1dda71 100644 --- a/src/ui/dropdown.ts +++ b/src/ui/dropdown.ts @@ -1,5 +1,6 @@ import { globalScene } from "#app/global-scene"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { addWindow, WindowVariant } from "./ui-theme"; import { ScrollBar } from "#app/ui/scroll-bar"; import i18next from "i18next"; diff --git a/src/ui/egg-counter-container.ts b/src/ui/egg-counter-container.ts index 7bb32189681..e6c83a2a920 100644 --- a/src/ui/egg-counter-container.ts +++ b/src/ui/egg-counter-container.ts @@ -1,6 +1,7 @@ import { globalScene } from "#app/global-scene"; import { addWindow } from "./ui-theme"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import type { EggCountChangedEvent } from "#app/events/egg"; import { EggEventType } from "#app/events/egg"; import type EggHatchSceneHandler from "./egg-hatch-scene-handler"; diff --git a/src/ui/egg-gacha-ui-handler.ts b/src/ui/egg-gacha-ui-handler.ts index 0c8d90fa138..d6881bb2133 100644 --- a/src/ui/egg-gacha-ui-handler.ts +++ b/src/ui/egg-gacha-ui-handler.ts @@ -1,5 +1,6 @@ import { UiMode } from "#enums/ui-mode"; -import { TextStyle, addTextObject, getEggTierTextTint, getTextStyleOptions } from "./text"; +import { addTextObject, getEggTierTextTint, getTextStyleOptions } from "./text"; +import { TextStyle } from "#enums/text-style"; import MessageUiHandler from "./message-ui-handler"; import { getEnumValues, getEnumKeys, fixedInt, randSeedShuffle } from "#app/utils/common"; import type { IEggOptions } from "../data/egg"; @@ -105,7 +106,7 @@ export default class EggGachaUiHandler extends MessageUiHandler { const gachaInfoContainer = globalScene.add.container(160, 46); const currentLanguage = i18next.resolvedLanguage ?? "en"; - let gachaTextStyle = TextStyle.WINDOW_ALT; + let gachaTextStyle: TextStyle = TextStyle.WINDOW_ALT; let gachaX = 4; let gachaY = 0; let pokemonIconX = -20; diff --git a/src/ui/egg-list-ui-handler.ts b/src/ui/egg-list-ui-handler.ts index 9a1b1f51e25..b1d94ef107a 100644 --- a/src/ui/egg-list-ui-handler.ts +++ b/src/ui/egg-list-ui-handler.ts @@ -1,6 +1,7 @@ import { UiMode } from "#enums/ui-mode"; import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; -import { TextStyle, addTextObject } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import MessageUiHandler from "#app/ui/message-ui-handler"; import { addWindow } from "#app/ui/ui-theme"; import { Button } from "#enums/buttons"; diff --git a/src/ui/evolution-scene-handler.ts b/src/ui/evolution-scene-handler.ts index 7372fc6f2b5..c5f748c27ca 100644 --- a/src/ui/evolution-scene-handler.ts +++ b/src/ui/evolution-scene-handler.ts @@ -1,5 +1,6 @@ import MessageUiHandler from "./message-ui-handler"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { Button } from "#enums/buttons"; import { globalScene } from "#app/global-scene"; diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts index 14cd10d0d6f..5d04fc330d2 100644 --- a/src/ui/fight-ui-handler.ts +++ b/src/ui/fight-ui-handler.ts @@ -1,6 +1,7 @@ import type { InfoToggle } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { getTypeDamageMultiplierColor } from "#app/data/type"; import { PokemonType } from "#enums/pokemon-type"; import { Command } from "#enums/command"; @@ -278,7 +279,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle { const ppPercentLeft = pp / maxPP; //** Determines TextStyle according to percentage of PP remaining */ - let ppColorStyle = TextStyle.MOVE_PP_FULL; + let ppColorStyle: TextStyle = TextStyle.MOVE_PP_FULL; if (ppPercentLeft > 0.25 && ppPercentLeft <= 0.5) { ppColorStyle = TextStyle.MOVE_PP_HALF_FULL; } else if (ppPercentLeft > 0 && ppPercentLeft <= 0.25) { diff --git a/src/ui/filter-bar.ts b/src/ui/filter-bar.ts index 622488c04cd..218fc5209dc 100644 --- a/src/ui/filter-bar.ts +++ b/src/ui/filter-bar.ts @@ -1,7 +1,8 @@ import type { DropDown } from "./dropdown"; import { DropDownType } from "./dropdown"; import type { StarterContainer } from "./starter-container"; -import { addTextObject, getTextColor, TextStyle } from "./text"; +import { addTextObject, getTextColor } from "./text"; +import { TextStyle } from "#enums/text-style"; import type { UiTheme } from "#enums/ui-theme"; import { addWindow, WindowVariant } from "./ui-theme"; import { globalScene } from "#app/global-scene"; diff --git a/src/ui/filter-text.ts b/src/ui/filter-text.ts index 7e27a806478..bda4dd1eee2 100644 --- a/src/ui/filter-text.ts +++ b/src/ui/filter-text.ts @@ -1,5 +1,6 @@ import type { StarterContainer } from "./starter-container"; -import { addTextObject, getTextColor, TextStyle } from "./text"; +import { addTextObject, getTextColor } from "./text"; +import { TextStyle } from "#enums/text-style"; import type { UiTheme } from "#enums/ui-theme"; import { addWindow, WindowVariant } from "./ui-theme"; import i18next from "i18next"; diff --git a/src/ui/form-modal-ui-handler.ts b/src/ui/form-modal-ui-handler.ts index 8c30b4e0bc4..10dae1c2ac3 100644 --- a/src/ui/form-modal-ui-handler.ts +++ b/src/ui/form-modal-ui-handler.ts @@ -1,7 +1,8 @@ import type { ModalConfig } from "./modal-ui-handler"; import { ModalUiHandler } from "./modal-ui-handler"; import type { UiMode } from "#enums/ui-mode"; -import { TextStyle, addTextInputObject, addTextObject } from "./text"; +import { addTextInputObject, addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { WindowVariant, addWindow } from "./ui-theme"; import type InputText from "phaser3-rex-plugins/plugins/inputtext"; import { fixedInt } from "#app/utils/common"; diff --git a/src/ui/game-stats-ui-handler.ts b/src/ui/game-stats-ui-handler.ts index 4213a244fdb..13fd11aaa1b 100644 --- a/src/ui/game-stats-ui-handler.ts +++ b/src/ui/game-stats-ui-handler.ts @@ -1,5 +1,6 @@ import Phaser from "phaser"; -import { TextStyle, addTextObject } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; import UiHandler from "#app/ui/ui-handler"; import { addWindow } from "#app/ui/ui-theme"; diff --git a/src/ui/loading-modal-ui-handler.ts b/src/ui/loading-modal-ui-handler.ts index 13dffe5614c..a42a1ac39ba 100644 --- a/src/ui/loading-modal-ui-handler.ts +++ b/src/ui/loading-modal-ui-handler.ts @@ -1,6 +1,7 @@ import i18next from "i18next"; import { ModalUiHandler } from "./modal-ui-handler"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; export default class LoadingModalUiHandler extends ModalUiHandler { diff --git a/src/ui/login-form-ui-handler.ts b/src/ui/login-form-ui-handler.ts index 5c48cf55753..7923644c036 100644 --- a/src/ui/login-form-ui-handler.ts +++ b/src/ui/login-form-ui-handler.ts @@ -4,7 +4,8 @@ import type { ModalConfig } from "./modal-ui-handler"; import { fixedInt } from "#app/utils/common"; import { UiMode } from "#enums/ui-mode"; import i18next from "i18next"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { addWindow } from "./ui-theme"; import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts index 5ab1d4f9e96..30472aea102 100644 --- a/src/ui/menu-ui-handler.ts +++ b/src/ui/menu-ui-handler.ts @@ -1,6 +1,7 @@ import { bypassLogin } from "#app/global-vars/bypass-login"; import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject, getTextStyleOptions } from "./text"; +import { addTextObject, getTextStyleOptions } from "./text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { getEnumKeys, isLocal, fixedInt, sessionIdKey } from "#app/utils/common"; import { isBeta } from "#app/utils/utility-vars"; diff --git a/src/ui/modal-ui-handler.ts b/src/ui/modal-ui-handler.ts index 56c1c2c3fcf..c880cd80e09 100644 --- a/src/ui/modal-ui-handler.ts +++ b/src/ui/modal-ui-handler.ts @@ -1,4 +1,5 @@ -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; import UiHandler from "./ui-handler"; import { WindowVariant, addWindow } from "./ui-theme"; diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts index 7f5bf997f88..92b81376909 100644 --- a/src/ui/modifier-select-ui-handler.ts +++ b/src/ui/modifier-select-ui-handler.ts @@ -2,7 +2,8 @@ import { globalScene } from "#app/global-scene"; import type { ModifierTypeOption } from "../modifier/modifier-type"; import { getPlayerShopModifierTypeOptionsForWave, TmModifierType } from "../modifier/modifier-type"; import { getPokeballAtlasKey } from "#app/data/pokeball"; -import { addTextObject, getTextStyleOptions, getModifierTierTextTint, getTextColor, TextStyle } from "./text"; +import { addTextObject, getTextStyleOptions, getModifierTierTextTint, getTextColor } from "./text"; +import { TextStyle } from "#enums/text-style"; import AwaitableUiHandler from "./awaitable-ui-handler"; import { UiMode } from "#enums/ui-mode"; import { LockModifierTiersModifier, PokemonHeldItemModifier, HealShopCostModifier } from "../modifier/modifier"; diff --git a/src/ui/move-info-overlay.ts b/src/ui/move-info-overlay.ts index 2b230d609fd..c5dd9443820 100644 --- a/src/ui/move-info-overlay.ts +++ b/src/ui/move-info-overlay.ts @@ -1,6 +1,7 @@ import type { InfoToggle } from "#app/battle-scene"; import { globalScene } from "#app/global-scene"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { addWindow } from "./ui-theme"; import { getLocalizedSpriteKey, fixedInt } from "#app/utils/common"; import type Move from "../data/moves/move"; diff --git a/src/ui/mystery-encounter-ui-handler.ts b/src/ui/mystery-encounter-ui-handler.ts index 83ce88714f5..087417f96b6 100644 --- a/src/ui/mystery-encounter-ui-handler.ts +++ b/src/ui/mystery-encounter-ui-handler.ts @@ -1,4 +1,5 @@ -import { addBBCodeTextObject, getBBCodeFrag, TextStyle } from "./text"; +import { addBBCodeTextObject, getBBCodeFrag } from "./text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import UiHandler from "./ui-handler"; import { Button } from "#enums/buttons"; diff --git a/src/ui/party-exp-bar.ts b/src/ui/party-exp-bar.ts index 7b7f5277ca1..6b25d6e6cdc 100644 --- a/src/ui/party-exp-bar.ts +++ b/src/ui/party-exp-bar.ts @@ -1,6 +1,7 @@ import { globalScene } from "#app/global-scene"; import type Pokemon from "../field/pokemon"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import i18next from "i18next"; export default class PartyExpBar extends Phaser.GameObjects.Container { diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index cf6333f4580..742a9b2ffee 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -2,7 +2,8 @@ import type { PlayerPokemon, TurnMove } from "#app/field/pokemon"; import type { PokemonMove } from "#app/data/moves/pokemon-move"; import type Pokemon from "#app/field/pokemon"; import { MoveResult } from "#enums/move-result"; -import { addBBCodeTextObject, addTextObject, getTextColor, TextStyle } from "#app/ui/text"; +import { addBBCodeTextObject, addTextObject, getTextColor } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { Command } from "#enums/command"; import MessageUiHandler from "#app/ui/message-ui-handler"; import { UiMode } from "#enums/ui-mode"; diff --git a/src/ui/pokedex-info-overlay.ts b/src/ui/pokedex-info-overlay.ts index 2e889f6d2a9..bfe4e4f7582 100644 --- a/src/ui/pokedex-info-overlay.ts +++ b/src/ui/pokedex-info-overlay.ts @@ -1,5 +1,6 @@ import type { InfoToggle } from "../battle-scene"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { addWindow } from "./ui-theme"; import { fixedInt } from "#app/utils/common"; import i18next from "i18next"; diff --git a/src/ui/pokedex-mon-container.ts b/src/ui/pokedex-mon-container.ts index da79320850d..3f347e27906 100644 --- a/src/ui/pokedex-mon-container.ts +++ b/src/ui/pokedex-mon-container.ts @@ -2,7 +2,8 @@ import type { Variant } from "#app/sprites/variant"; import { globalScene } from "#app/global-scene"; import { isNullOrUndefined } from "#app/utils/common"; import type PokemonSpecies from "../data/pokemon-species"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; interface SpeciesDetails { shiny?: boolean; diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts index 32a88ab36b2..646152dd332 100644 --- a/src/ui/pokedex-page-ui-handler.ts +++ b/src/ui/pokedex-page-ui-handler.ts @@ -29,7 +29,8 @@ import { DexAttr } from "#enums/dex-attr"; import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler"; import MessageUiHandler from "#app/ui/message-ui-handler"; import { StatsContainer } from "#app/ui/stats-container"; -import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor, getTextStyleOptions } from "#app/ui/text"; +import { addBBCodeTextObject, addTextObject, getTextColor, getTextStyleOptions } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { addWindow } from "#app/ui/ui-theme"; import { Egg } from "#app/data/egg"; diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts index 1732bb005d3..404b686b924 100644 --- a/src/ui/pokedex-ui-handler.ts +++ b/src/ui/pokedex-ui-handler.ts @@ -20,7 +20,8 @@ import { AbilityAttr } from "#enums/ability-attr"; import { DexAttr } from "#enums/dex-attr"; import MessageUiHandler from "#app/ui/message-ui-handler"; import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; -import { TextStyle, addTextObject } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { SettingKeyboard } from "#app/system/settings/settings-keyboard"; import { Passive as PassiveAttr } from "#enums/passive"; diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/pokemon-hatch-info-container.ts index afc58c63953..3e9db3b549e 100644 --- a/src/ui/pokemon-hatch-info-container.ts +++ b/src/ui/pokemon-hatch-info-container.ts @@ -2,7 +2,8 @@ import PokemonInfoContainer from "#app/ui/pokemon-info-container"; import { Gender } from "#app/data/gender"; import { PokemonType } from "#enums/pokemon-type"; import { rgbHexToRgba, padInt } from "#app/utils/common"; -import { TextStyle, addTextObject } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { speciesEggMoves } from "#app/data/balance/egg-moves"; import { allMoves } from "#app/data/data-lists"; import { SpeciesId } from "#enums/species-id"; diff --git a/src/ui/pokemon-info-container.ts b/src/ui/pokemon-info-container.ts index 0056c3e2f11..8e9257d8bab 100644 --- a/src/ui/pokemon-info-container.ts +++ b/src/ui/pokemon-info-container.ts @@ -12,7 +12,8 @@ import { DexAttr } from "#enums/dex-attr"; import { fixedInt, getShinyDescriptor } from "#app/utils/common"; import ConfirmUiHandler from "./confirm-ui-handler"; import { StatsContainer } from "./stats-container"; -import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text"; +import { addBBCodeTextObject, addTextObject, getTextColor } from "./text"; +import { TextStyle } from "#enums/text-style"; import { addWindow } from "./ui-theme"; interface LanguageSetting { diff --git a/src/ui/registration-form-ui-handler.ts b/src/ui/registration-form-ui-handler.ts index a60a53a8e7a..80a6291c11e 100644 --- a/src/ui/registration-form-ui-handler.ts +++ b/src/ui/registration-form-ui-handler.ts @@ -2,7 +2,8 @@ import type { InputFieldConfig } from "./form-modal-ui-handler"; import { FormModalUiHandler } from "./form-modal-ui-handler"; import type { ModalConfig } from "./modal-ui-handler"; import { UiMode } from "#enums/ui-mode"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import i18next from "i18next"; import { pokerogueApi } from "#app/plugins/api/pokerogue-api"; import { globalScene } from "#app/global-scene"; diff --git a/src/ui/run-history-ui-handler.ts b/src/ui/run-history-ui-handler.ts index 06ef590c1e8..211be892022 100644 --- a/src/ui/run-history-ui-handler.ts +++ b/src/ui/run-history-ui-handler.ts @@ -1,6 +1,7 @@ import { globalScene } from "#app/global-scene"; import { GameModes } from "#enums/game-modes"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { addWindow } from "./ui-theme"; import { fixedInt, formatLargeNumber } from "#app/utils/common"; diff --git a/src/ui/run-info-ui-handler.ts b/src/ui/run-info-ui-handler.ts index 78ab4a40407..8d11fa7d5c0 100644 --- a/src/ui/run-info-ui-handler.ts +++ b/src/ui/run-info-ui-handler.ts @@ -1,7 +1,8 @@ import { GameModes } from "#enums/game-modes"; import UiHandler from "./ui-handler"; import type { SessionSaveData } from "../system/game-data"; -import { TextStyle, addTextObject, addBBCodeTextObject, getTextColor } from "./text"; +import { addTextObject, addBBCodeTextObject, getTextColor } from "./text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { addWindow } from "./ui-theme"; import { getPokeballAtlasKey } from "#app/data/pokeball"; diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts index 7b4d46203c9..b9b87f91eb6 100644 --- a/src/ui/save-slot-select-ui-handler.ts +++ b/src/ui/save-slot-select-ui-handler.ts @@ -8,7 +8,8 @@ import type { SessionSaveData } from "../system/game-data"; import type PokemonData from "../system/pokemon-data"; import { isNullOrUndefined, fixedInt, getPlayTimeString, formatLargeNumber } from "#app/utils/common"; import MessageUiHandler from "./message-ui-handler"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { addWindow } from "./ui-theme"; import { RunDisplayMode } from "#app/ui/run-info-ui-handler"; diff --git a/src/ui/session-reload-modal-ui-handler.ts b/src/ui/session-reload-modal-ui-handler.ts index f866783afe8..2f27ff371ee 100644 --- a/src/ui/session-reload-modal-ui-handler.ts +++ b/src/ui/session-reload-modal-ui-handler.ts @@ -1,6 +1,7 @@ import type { ModalConfig } from "./modal-ui-handler"; import { ModalUiHandler } from "./modal-ui-handler"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; export default class SessionReloadModalUiHandler extends ModalUiHandler { diff --git a/src/ui/settings/abstract-binding-ui-handler.ts b/src/ui/settings/abstract-binding-ui-handler.ts index a4707418b7c..0b85f7d4d98 100644 --- a/src/ui/settings/abstract-binding-ui-handler.ts +++ b/src/ui/settings/abstract-binding-ui-handler.ts @@ -1,7 +1,8 @@ import UiHandler from "../ui-handler"; import type { UiMode } from "#enums/ui-mode"; import { addWindow } from "../ui-theme"; -import { addTextObject, TextStyle } from "../text"; +import { addTextObject } from "../text"; +import { TextStyle } from "#enums/text-style"; import { Button } from "#enums/buttons"; import { NavigationManager } from "#app/ui/settings/navigationMenu"; import i18next from "i18next"; diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts index e3631c062df..1594619f9dd 100644 --- a/src/ui/settings/abstract-control-settings-ui-handler.ts +++ b/src/ui/settings/abstract-control-settings-ui-handler.ts @@ -2,7 +2,8 @@ import UiHandler from "#app/ui/ui-handler"; import type { UiMode } from "#enums/ui-mode"; import type { InterfaceConfig } from "#app/inputs-controller"; import { addWindow } from "#app/ui/ui-theme"; -import { addTextObject, TextStyle } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { ScrollBar } from "#app/ui/scroll-bar"; import { getIconWithSettingName } from "#app/configs/inputs/configHandler"; import NavigationMenu, { NavigationManager } from "#app/ui/settings/navigationMenu"; diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts index 6db9840a818..5894f2b037c 100644 --- a/src/ui/settings/abstract-settings-ui-handler.ts +++ b/src/ui/settings/abstract-settings-ui-handler.ts @@ -1,4 +1,5 @@ -import { TextStyle, addTextObject } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import MessageUiHandler from "#app/ui/message-ui-handler"; import { addWindow } from "#app/ui/ui-theme"; diff --git a/src/ui/settings/gamepad-binding-ui-handler.ts b/src/ui/settings/gamepad-binding-ui-handler.ts index 9ddb54131d5..e38f6f38e61 100644 --- a/src/ui/settings/gamepad-binding-ui-handler.ts +++ b/src/ui/settings/gamepad-binding-ui-handler.ts @@ -2,7 +2,8 @@ import AbstractBindingUiHandler from "./abstract-binding-ui-handler"; import type { UiMode } from "#enums/ui-mode"; import { Device } from "#enums/devices"; import { getIconWithSettingName, getKeyWithKeycode } from "#app/configs/inputs/configHandler"; -import { addTextObject, TextStyle } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { globalScene } from "#app/global-scene"; import i18next from "i18next"; diff --git a/src/ui/settings/keyboard-binding-ui-handler.ts b/src/ui/settings/keyboard-binding-ui-handler.ts index 183b8269e78..c60738af9f5 100644 --- a/src/ui/settings/keyboard-binding-ui-handler.ts +++ b/src/ui/settings/keyboard-binding-ui-handler.ts @@ -2,7 +2,8 @@ import AbstractBindingUiHandler from "./abstract-binding-ui-handler"; import type { UiMode } from "#enums/ui-mode"; import { getKeyWithKeycode } from "#app/configs/inputs/configHandler"; import { Device } from "#enums/devices"; -import { addTextObject, TextStyle } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { globalScene } from "#app/global-scene"; import i18next from "i18next"; diff --git a/src/ui/settings/navigationMenu.ts b/src/ui/settings/navigationMenu.ts index ad3d4ccf0b5..77d959d28e7 100644 --- a/src/ui/settings/navigationMenu.ts +++ b/src/ui/settings/navigationMenu.ts @@ -1,7 +1,8 @@ import { globalScene } from "#app/global-scene"; import { UiMode } from "#enums/ui-mode"; import type { InputsIcons } from "#app/ui/settings/abstract-control-settings-ui-handler"; -import { addTextObject, setTextStyle, TextStyle } from "#app/ui/text"; +import { addTextObject, setTextStyle } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { addWindow } from "#app/ui/ui-theme"; import { Button } from "#enums/buttons"; import i18next from "i18next"; diff --git a/src/ui/settings/settings-gamepad-ui-handler.ts b/src/ui/settings/settings-gamepad-ui-handler.ts index 7d269deab14..c1e854bf9af 100644 --- a/src/ui/settings/settings-gamepad-ui-handler.ts +++ b/src/ui/settings/settings-gamepad-ui-handler.ts @@ -1,4 +1,5 @@ -import { addTextObject, TextStyle } from "../text"; +import { addTextObject } from "../text"; +import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; import { setSettingGamepad, diff --git a/src/ui/settings/settings-keyboard-ui-handler.ts b/src/ui/settings/settings-keyboard-ui-handler.ts index c334ee8f1fc..1c6802fbd4a 100644 --- a/src/ui/settings/settings-keyboard-ui-handler.ts +++ b/src/ui/settings/settings-keyboard-ui-handler.ts @@ -10,7 +10,8 @@ import { import { reverseValueToKeySetting, truncateString } from "#app/utils/common"; import AbstractControlSettingsUiHandler from "#app/ui/settings/abstract-control-settings-ui-handler"; import type { InterfaceConfig } from "#app/inputs-controller"; -import { addTextObject, TextStyle } from "#app/ui/text"; +import { addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { deleteBind } from "#app/configs/inputs/configHandler"; import { Device } from "#enums/devices"; import { NavigationManager } from "#app/ui/settings/navigationMenu"; diff --git a/src/ui/starter-container.ts b/src/ui/starter-container.ts index 71e40844f38..8355b8844d7 100644 --- a/src/ui/starter-container.ts +++ b/src/ui/starter-container.ts @@ -1,6 +1,7 @@ import { globalScene } from "#app/global-scene"; import type PokemonSpecies from "../data/pokemon-species"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; export class StarterContainer extends Phaser.GameObjects.Container { public species: PokemonSpecies; diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 20f613fb694..b3b73683d32 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -35,7 +35,8 @@ import type { OptionSelectItem } from "#app/ui/abstact-option-select-ui-handler" import MessageUiHandler from "#app/ui/message-ui-handler"; import PokemonIconAnimHandler, { PokemonIconAnimMode } from "#app/ui/pokemon-icon-anim-handler"; import { StatsContainer } from "#app/ui/stats-container"; -import { TextStyle, addBBCodeTextObject, addTextObject } from "#app/ui/text"; +import { addBBCodeTextObject, addTextObject } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import { UiMode } from "#enums/ui-mode"; import { addWindow } from "#app/ui/ui-theme"; import { Egg } from "#app/data/egg"; diff --git a/src/ui/stats-container.ts b/src/ui/stats-container.ts index 8cc74e64e96..cf24eaecd86 100644 --- a/src/ui/stats-container.ts +++ b/src/ui/stats-container.ts @@ -1,5 +1,6 @@ import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; -import { TextStyle, addBBCodeTextObject, addTextObject, getTextColor } from "./text"; +import { addBBCodeTextObject, addTextObject, getTextColor } from "./text"; +import { TextStyle } from "#enums/text-style"; import { PERMANENT_STATS, getStatKey } from "#app/enums/stat"; import i18next from "i18next"; import { globalScene } from "#app/global-scene"; diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index d30322de293..e69fa1fa3b3 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -19,7 +19,8 @@ import { getStarterValueFriendshipCap, speciesStarterCosts } from "#app/data/bal import { argbFromRgba } from "@material/material-color-utilities"; import { getTypeRgb } from "#app/data/type"; import { PokemonType } from "#enums/pokemon-type"; -import { TextStyle, addBBCodeTextObject, addTextObject, getBBCodeFrag } from "#app/ui/text"; +import { addBBCodeTextObject, addTextObject, getBBCodeFrag } from "#app/ui/text"; +import { TextStyle } from "#enums/text-style"; import type Move from "#app/data/moves/move"; import { MoveCategory } from "#enums/MoveCategory"; import { getPokeballAtlasKey } from "#app/data/pokeball"; diff --git a/src/ui/text.ts b/src/ui/text.ts index 8812d8ee4a8..30e2b461b1d 100644 --- a/src/ui/text.ts +++ b/src/ui/text.ts @@ -6,52 +6,8 @@ import InputText from "phaser3-rex-plugins/plugins/inputtext"; import { globalScene } from "#app/global-scene"; import { ModifierTier } from "../enums/modifier-tier"; import i18next from "#app/plugins/i18n"; - -export enum TextStyle { - MESSAGE, - WINDOW, - WINDOW_ALT, - BATTLE_INFO, - PARTY, - PARTY_RED, - SUMMARY, - SUMMARY_ALT, - SUMMARY_RED, - SUMMARY_BLUE, - SUMMARY_PINK, - SUMMARY_GOLD, - SUMMARY_GRAY, - SUMMARY_GREEN, - MONEY, // Money default styling (pale yellow) - MONEY_WINDOW, // Money displayed in Windows (needs different colors based on theme) - STATS_LABEL, - STATS_VALUE, - SETTINGS_VALUE, - SETTINGS_LABEL, - SETTINGS_SELECTED, - SETTINGS_LOCKED, - TOOLTIP_TITLE, - TOOLTIP_CONTENT, - MOVE_INFO_CONTENT, - MOVE_PP_FULL, - MOVE_PP_HALF_FULL, - MOVE_PP_NEAR_EMPTY, - MOVE_PP_EMPTY, - SMALLER_WINDOW_ALT, - BGM_BAR, - PERFECT_IV, - ME_OPTION_DEFAULT, // Default style for choices in ME - ME_OPTION_SPECIAL, // Style for choices with special requirements in ME - SHADOW_TEXT, // To obscure unavailable options -} - -export interface TextStyleOptions { - scale: number; - styleOptions: Phaser.Types.GameObjects.Text.TextStyle | InputText.IConfig; - shadowColor: string; - shadowXpos: number; - shadowYpos: number; -} +import { TextStyle } from "#enums/text-style"; +import type { TextStyleOptions } from "#app/@types/ui"; export function addTextObject( x: number, @@ -66,9 +22,10 @@ export function addTextObject( extraStyleOptions, ); - const ret = globalScene.add.text(x, y, content, styleOptions); - ret.setScale(scale); - ret.setShadow(shadowXpos, shadowYpos, shadowColor); + const ret = globalScene.add + .text(x, y, content, styleOptions) + .setScale(scale) + .setShadow(shadowXpos, shadowYpos, shadowColor); if (!(styleOptions as Phaser.Types.GameObjects.Text.TextStyle).lineSpacing) { ret.setLineSpacing(scale * 30); } @@ -90,8 +47,7 @@ export function setTextStyle( globalScene.uiTheme, extraStyleOptions, ); - obj.setScale(scale); - obj.setShadow(shadowXpos, shadowYpos, shadowColor); + obj.setScale(scale).setShadow(shadowXpos, shadowYpos, shadowColor); if (!(styleOptions as Phaser.Types.GameObjects.Text.TextStyle).lineSpacing) { obj.setLineSpacing(scale * 30); } @@ -116,8 +72,7 @@ export function addBBCodeTextObject( const ret = new BBCodeText(globalScene, x, y, content, styleOptions as BBCodeText.TextStyle); globalScene.add.existing(ret); - ret.setScale(scale); - ret.setShadow(shadowXpos, shadowYpos, shadowColor); + ret.setScale(scale).setShadow(shadowXpos, shadowYpos, shadowColor); if (!(styleOptions as BBCodeText.TextStyle).lineSpacing) { ret.setLineSpacing(scale * 60); } diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts index 50e77bbdd14..dfc5e796b39 100644 --- a/src/ui/title-ui-handler.ts +++ b/src/ui/title-ui-handler.ts @@ -1,7 +1,8 @@ import OptionSelectUiHandler from "./settings/option-select-ui-handler"; import { UiMode } from "#enums/ui-mode"; import { fixedInt, randInt, randItem } from "#app/utils/common"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import { getSplashMessages } from "../data/splash-messages"; import i18next from "i18next"; import { TimedEventDisplay } from "#app/timed-event-manager"; diff --git a/src/ui/ui-handler.ts b/src/ui/ui-handler.ts index d3784c1225c..2523f8a3f84 100644 --- a/src/ui/ui-handler.ts +++ b/src/ui/ui-handler.ts @@ -1,5 +1,5 @@ import { globalScene } from "#app/global-scene"; -import type { TextStyle } from "./text"; +import type { TextStyle } from "#enums/text-style"; import { getTextColor } from "./text"; import type { UiMode } from "#enums/ui-mode"; import type { Button } from "#enums/buttons"; diff --git a/src/ui/ui.ts b/src/ui/ui.ts index ad496df6382..fe71d816de8 100644 --- a/src/ui/ui.ts +++ b/src/ui/ui.ts @@ -15,7 +15,8 @@ import TargetSelectUiHandler from "./target-select-ui-handler"; import SettingsUiHandler from "./settings/settings-ui-handler"; import SettingsGamepadUiHandler from "./settings/settings-gamepad-ui-handler"; import GameChallengesUiHandler from "./challenges-select-ui-handler"; -import { TextStyle, addTextObject } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import AchvBar from "./achv-bar"; import MenuUiHandler from "./menu-ui-handler"; import AchvsUiHandler from "./achvs-ui-handler"; diff --git a/src/ui/unavailable-modal-ui-handler.ts b/src/ui/unavailable-modal-ui-handler.ts index 5bed55ec24a..4d7ccdbcdf0 100644 --- a/src/ui/unavailable-modal-ui-handler.ts +++ b/src/ui/unavailable-modal-ui-handler.ts @@ -1,6 +1,7 @@ import type { ModalConfig } from "./modal-ui-handler"; import { ModalUiHandler } from "./modal-ui-handler"; -import { addTextObject, TextStyle } from "./text"; +import { addTextObject } from "./text"; +import { TextStyle } from "#enums/text-style"; import type { UiMode } from "#enums/ui-mode"; import { updateUserInfo } from "#app/account"; import { sessionIdKey } from "#app/utils/common";