Show secondary toolbar on wires layer too

src/js/game/hud/parts/wires_toolbar.js

@@ -8,6 +8,9 @@ import { MetaVirtualProcessorBuilding } from "../../buildings/virtual_processor"
 import { MetaTransistorBuilding } from "../../buildings/transistor";
 import { MetaAnalyzerBuilding } from "../../buildings/analyzer";
 import { MetaComparatorBuilding } from "../../buildings/comparator";
+import { MetaReaderBuilding } from "../../buildings/reader";
+import { MetaFilterBuilding } from "../../buildings/filter";
+import { MetaDisplayBuilding } from "../../buildings/display";
 
 export class HUDWiresToolbar extends HUDBaseToolbar {
     constructor(root) {
@@ -16,13 +19,18 @@ export class HUDWiresToolbar extends HUDBaseToolbar {
                 MetaWireBuilding,
                 MetaWireTunnelBuilding,
                 MetaConstantSignalBuilding,
-                MetaLeverBuilding,
                 MetaLogicGateBuilding,
                 MetaVirtualProcessorBuilding,
                 MetaAnalyzerBuilding,
                 MetaComparatorBuilding,
                 MetaTransistorBuilding,
             ],
+            secondaryBuildings: [
+                MetaReaderBuilding,
+                MetaLeverBuilding,
+                MetaFilterBuilding,
+                MetaDisplayBuilding,
+            ],
             visibilityCondition: () =>
                 !this.root.camera.getIsMapOverlayActive() && this.root.currentLayer === "wires",
             htmlElementId: "ingame_HUD_wires_toolbar",

src/js/game/key_action_mapper.js

@@ -67,12 +67,11 @@ export const KEYMAPPINGS = {
         wire: { keyCode: key("1") },
         wire_tunnel: { keyCode: key("2") },
         constant_signal: { keyCode: key("3") },
-        lever_wires: { keyCode: key("4") },
+        logic_gate: { keyCode: key("4") },
-        logic_gate: { keyCode: key("5") },
+        virtual_processor: { keyCode: key("5") },
-        virtual_processor: { keyCode: key("6") },
+        analyzer: { keyCode: key("6") },
-        analyzer: { keyCode: key("7") },
+        comparator: { keyCode: key("7") },
-        comparator: { keyCode: key("8") },
+        transistor: { keyCode: key("8") },
-        transistor: { keyCode: key("9") },
     },
 
     placement: {

translations/base-en.yaml

@@ -1047,8 +1047,7 @@ keybindings:
         wire: *wire
         constant_signal: *constant_signal
         logic_gate: Logic Gate
-        lever: Switch (regular)
+        lever: *lever
-        lever_wires: Switch (wires)
         filter: *filter
         wire_tunnel: *wire_tunnel
         display: *display