Merge branch 'master' into cut-paste-blueprints

src/js/game/hud/parts/buildings_toolbar.js

@@ -151,6 +151,11 @@ export class HUDBuildingsToolbar extends BaseHUDPart {
             return;
         }
 
+        if (this.root.camera.getIsMapOverlayActive()) {
+            this.root.soundProxy.playUiError();
+            return;
+        }
+
         // Allow clicking an item again to deselect it
         for (const buildingId in this.buildingHandles) {
             const handle = this.buildingHandles[buildingId];

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

@@ -2,6 +2,7 @@ import { makeDiv } from "../../../core/utils";
 import { T } from "../../../translations";
 import { getStringForKeyCode, KEYMAPPINGS } from "../../key_action_mapper";
 import { BaseHUDPart } from "../base_hud_part";
+import { TrackedState } from "../../../core/tracked_state";
 
 export class HUDKeybindingOverlay extends BaseHUDPart {
     initialize() {
@@ -9,6 +10,8 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
             this.onSelectedBuildingForPlacementChanged,
             this
         );
+
+        this.trackedMapOverviewActive = new TrackedState(this.applyCssClasses, this);
     }
 
     createElements(parent) {
@@ -35,11 +38,17 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
 
 
 
-            <div class="binding noPlacementOnly">
+            <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>
+            </div>
+
+
             <div class="binding noPlacementOnly">
                 <code class="keybinding builtinKey">${getKeycode(
                     KEYMAPPINGS.massSelect.massSelectStart
@@ -70,12 +79,17 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
                 <label>${T.ingame.keybindingsOverlay.rotateBuilding}</label>
             </div>
 
+            ` +
+                (this.root.app.settings.getAllSettings().alwaysMultiplace
+                    ? ""
+                    : `
             <div class="binding placementOnly">
                 <code class="keybinding builtinKey shift">${getKeycode(
                     KEYMAPPINGS.placementModifiers.placeMultiple
                 )}</code>
                 <label>${T.ingame.keybindingsOverlay.placeMultiple}</label>
-            </div>
+            </div>`) +
+                `
         `
         );
     }
@@ -84,5 +98,11 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
         this.element.classList.toggle("placementActive", !!selectedMetaBuilding);
     }
 
-    update() {}
+    applyCssClasses() {
+        this.element.classList.toggle("mapOverviewActive", this.root.camera.getIsMapOverlayActive());
+    }
+
+    update() {
+        this.trackedMapOverviewActive.set(this.root.camera.getIsMapOverlayActive());
+    }
 }

src/js/game/hud/parts/shop.js

@@ -98,7 +98,9 @@ export class HUDShop extends BaseHUDPart {
             // Set description
             handle.elemDescription.innerText = T.shopUpgrades[upgradeId].description
                 .replace("<currentMult>", currentTierMultiplier.toString())
-                .replace("<newMult>", (currentTierMultiplier + tierHandle.improvement).toString());
+                .replace("<newMult>", (currentTierMultiplier + tierHandle.improvement).toString())
+                // Backwards compatibility
+                .replace("<gain>", (tierHandle.improvement * 100.0).toString());
 
             tierHandle.required.forEach(({ shape, amount }) => {
                 const container = makeDiv(handle.elemRequirements, null, ["requirement"]);