Make ctrl/shift/alt keubindings changeable

pull/33/head
Dimava 4 years ago
parent f5f08a08e2
commit ab7584d9e9

@ -159,14 +159,14 @@ export class HUDBuildingPlacer extends BaseHUDPart {
if (
metaBuilding &&
metaBuilding.getRotateAutomaticallyWhilePlacing(this.currentVariant.get()) &&
!this.root.app.inputMgr.ctrlIsDown
!this.root.keyMapper.getBinding(KEYMAPPINGS.placementModifiers.placementDisableAutoOrientation).currentlyDown
) {
const delta = newPos.sub(oldPos);
const angleDeg = Math_degrees(delta.angle());
this.currentBaseRotation = (Math.round(angleDeg / 90) * 90 + 360) % 360;
// Holding alt inverts the placement
if (this.root.app.inputMgr.altIsDown) {
if (this.root.keyMapper.getBinding(KEYMAPPINGS.placementModifiers.placeInverse).currentlyDown) {
this.currentBaseRotation = (180 + this.currentBaseRotation) % 360;
}
}
@ -464,13 +464,16 @@ export class HUDBuildingPlacer extends BaseHUDPart {
) {
// Succesfully placed
if (metaBuilding.getFlipOrientationAfterPlacement() && !this.root.app.inputMgr.ctrlIsDown) {
if (
metaBuilding.getFlipOrientationAfterPlacement() &&
!this.root.keyMapper.getBinding(KEYMAPPINGS.placementModifiers.placementDisableAutoOrientation).currentlyDown
) {
this.currentBaseRotation = (180 + this.currentBaseRotation) % 360;
}
if (
!metaBuilding.getStayInPlacementMode() &&
!this.root.app.inputMgr.shiftIsDown &&
!this.root.keyMapper.getBinding(KEYMAPPINGS.placementModifiers.placeMultiple).currentlyDown &&
!this.root.app.settings.getAllSettings().alwaysMultiplace
) {
// Stop placement

@ -89,7 +89,7 @@ export class HUDMassSelector extends BaseHUDPart {
* @param {enumMouseButton} mouseButton
*/
onMouseDown(pos, mouseButton) {
if (!this.root.app.inputMgr.ctrlIsDown) {
if (!this.root.keyMapper.getBinding(KEYMAPPINGS.massSelect.massSelectStart).currentlyDown) {
return;
}
@ -97,7 +97,7 @@ export class HUDMassSelector extends BaseHUDPart {
return;
}
if (!this.root.app.inputMgr.shiftIsDown) {
if (!this.root.keyMapper.getBinding(KEYMAPPINGS.massSelect.massSelectSelectMultiple).currentlyDown) {
// Start new selection
this.entityUidsMarkedForDeletion = new Set();
}

@ -58,15 +58,15 @@ export const KEYMAPPINGS = {
},
massSelect: {
massSelectStart: { keyCode: 17, builtin: true }, // CTRL
massSelectSelectMultiple: { keyCode: 16, builtin: true }, // SHIFT
massSelectStart: { keyCode: 17 }, // CTRL
massSelectSelectMultiple: { keyCode: 16 }, // SHIFT
confirmMassDelete: { keyCode: key("X") },
},
placementModifiers: {
placementDisableAutoOrientation: { keyCode: 17, builtin: true }, // CTRL
placeMultiple: { keyCode: 16, builtin: true }, // SHIFT
placeInverse: { keyCode: 18, builtin: true }, // ALT
placementDisableAutoOrientation: { keyCode: 17 }, // CTRL
placeMultiple: { keyCode: 16 }, // SHIFT
placeInverse: { keyCode: 18 }, // ALT
},
};

Loading…
Cancel
Save