diff --git a/src/css/ingame_hud/keybindings_overlay.scss b/src/css/ingame_hud/keybindings_overlay.scss index e345955b..c0377e32 100644 --- a/src/css/ingame_hud/keybindings_overlay.scss +++ b/src/css/ingame_hud/keybindings_overlay.scss @@ -76,3 +76,7 @@ border-color: darken($colorRedBright, 40); } } + +body.uiHidden #ingame_HUD_KeybindingOverlay .binding:not(.hudToggle) { + display: none; +} diff --git a/src/css/main.scss b/src/css/main.scss index 58c75b45..43e6db60 100644 --- a/src/css/main.scss +++ b/src/css/main.scss @@ -36,9 +36,9 @@ @import "ingame_hud/mass_selector"; // Z-Index -$elements: ingame_Canvas, ingame_HUD_building_placer_overlay, ingame_HUD_building_placer, - ingame_HUD_buildings_toolbar, ingame_HUD_GameMenu, ingame_HUD_KeybindingOverlay, ingame_HUD_Shop, - ingame_HUD_BetaOverlay, ingame_HUD_MassSelector, ingame_HUD_UnlockNotification; +$elements: ingame_Canvas, ingame_HUD_building_placer, ingame_HUD_buildings_toolbar, ingame_HUD_GameMenu, + ingame_HUD_KeybindingOverlay, ingame_HUD_Shop, ingame_HUD_BetaOverlay, ingame_HUD_MassSelector, + ingame_HUD_UnlockNotification; $zindex: 100; @@ -49,3 +49,12 @@ $zindex: 100; $zindex: $zindex + 10; } + +body.uiHidden { + #ingame_HUD_buildings_toolbar, + #ingame_HUD_building_placer, + #ingame_HUD_GameMenu, + #ingame_HUD_MassSelector { + display: none !important; + } +} diff --git a/src/js/core/query_parameters.js b/src/js/core/query_parameters.js index b3dab1b3..7bc09b37 100644 --- a/src/js/core/query_parameters.js +++ b/src/js/core/query_parameters.js @@ -3,8 +3,13 @@ const options = queryString.parse(location.search); export let queryParamOptions = { embedProvider: null, + betaMode: null, }; if (options.embed) { queryParamOptions.embedProvider = options.embed; } + +if (!G_IS_RELEASE && options.betamode) { + queryParamOptions.betaMode = true; +} diff --git a/src/js/game/camera.js b/src/js/game/camera.js index f302f543..6bae86a5 100644 --- a/src/js/game/camera.js +++ b/src/js/game/camera.js @@ -16,6 +16,7 @@ import { GameRoot } from "./root"; import { BasicSerializableObject, types } from "../savegame/serialization"; import { clickDetectorGlobals } from "../core/click_detector"; import { createLogger } from "../core/logging"; +import { queryParamOptions } from "../core/query_parameters"; const logger = createLogger("camera"); @@ -687,6 +688,9 @@ export class Camera extends BasicSerializableObject { if (G_IS_DEV && globalConfig.debug.disableZoomLimits) { return; } + if (queryParamOptions.betaMode) { + return; + } const wrapper = this.root.app.platformWrapper; diff --git a/src/js/game/hub_goals.js b/src/js/game/hub_goals.js index 932a73ac..510cef5b 100644 --- a/src/js/game/hub_goals.js +++ b/src/js/game/hub_goals.js @@ -9,6 +9,7 @@ import { globalConfig } from "../core/config"; import { Math_random } from "../core/builtins"; import { UPGRADES } from "./upgrades"; import { enumItemProcessorTypes } from "./components/item_processor"; +import { queryParamOptions } from "../core/query_parameters"; const logger = createLogger("hub_goals"); @@ -98,6 +99,9 @@ export class HubGoals extends BasicSerializableObject { if (G_IS_DEV && globalConfig.debug.allBuildingsUnlocked) { return true; } + if (queryParamOptions.betaMode) { + return true; + } return !!this.gainedRewards[reward]; } @@ -177,6 +181,9 @@ export class HubGoals extends BasicSerializableObject { if (G_IS_DEV && globalConfig.debug.upgradesNoCost) { return true; } + if (queryParamOptions.betaMode) { + return true; + } const tierData = handle.tiers[currentLevel]; @@ -209,6 +216,8 @@ export class HubGoals extends BasicSerializableObject { if (G_IS_DEV && globalConfig.debug.upgradesNoCost) { // Dont take resources + } else if (queryParamOptions.betaMode) { + // Same } else { for (let i = 0; i < tierData.required.length; ++i) { const requirement = tierData.required[i]; diff --git a/src/js/game/hud/parts/keybinding_overlay.js b/src/js/game/hud/parts/keybinding_overlay.js index 99b4231e..373dabc6 100644 --- a/src/js/game/hud/parts/keybinding_overlay.js +++ b/src/js/game/hud/parts/keybinding_overlay.js @@ -2,6 +2,7 @@ import { BaseHUDPart } from "../base_hud_part"; import { makeDiv } from "../../../core/utils"; import { getStringForKeyCode } from "../../key_action_mapper"; import { TrackedState } from "../../../core/tracked_state"; +import { queryParamOptions } from "../../../core/query_parameters"; export class HUDKeybindingOverlay extends BaseHUDPart { initialize() { @@ -71,7 +72,15 @@ export class HUDKeybindingOverlay extends BaseHUDPart { ALT + ` + + (queryParamOptions.betaMode + ? ` +
+ F2 + +
` + : "") ); } diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js index 55adba47..e557f0d8 100644 --- a/src/js/game/key_action_mapper.js +++ b/src/js/game/key_action_mapper.js @@ -23,7 +23,6 @@ export const defaultKeybindings = { map_move_right: { keyCode: key("D") }, map_move_down: { keyCode: key("S") }, map_move_left: { keyCode: key("A") }, - toggle_hud: { keyCode: 113 }, center_map: { keyCode: 32 }, @@ -31,6 +30,7 @@ export const defaultKeybindings = { menu_open_stats: { keyCode: key("G") }, confirm_mass_delete: { keyCode: 46 }, // DEL + toggle_hud: { keyCode: 113 }, // F2 }, toolbar: {