Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity

Hide Puzzle Editor Controls in regular game mode, fix typo

Browse Source
This commit is contained in:
Даниїл Григор'єв 2021-04-30 14:20:39 +03:00
parent 569921b51a
commit 640d1065f0
No known key found for this signature in database
GPG Key ID: B890DF16341D8C1D
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/game/game_mode.js
View File

@ -47,7 +47,7 @@ export class GameMode extends BasicSerializableObject {
constructor(root) { constructor(root) {
super(); super();
this.root = root; this.root = root;
this.hiddenHurtParts = {}; this.hiddenHudParts = {};
/** @type {typeof MetaBuilding[]} */ /** @type {typeof MetaBuilding[]} */
this.hiddenBuildings = [MetaItemProducerBuilding]; this.hiddenBuildings = [MetaItemProducerBuilding];
@ -83,7 +83,7 @@ export class GameMode extends BasicSerializableObject {
* @returns {boolean} * @returns {boolean}
*/ */
isHudPartExcluded(name) { isHudPartExcluded(name) {
return this.hiddenHurtParts[name] === false; return this.hiddenHudParts[name] === false;
} }
/** /**

2
src/js/game/hud/parts/building_placer.js
View File

@ -234,7 +234,7 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic {
* @param {DrawParameters} parameters * @param {DrawParameters} parameters
*/ */
draw(parameters) { draw(parameters) {
if (this.root.camera.zoomLevel < globalConfig.mapChunkOverviewMinZoom) { if (this.root.camera.getIsMapOverlayActive()) {
// Dont allow placing in overview mode // Dont allow placing in overview mode
this.domAttach.update(false); this.domAttach.update(false);
this.variantsAttach.update(false); this.variantsAttach.update(false);

2
src/js/game/hud/parts/building_placer_logic.js
View File

@ -430,7 +430,7 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
* @param {Vector} tile * @param {Vector} tile
*/ */
tryPlaceCurrentBuildingAt(tile) { tryPlaceCurrentBuildingAt(tile) {
if (this.root.camera.zoomLevel < globalConfig.mapChunkOverviewMinZoom) { if (this.root.camera.getIsMapOverlayActive()) {
// Dont allow placing in overview mode // Dont allow placing in overview mode
return; return;
} }

2
src/js/game/modes/puzzle.js
View File

@ -32,7 +32,7 @@ export class PuzzleGameMode extends GameMode {
const data = this.getSaveData(); const data = this.getSaveData();
this.hiddenHurtParts = { this.hiddenHudParts = {
[HUDGameMenu.name]: false, [HUDGameMenu.name]: false,
[HUDMassSelector.name]: false, [HUDMassSelector.name]: false,
[HUDInteractiveTutorial.name]: false, [HUDInteractiveTutorial.name]: false,

4
src/js/game/modes/regular.js
View File

@ -13,6 +13,7 @@ import { enumGameModeIds, enumGameModeTypes, GameMode } from "../game_mode";
import { ShapeDefinition } from "../shape_definition"; import { ShapeDefinition } from "../shape_definition";
import { enumHubGoalRewards } from "../tutorial_goals"; import { enumHubGoalRewards } from "../tutorial_goals";
import { HUDPuzzleDLCLogo } from "../hud/parts/puzzle_dlc_logo"; import { HUDPuzzleDLCLogo } from "../hud/parts/puzzle_dlc_logo";
import { HUDPuzzleEditorControls } from "../hud/parts/puzzle_editor_controls";
/** @typedef {{ /** @typedef {{
* shape: string, * shape: string,
@ -516,12 +517,13 @@ export class RegularGameMode extends GameMode {
constructor(root) { constructor(root) {
super(root); super(root);
this.hiddenHurtParts = { this.hiddenHudParts = {
[HUDModeMenuBack.name]: false, [HUDModeMenuBack.name]: false,
[HUDPuzzleReview.name]: false, [HUDPuzzleReview.name]: false,
[HUDModeMenu.name]: false, [HUDModeMenu.name]: false,
[HUDModeSettings.name]: false, [HUDModeSettings.name]: false,
[HUDPuzzleDLCLogo.name]: false, [HUDPuzzleDLCLogo.name]: false,
[HUDPuzzleEditorControls.name]: false,
}; };
this.hiddenBuildings = [MetaConstantProducerBuilding, MetaGoalAcceptorBuilding]; this.hiddenBuildings = [MetaConstantProducerBuilding, MetaGoalAcceptorBuilding];