Add beta mode and hud toggle

pull/33/head
tobspr 4 years ago
parent 862c69eade
commit 6429f67c7b

@ -76,3 +76,7 @@
border-color: darken($colorRedBright, 40); border-color: darken($colorRedBright, 40);
} }
} }
body.uiHidden #ingame_HUD_KeybindingOverlay .binding:not(.hudToggle) {
display: none;
}

@ -36,9 +36,9 @@
@import "ingame_hud/mass_selector"; @import "ingame_hud/mass_selector";
// Z-Index // Z-Index
$elements: ingame_Canvas, ingame_HUD_building_placer_overlay, ingame_HUD_building_placer, $elements: ingame_Canvas, ingame_HUD_building_placer, ingame_HUD_buildings_toolbar, ingame_HUD_GameMenu,
ingame_HUD_buildings_toolbar, ingame_HUD_GameMenu, ingame_HUD_KeybindingOverlay, ingame_HUD_Shop, ingame_HUD_KeybindingOverlay, ingame_HUD_Shop, ingame_HUD_BetaOverlay, ingame_HUD_MassSelector,
ingame_HUD_BetaOverlay, ingame_HUD_MassSelector, ingame_HUD_UnlockNotification; ingame_HUD_UnlockNotification;
$zindex: 100; $zindex: 100;
@ -49,3 +49,12 @@ $zindex: 100;
$zindex: $zindex + 10; $zindex: $zindex + 10;
} }
body.uiHidden {
#ingame_HUD_buildings_toolbar,
#ingame_HUD_building_placer,
#ingame_HUD_GameMenu,
#ingame_HUD_MassSelector {
display: none !important;
}
}

@ -3,8 +3,13 @@ const options = queryString.parse(location.search);
export let queryParamOptions = { export let queryParamOptions = {
embedProvider: null, embedProvider: null,
betaMode: null,
}; };
if (options.embed) { if (options.embed) {
queryParamOptions.embedProvider = options.embed; queryParamOptions.embedProvider = options.embed;
} }
if (!G_IS_RELEASE && options.betamode) {
queryParamOptions.betaMode = true;
}

@ -16,6 +16,7 @@ import { GameRoot } from "./root";
import { BasicSerializableObject, types } from "../savegame/serialization"; import { BasicSerializableObject, types } from "../savegame/serialization";
import { clickDetectorGlobals } from "../core/click_detector"; import { clickDetectorGlobals } from "../core/click_detector";
import { createLogger } from "../core/logging"; import { createLogger } from "../core/logging";
import { queryParamOptions } from "../core/query_parameters";
const logger = createLogger("camera"); const logger = createLogger("camera");
@ -687,6 +688,9 @@ export class Camera extends BasicSerializableObject {
if (G_IS_DEV && globalConfig.debug.disableZoomLimits) { if (G_IS_DEV && globalConfig.debug.disableZoomLimits) {
return; return;
} }
if (queryParamOptions.betaMode) {
return;
}
const wrapper = this.root.app.platformWrapper; const wrapper = this.root.app.platformWrapper;

@ -9,6 +9,7 @@ import { globalConfig } from "../core/config";
import { Math_random } from "../core/builtins"; import { Math_random } from "../core/builtins";
import { UPGRADES } from "./upgrades"; import { UPGRADES } from "./upgrades";
import { enumItemProcessorTypes } from "./components/item_processor"; import { enumItemProcessorTypes } from "./components/item_processor";
import { queryParamOptions } from "../core/query_parameters";
const logger = createLogger("hub_goals"); const logger = createLogger("hub_goals");
@ -98,6 +99,9 @@ export class HubGoals extends BasicSerializableObject {
if (G_IS_DEV && globalConfig.debug.allBuildingsUnlocked) { if (G_IS_DEV && globalConfig.debug.allBuildingsUnlocked) {
return true; return true;
} }
if (queryParamOptions.betaMode) {
return true;
}
return !!this.gainedRewards[reward]; return !!this.gainedRewards[reward];
} }
@ -177,6 +181,9 @@ export class HubGoals extends BasicSerializableObject {
if (G_IS_DEV && globalConfig.debug.upgradesNoCost) { if (G_IS_DEV && globalConfig.debug.upgradesNoCost) {
return true; return true;
} }
if (queryParamOptions.betaMode) {
return true;
}
const tierData = handle.tiers[currentLevel]; const tierData = handle.tiers[currentLevel];
@ -209,6 +216,8 @@ export class HubGoals extends BasicSerializableObject {
if (G_IS_DEV && globalConfig.debug.upgradesNoCost) { if (G_IS_DEV && globalConfig.debug.upgradesNoCost) {
// Dont take resources // Dont take resources
} else if (queryParamOptions.betaMode) {
// Same
} else { } else {
for (let i = 0; i < tierData.required.length; ++i) { for (let i = 0; i < tierData.required.length; ++i) {
const requirement = tierData.required[i]; const requirement = tierData.required[i];

@ -2,6 +2,7 @@ import { BaseHUDPart } from "../base_hud_part";
import { makeDiv } from "../../../core/utils"; import { makeDiv } from "../../../core/utils";
import { getStringForKeyCode } from "../../key_action_mapper"; import { getStringForKeyCode } from "../../key_action_mapper";
import { TrackedState } from "../../../core/tracked_state"; import { TrackedState } from "../../../core/tracked_state";
import { queryParamOptions } from "../../../core/query_parameters";
export class HUDKeybindingOverlay extends BaseHUDPart { export class HUDKeybindingOverlay extends BaseHUDPart {
initialize() { initialize() {
@ -71,7 +72,15 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
<code class="keybinding shift">ALT</code> <code class="keybinding shift">ALT</code>
<label>Reverse orientation</label> <label>Reverse orientation</label>
</div> </div>
` +
(queryParamOptions.betaMode
? `
<div class="binding hudToggle">
<code class="keybinding">F2</code>
<label>Toggle HUD</label>
</div>
` `
: "")
); );
} }

@ -23,7 +23,6 @@ export const defaultKeybindings = {
map_move_right: { keyCode: key("D") }, map_move_right: { keyCode: key("D") },
map_move_down: { keyCode: key("S") }, map_move_down: { keyCode: key("S") },
map_move_left: { keyCode: key("A") }, map_move_left: { keyCode: key("A") },
toggle_hud: { keyCode: 113 },
center_map: { keyCode: 32 }, center_map: { keyCode: 32 },
@ -31,6 +30,7 @@ export const defaultKeybindings = {
menu_open_stats: { keyCode: key("G") }, menu_open_stats: { keyCode: key("G") },
confirm_mass_delete: { keyCode: 46 }, // DEL confirm_mass_delete: { keyCode: 46 }, // DEL
toggle_hud: { keyCode: 113 }, // F2
}, },
toolbar: { toolbar: {

Loading…
Cancel
Save