diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 31474292b31..c42b16fc126 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -124,6 +124,7 @@ export default class BattleScene extends SceneBase { public lazyReloads: boolean = false; public menuChangesBiome: boolean = false; public showAutosaves: boolean = false; + public doBiomePanels: boolean = false; /** * Determines the condition for a notification should be shown for Candy Upgrades * - 0 = 'Off' diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts index 24de349327f..611ed8f15ad 100644 --- a/src/system/settings/settings.ts +++ b/src/system/settings/settings.ts @@ -102,7 +102,8 @@ export const SettingKeys = { Damage_Display: "DAMAGE_DISPLAY", LazyReloads: "FLAG_EVERY_RESET_AS_RELOAD", FancyBiome: "FANCY_BIOMES", - ShowAutosaves: "SHOW_AUTOSAVES" + ShowAutosaves: "SHOW_AUTOSAVES", + BiomePanels: "BIOME_PANELS" }; /** @@ -544,6 +545,19 @@ export const Setting: Array = [ type: SettingType.DISPLAY, requireReload: true }, + { + key: SettingKeys.BiomePanels, + label: "Biome Panels", + options: [{ + label: "Off", + value: "Off" + }, { + label: "On", + value: "On" + }], + default: 0, + type: SettingType.DISPLAY, + }, { key: SettingKeys.ShowAutosaves, label: "Show Autosaves", @@ -672,6 +686,8 @@ export function setSetting(scene: BattleScene, setting: string, value: integer): scene.menuChangesBiome = Setting[index].options[value].value == "On" case SettingKeys.ShowAutosaves: scene.showAutosaves = Setting[index].options[value].value == "On" + case SettingKeys.BiomePanels: + scene.doBiomePanels = Setting[index].options[value].value == "On" case SettingKeys.Skip_Seen_Dialogues: scene.skipSeenDialogues = Setting[index].options[value].value === "On"; break; diff --git a/src/ui/save-slot-select-ui-handler.ts b/src/ui/save-slot-select-ui-handler.ts index 10eb3ead3e9..3a3586ff361 100644 --- a/src/ui/save-slot-select-ui-handler.ts +++ b/src/ui/save-slot-select-ui-handler.ts @@ -13,6 +13,7 @@ import { addWindow } from "./ui-theme"; import * as LoggerTools from "../logger" import { loggedInUser } from "#app/account.js"; import { allpanels, biomePanelIDs } from "../loading-scene" +import { getBiomeName } from "#app/data/biomes.js"; const sessionSlotCount = 5; @@ -309,13 +310,15 @@ class SessionSlot extends Phaser.GameObjects.Container { const slotWindow = addWindow(this.scene, 0, 0, 304, 52); this.add(slotWindow); - //this.backer = this.scene.add.image(0, 0, `end_panel`) - //this.backer.setOrigin(0.5, 0.5) - //this.backer.setScale(304/909, 52/155) - //this.backer.setPosition(102*1.5 - 1, 26) - //this.backer.setSize(304, 52) - //this.backer.setVisible(false) - //this.add(this.backer) + if (this.scene.doBiomePanels) { + this.backer = this.scene.add.image(0, 0, `end_panel`) + this.backer.setOrigin(0.5, 0.5) + this.backer.setScale(304/909, 52/155) + this.backer.setPosition(102*1.5 - 1, 26) + this.backer.setSize(304, 52) + this.backer.setVisible(false) + this.add(this.backer) + } this.loadingLabel = addTextObject(this.scene, 152, 26, i18next.t("saveSlotSelectUiHandler:loading"), TextStyle.WINDOW); this.loadingLabel.setOrigin(0.5, 0.5); @@ -336,14 +339,14 @@ class SessionSlot extends Phaser.GameObjects.Container { const timestampLabel = addTextObject(this.scene, 8, 19, new Date(data.timestamp).toLocaleString(), TextStyle.WINDOW); this.add(timestampLabel); - const playTimeLabel = addTextObject(this.scene, 8, 33, Utils.getPlayTimeString(data.playTime), TextStyle.WINDOW); + const playTimeLabel = addTextObject(this.scene, 8, 33, Utils.getPlayTimeString(data.playTime) + " " + (getBiomeName(data.arena.biome) == "Construction Site" ? "Construction" : getBiomeName(data.arena.biome)), TextStyle.WINDOW); this.add(playTimeLabel); console.log(biomePanelIDs[data.arena.biome]) - if (allpanels.includes(biomePanelIDs[data.arena.biome])) { - //this.backer.setTexture(`${biomePanelIDs[data.arena.biome]}_panel`) - //this.backer.setVisible(true) + if (this.backer && allpanels.includes(biomePanelIDs[data.arena.biome]) && this.scene.doBiomePanels) { + this.backer.setTexture(`${biomePanelIDs[data.arena.biome]}_panel`) + this.backer.setVisible(true) } const pokemonIconsContainer = this.scene.add.container(144, 4);