Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-12-11 01:01:53 +00:00
Code Issues Projects Releases Wiki Activity

added lock option

Browse Source
This commit is contained in:
Sense101 2021-05-06 20:15:00 +01:00
parent 708c7d22fe
commit a3b51cf7f0
3 changed files with 73 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/css/ingame_hud/buildings_toolbar.scss
View File

@ -67,6 +67,14 @@
opacity: 0.15;
background-image: none !important;
&.editor {
pointer-events: all;
cursor: pointer;
&:hover {
background-color: rgba(22, 30, 68, 0.1);
}
}
&::before {
content: " ";
@ -108,6 +116,32 @@
color: #111;
}
}
.puzzle-lock {
& {
/* @load-async */
background: uiResource("locked_building.png") center center / #{D(15px)} #{D(15px)}
no-repeat;
}
display: grid;
grid-auto-flow: column;
@include S(margin-bottom, 58px);
position: absolute;
transition: all 0.12s ease-in-out;
transition-property: opacity, transform;
cursor: pointer;
pointer-events: all;
@include S(width, 15px);
@include S(height, 15px);
&:hover {
opacity: 0.5;
}
}
}
}
}

52
src/js/game/hud/parts/base_toolbar.js
View File

@ -1,6 +1,10 @@
import { gMetaBuildingRegistry } from "../../../core/global_registries";
import { STOP_PROPAGATION } from "../../../core/signal";
import { makeDiv, safeModulo } from "../../../core/utils";
import { MetaBeltBuilding } from "../../buildings/belt";
import { MetaBlockBuilding } from "../../buildings/block";
import { MetaConstantProducerBuilding } from "../../buildings/constant_producer";
import { MetaGoalAcceptorBuilding } from "../../buildings/goal_acceptor";
import { StaticMapEntityComponent } from "../../components/static_map_entity";
import { KEYMAPPINGS } from "../../key_action_mapper";
import { MetaBuilding } from "../../meta_building";
@ -108,19 +112,21 @@ export class HUDBaseToolbar extends BaseHUDPart {
);
itemContainer.setAttribute("data-icon", "building_icons/" + metaBuilding.getId() + ".png");
itemContainer.setAttribute("data-id", metaBuilding.getId());
binding.add(() => this.togglePuzzleLock(metaBuilding));
binding.add(() => this.selectBuildingForPlacement(metaBuilding));
this.trackClicks(itemContainer, () => this.selectBuildingForPlacement(metaBuilding), {
clickSound: null,
});
//new stuff
const puzzleLock = makeDiv(itemContainer, null, ["puzzle-lock"]);
puzzleLock.setAttribute("data-icon", "unlocked_building.png");
if (this.root.gameMode.getIsEditor() && !this.inRequiredBuildings(metaBuilding)) {
const puzzleLock = makeDiv(itemContainer, null, ["puzzle-lock"]);
this.trackClicks(puzzleLock, () => this.togglePuzzleLock(metaBuilding), {
clickSound: null,
});
itemContainer.classList.toggle("editor", true);
this.trackClicks(puzzleLock, () => this.toggleBuildingLock(metaBuilding), {
clickSound: null,
});
}
this.buildingHandles[metaBuilding.id] = {
metaBuilding: metaBuilding,
@ -246,6 +252,14 @@ export class HUDBaseToolbar extends BaseHUDPart {
return STOP_PROPAGATION;
}
const handle = this.buildingHandles[metaBuilding.getId()];
if (handle.puzzleLocked) {
handle.puzzleLocked = false;
handle.element.classList.toggle("unlocked", false);
this.root.soundProxy.playUiClick();
return;
}
// Allow clicking an item again to deselect it
for (const buildingId in this.buildingHandles) {
const handle = this.buildingHandles[buildingId];
@ -263,17 +277,22 @@ export class HUDBaseToolbar extends BaseHUDPart {
/**
* @param {MetaBuilding} metaBuilding
*/
togglePuzzleLock(metaBuilding) {
toggleBuildingLock(metaBuilding) {
if (!this.visibilityCondition()) {
// Not active
return;
}
if (!metaBuilding.getIsUnlocked(this.root)) {
if (this.inRequiredBuildings(metaBuilding) || !metaBuilding.getIsUnlocked(this.root)) {
this.root.soundProxy.playUiError();
return STOP_PROPAGATION;
}
const handle = this.buildingHandles[metaBuilding.getId()];
handle.puzzleLocked = !handle.puzzleLocked;
handle.element.classList.toggle("unlocked", !handle.puzzleLocked);
this.root.soundProxy.playUiClick();
const entityManager = this.root.entityMgr;
for (const entity of entityManager.getAllWithComponent(StaticMapEntityComponent)) {
const staticComp = entity.components.StaticMapEntity;
@ -288,11 +307,18 @@ export class HUDBaseToolbar extends BaseHUDPart {
if (currentMetaBuilding.get() == metaBuilding) {
currentMetaBuilding.set(null);
}
}
const handle = this.buildingHandles[metaBuilding.getId()];
handle.puzzleLocked = !handle.puzzleLocked;
handle.element.classList.toggle("unlocked", handle.puzzleLocked);
this.root.soundProxy.playUiClick();
/**
* @param {MetaBuilding} metaBuilding
*/
inRequiredBuildings(metaBuilding) {
const requiredBuildings = [
gMetaBuildingRegistry.findByClass(MetaConstantProducerBuilding),
gMetaBuildingRegistry.findByClass(MetaGoalAcceptorBuilding),
gMetaBuildingRegistry.findByClass(MetaBlockBuilding),
gMetaBuildingRegistry.findByClass(MetaBeltBuilding),
];
return requiredBuildings.includes(metaBuilding);
}
}

1
src/js/platform/api.js
View File

@ -36,7 +36,6 @@ export class ClientAPI {
if (G_IS_DEV) {
return "http://localhost:15001";
}
return "https://api-staging.shapez.io";
if (window.location.host === "beta.shapez.io") {
return "https://api-staging.shapez.io";
}