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

Releasing SHIFT no longer cancels the belt planner

Browse Source
This commit is contained in:
Bauke Conijn 2020-08-25 16:09:43 +02:00
parent 4bcef8e725
commit 59824e3df1
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/changelog.js
View File

@ -21,6 +21,7 @@ export const CHANGELOG = [
"Fix tunnels entrances connecting to exits sometimes when they shouldn't", "Fix tunnels entrances connecting to exits sometimes when they shouldn't",
"The initial belt planner direction is now based on the cursor movement (by MizardX)", "The initial belt planner direction is now based on the cursor movement (by MizardX)",
"Fix preferred variant not getting saved when clicking on the hud (by Danacus)", "Fix preferred variant not getting saved when clicking on the hud (by Danacus)",
"Releasing SHIFT no longer cancels the belt planner (by bcmpinc)",
], ],
}, },
{ {

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

@ -99,6 +99,12 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
*/ */
this.currentDirectionLockSideIndeterminate = true; this.currentDirectionLockSideIndeterminate = true;
/**
* Whether the player is currently drawing using direction lock.
* @type {boolean}
*/
this.currentDirectionLockDragging = false;
this.initializeBindings(); this.initializeBindings();
} }
@ -115,7 +121,6 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
.add(this.switchDirectionLockSide, this); .add(this.switchDirectionLockSide, this);
keyActionMapper.getBinding(KEYMAPPINGS.general.back).add(this.abortPlacement, this); keyActionMapper.getBinding(KEYMAPPINGS.general.back).add(this.abortPlacement, this);
keyActionMapper.getBinding(KEYMAPPINGS.placement.pipette).add(this.startPipette, this); keyActionMapper.getBinding(KEYMAPPINGS.placement.pipette).add(this.startPipette, this);
this.root.gameState.inputReciever.keyup.add(this.checkForDirectionLockSwitch, this);
// BINDINGS TO GAME EVENTS // BINDINGS TO GAME EVENTS
this.root.hud.signals.buildingsSelectedForCopy.add(this.abortPlacement, this); this.root.hud.signals.buildingsSelectedForCopy.add(this.abortPlacement, this);
@ -186,7 +191,8 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
return ( return (
metaBuilding && metaBuilding &&
metaBuilding.getHasDirectionLockAvailable() && metaBuilding.getHasDirectionLockAvailable() &&
this.root.keyMapper.getBinding(KEYMAPPINGS.placementModifiers.lockBeltDirection).pressed (this.root.keyMapper.getBinding(KEYMAPPINGS.placementModifiers.lockBeltDirection).pressed ||
this.currentDirectionLockDragging)
); );
} }
@ -243,10 +249,11 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
* Aborts any dragging * Aborts any dragging
*/ */
abortDragging() { abortDragging() {
this.currentlyDragging = true; this.currentlyDragging = false;
this.currentlyDeleting = false; this.currentlyDeleting = false;
this.initialPlacementVector = null; this.initialPlacementVector = null;
this.lastDragTile = null; this.lastDragTile = null;
this.currentDirectionLockDragging = false;
} }
/** /**
@ -372,19 +379,6 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
this.currentDirectionLockSide = 1 - this.currentDirectionLockSide; this.currentDirectionLockSide = 1 - this.currentDirectionLockSide;
} }
/**
* Checks if the direction lock key got released and if such, resets the placement
* @param {any} args
*/
checkForDirectionLockSwitch({ keyCode }) {
if (
keyCode ===
this.root.keyMapper.getBinding(KEYMAPPINGS.placementModifiers.lockBeltDirection).keyCode
) {
this.abortDragging();
}
}
/** /**
* Tries to place the current building at the given tile * Tries to place the current building at the given tile
* @param {Vector} tile * @param {Vector} tile
@ -631,8 +625,10 @@ export class HUDBuildingPlacerLogic extends BaseHUDPart {
this.currentlyDeleting = false; this.currentlyDeleting = false;
this.lastDragTile = this.root.camera.screenToWorld(pos).toTileSpace(); this.lastDragTile = this.root.camera.screenToWorld(pos).toTileSpace();
// Place initial building, but only if direction lock is not active if (this.isDirectionLockActive) {
if (!this.isDirectionLockActive) { this.currentDirectionLockDragging = true;
} else {
// Direction lock is not active. Place initial building.
if (this.tryPlaceCurrentBuildingAt(this.lastDragTile)) { if (this.tryPlaceCurrentBuildingAt(this.lastDragTile)) {
this.root.soundProxy.playUi(metaBuilding.getPlacementSound()); this.root.soundProxy.playUi(metaBuilding.getPlacementSound());
} }