Merge pull request #113 from hexagonhexagon/cut-paste-blueprints

Add cut, paste options for blueprints

src/js/game/hud/hud.js

@@ -74,6 +74,7 @@ export class GameHUD {
             shapeUnpinRequested: /** @type {TypedSignal<[string]>} */ (new Signal()),
             notification: /** @type {TypedSignal<[string, enumNotificationType]>} */ (new Signal()),
             buildingsSelectedForCopy: /** @type {TypedSignal<[Array<number>]>} */ (new Signal()),
+            pasteBlueprintRequested: new Signal(),
         };
 
         if (!IS_MOBILE) {

src/js/game/hud/parts/blueprint_placer.js

@@ -29,6 +29,8 @@ export class HUDBlueprintPlacer extends BaseHUDPart {
 
         /** @type {TypedTrackedState<Blueprint?>} */
         this.currentBlueprint = new TrackedState(this.onBlueprintChanged, this);
+        /** @type {Blueprint?} */
+        this.lastBlueprintUsed = null;
 
         const keyActionMapper = this.root.keyMapper;
         keyActionMapper.getBinding(KEYMAPPINGS.general.back).add(this.abortPlacement, this);
@@ -36,9 +38,7 @@ export class HUDBlueprintPlacer extends BaseHUDPart {
             .getBinding(KEYMAPPINGS.placement.abortBuildingPlacement)
             .add(this.abortPlacement, this);
         keyActionMapper.getBinding(KEYMAPPINGS.placement.rotateWhilePlacing).add(this.rotateBlueprint, this);
-        keyActionMapper
-            .getBinding(KEYMAPPINGS.placement.abortBuildingPlacement)
-            .add(this.abortPlacement, this);
+        keyActionMapper.getBinding(KEYMAPPINGS.massSelect.pasteLastBlueprint).add(this.pasteBlueprint, this);
 
         this.root.camera.downPreHandler.add(this.onMouseDown, this);
         this.root.camera.movePreHandler.add(this.onMouseMove, this);
@@ -73,6 +73,7 @@ export class HUDBlueprintPlacer extends BaseHUDPart {
      */
     onBlueprintChanged(blueprint) {
         if (blueprint) {
+            this.lastBlueprintUsed = blueprint;
             this.costDisplayText.innerText = "" + blueprint.getCost();
         }
     }
@@ -144,6 +145,15 @@ export class HUDBlueprintPlacer extends BaseHUDPart {
         }
     }
 
+    pasteBlueprint() {
+        if (this.lastBlueprintUsed !== null) {
+            this.root.hud.signals.pasteBlueprintRequested.dispatch();
+            this.currentBlueprint.set(this.lastBlueprintUsed);
+        } else {
+            this.root.soundProxy.playUiError();
+        }
+    }
+
     /**
      *
      * @param {DrawParameters} parameters

src/js/game/hud/parts/building_placer.js

@@ -40,6 +40,7 @@ export class HUDBuildingPlacer extends BaseHUDPart {
         keyActionMapper.getBinding(KEYMAPPINGS.placement.cycleBuildingVariants).add(this.cycleVariants, this);
 
         this.root.hud.signals.buildingsSelectedForCopy.add(this.abortPlacement, this);
+        this.root.hud.signals.pasteBlueprintRequested.add(this.abortPlacement, this);
 
         this.domAttach = new DynamicDomAttach(this.root, this.element, {});
 

src/js/game/hud/parts/keybinding_overlay.js

@@ -34,15 +34,15 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
                 <code class="keybinding">${getKeycode(KEYMAPPINGS.navigation.mapMoveDown)}</code>
                 <code class="keybinding">${getKeycode(KEYMAPPINGS.navigation.mapMoveRight)}</code>
                 <label>${T.ingame.keybindingsOverlay.moveMap}</label>
-                </div>               
-                
-                
-                
+                </div>
+
+
+
             <div class="binding noPlacementOnly noOverviewOnly">
                 <code class="keybinding rightMouse"></code>
                 <label>${T.ingame.keybindingsOverlay.delete}</label>
             </div>
-                
+
             <div class="binding noPlacementOnly overviewOnly">
                 <code class="keybinding rightMouse"></code>
                 <label>${T.ingame.keybindingsOverlay.createMarker}</label>
@@ -56,13 +56,18 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
                 <code class="keybinding leftMouse"></code>
                 <label>${T.ingame.keybindingsOverlay.selectBuildings}</label>
             </div>
-            
-            
+
+            <div class="binding noPlacementOnly">
+                <code class="keybinding">${getKeycode(KEYMAPPINGS.massSelect.pasteLastBlueprint)}</code>
+                <label>${T.ingame.keybindingsOverlay.pasteLastBlueprint}</label>
+            </div>
+
+
             <div class="binding placementOnly">
                 <code class="keybinding leftMouse"></code>
                 <label>${T.ingame.keybindingsOverlay.placeBuilding}</label>
             </div>
-            
+
             <div class="binding placementOnly">
                 <code class="keybinding rightMouse"></code><i></i>
                 <code class="keybinding">${getKeycode(KEYMAPPINGS.placement.abortBuildingPlacement)}</code>

src/js/game/hud/parts/mass_selector.js

@@ -22,6 +22,9 @@ export class HUDMassSelector extends BaseHUDPart {
             .getBinding(KEYMAPPINGS.massSelect.confirmMassDelete)
             .getKeyCodeString();
         const abortKeybinding = this.root.keyMapper.getBinding(KEYMAPPINGS.general.back).getKeyCodeString();
+        const cutKeybinding = this.root.keyMapper
+            .getBinding(KEYMAPPINGS.massSelect.massSelectCut)
+            .getKeyCodeString();
         const copyKeybinding = this.root.keyMapper
             .getBinding(KEYMAPPINGS.massSelect.massSelectCopy)
             .getKeyCodeString();
@@ -32,6 +35,7 @@ export class HUDMassSelector extends BaseHUDPart {
             [],
             T.ingame.massSelect.infoText
                 .replace("<keyDelete>", `<code class='keybinding'>${removalKeybinding}</code>`)
+                .replace("<keyCut>", `<code class='keybinding'>${cutKeybinding}</code>`)
                 .replace("<keyCopy>", `<code class='keybinding'>${copyKeybinding}</code>`)
                 .replace("<keyCancel>", `<code class='keybinding'>${abortKeybinding}</code>`)
         );
@@ -54,6 +58,7 @@ export class HUDMassSelector extends BaseHUDPart {
         this.root.keyMapper
             .getBinding(KEYMAPPINGS.massSelect.confirmMassDelete)
             .add(this.confirmDelete, this);
+        this.root.keyMapper.getBinding(KEYMAPPINGS.massSelect.massSelectCut).add(this.confirmCut, this);
         this.root.keyMapper.getBinding(KEYMAPPINGS.massSelect.massSelectCopy).add(this.startCopy, this);
 
         this.domAttach = new DynamicDomAttach(this.root, this.element);
@@ -123,6 +128,49 @@ export class HUDMassSelector extends BaseHUDPart {
         }
     }
 
+    confirmCut() {
+        if (!this.root.hubGoals.isRewardUnlocked(enumHubGoalRewards.reward_blueprints)) {
+            this.root.hud.parts.dialogs.showInfo(
+                T.dialogs.blueprintsNotUnlocked.title,
+                T.dialogs.blueprintsNotUnlocked.desc
+            );
+        } else if (this.selectedUids.size > 100) {
+            const { ok } = this.root.hud.parts.dialogs.showWarning(
+                T.dialogs.massCutConfirm.title,
+                T.dialogs.massCutConfirm.desc.replace(
+                    "<count>",
+                    "" + formatBigNumberFull(this.selectedUids.size)
+                ),
+                ["cancel:good", "ok:bad"]
+            );
+            ok.add(() => this.doCut());
+        } else {
+            this.doCut();
+        }
+    }
+
+    doCut() {
+        if (this.selectedUids.size > 0) {
+            const entityUids = Array.from(this.selectedUids);
+
+            // copy code relies on entities still existing, so must copy before deleting.
+            this.root.hud.signals.buildingsSelectedForCopy.dispatch(entityUids);
+
+            for (let i = 0; i < entityUids.length; ++i) {
+                const uid = entityUids[i];
+                const entity = this.root.entityMgr.findByUid(uid);
+                if (!this.root.logic.tryDeleteBuilding(entity)) {
+                    logger.error("Error in mass cut, could not remove building");
+                    this.selectedUids.delete(uid);
+                }
+            }
+
+            this.root.soundProxy.playUiClick();
+        } else {
+            this.root.soundProxy.playUiError();
+        }
+    }
+
     /**
      * mouse down pre handler
      * @param {Vector} pos

src/js/game/key_action_mapper.js

@@ -65,7 +65,9 @@ export const KEYMAPPINGS = {
         massSelectStart: { keyCode: 17 }, // CTRL
         massSelectSelectMultiple: { keyCode: 16 }, // SHIFT
         massSelectCopy: { keyCode: key("C") },
+        massSelectCut: { keyCode: key("X") },
         confirmMassDelete: { keyCode: 46 }, // DEL
+        pasteLastBlueprint: { keyCode: key("V") },
     },
 
     placementModifiers: {

translations/base-en.yaml

@@ -234,6 +234,11 @@ dialogs:
         desc: >-
             You are deleting a lot of buildings (<count> to be exact)! Are you sure you want to do this?
 
+    massCutConfirm:
+        title: Confirm cut
+        desc: >-
+            You are cutting a lot of buildings (<count> to be exact)! Are you sure you want to do this?
+
     blueprintsNotUnlocked:
         title: Not unlocked yet
         desc: >-
@@ -270,6 +275,7 @@ ingame:
         placeBuilding: Place building
         createMarker: Create Marker
         delete: Destroy
+        pasteLastBlueprint: Paste last blueprint
 
     # Everything related to placing buildings (I.e. as soon as you selected a building
     # from the toolbar)
@@ -308,7 +314,7 @@ ingame:
     # Mass select information, this is when you hold CTRL and then drag with your mouse
     # to select multiple buildings
     massSelect:
-        infoText: Press <keyCopy> to copy, <keyDelete> to remove and <keyCancel> to cancel.
+        infoText: Press <keyCut> to cut, <keyCopy> to copy, <keyDelete> to remove and <keyCancel> to cancel.
 
     # The "Upgrades" window
     shop:
@@ -697,11 +703,13 @@ keybindings:
             Modifier: Rotate CCW instead
         cycleBuildingVariants: Cycle Variants
         confirmMassDelete: Confirm Mass Delete
+        pasteLastBlueprint: Paste last blueprint
         cycleBuildings: Cycle Buildings
 
         massSelectStart: Hold and drag to start
         massSelectSelectMultiple: Select multiple areas
         massSelectCopy: Copy area
+        massSelectCut: Cut area
 
         placementDisableAutoOrientation: Disable automatic orientation
         placeMultiple: Stay in placement mode