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

Allow deselect through toolbar

Browse Source
This commit is contained in:
Jasper Meggitt 2020-05-20 21:45:18 -07:00
parent 2161aa680e
commit d41aa24e9d
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/js/game/hud/parts/buildings_toolbar.js
View File

@ -143,8 +143,25 @@ export class HUDBuildingsToolbar extends BaseHUDPart {
return;
}
this.root.soundProxy.playUiClick();
this.sigBuildingSelected.dispatch(metaBuilding);
this.onSelectedPlacementBuildingChanged(metaBuilding);
let previouslySelected = false;
for (const buildingId in this.buildingHandles) {
const handle = this.buildingHandles[buildingId];
if (handle.metaBuilding === metaBuilding) {
if (handle.index === this.lastSelectedIndex) {
previouslySelected = true;
}
break;
}
}
const buildingPlacer = this.root.hud.parts.buildingPlacer;
if (previouslySelected && buildingPlacer.currentMetaBuilding.get()) {
buildingPlacer.abortPlacement();
} else {
this.root.soundProxy.playUiClick();
this.sigBuildingSelected.dispatch(metaBuilding);
this.onSelectedPlacementBuildingChanged(metaBuilding);
}
}
}

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

@ -362,7 +362,9 @@ export class KeyActionMapper {
for (const key in this.keybindings) {
/** @type {Keybinding} */
const binding = this.keybindings[key];
if (binding.keyCode === keyCode /* && binding.shift === shift && binding.alt === alt */) {
/* && binding.shift === shift && binding.alt === alt */
if (binding.keyCode === keyCode && !binding.currentlyDown ) {
binding.currentlyDown = true;
/** @type {Signal} */