recipe iteration

bin/app/data/config/modules.toml

@@ -29,6 +29,7 @@ surface_mask = ["O"]
 materials = [{item = "laser_cannon_s_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 0.5
+threat_cost = 5.0
 fill_color = "#FF8040"
 glyph = "Ls"
 
@@ -47,6 +48,7 @@ surface_mask = [
 materials = [{item = "laser_cannon_m_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 2
+threat_cost = 30.0
 fill_color = "#FF8040"
 glyph = "Lm"
 
@@ -66,6 +68,7 @@ surface_mask = [
 materials = [{item = "laser_cannon_l_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 8
+threat_cost = 150.0
 fill_color = "#FF8040"
 glyph = "Ll"
 
@@ -85,6 +88,7 @@ surface_mask = ["O"]
 materials = [{item = "salvager_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 2
+threat_cost = 0.0
 fill_color = "#AACC44"
 glyph = "Sv"
 
@@ -101,6 +105,7 @@ surface_mask = ["O"]
 materials = [{item = "repair_tool_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 2
+threat_cost = 0.0
 fill_color = "#66CCFF"
 glyph = "Rp"
 
@@ -119,6 +124,7 @@ surface_mask = ["OOO"]
 materials = [{item = "afterburner_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 2
+threat_cost = 1.0
 fill_color = "#40A0FF"
 glyph = "Ab"
 
@@ -134,6 +140,7 @@ surface_mask = ["OO"]
 materials = [{item = "maneuvering_thrusters_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 2
+threat_cost = 1.0
 fill_color = "#40A0FF"
 glyph = "Mt"
 
@@ -152,6 +159,7 @@ surface_mask = ["OO"]
 materials = [{item = "armor_plates_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 3
+threat_cost = 20.0
 fill_color = "#808080"
 glyph = "A"
 
@@ -166,6 +174,7 @@ surface_mask = ["OO"]
 materials = [{item = "sensor_booster_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 2
+threat_cost = 1.0
 fill_color = "#40A0FF"
 glyph = "S"
 
@@ -186,6 +195,7 @@ surface_mask = [
 materials = [{item = "weapon_upgrade_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 4
+threat_cost = 10.0
 fill_color = "#FF4040"
 glyph = "Wu"
 
@@ -203,6 +213,7 @@ surface_mask = [
 materials = [{item = "weapon_primer_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 4
+threat_cost = 10.0
 fill_color = "#FF4040"
 glyph = "Wp"
 
@@ -220,6 +231,7 @@ surface_mask = [
 materials = [{item = "weapon_stabilizer_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 4
+threat_cost = 10.0
 fill_color = "#FF4040"
 glyph = "Ws"
 
@@ -243,6 +255,7 @@ surface_mask = [
 materials = [{item = "drone_bay_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 5
+threat_cost = 15.0
 fill_color = "#CC66FF"
 glyph = "Db"
 
@@ -256,5 +269,6 @@ surface_mask = [
 materials = [{item = "drone_hangar_module", amount = 1}]
 player_production_level = 1
 production_time_seconds = 20
+threat_cost = 100.0
 fill_color = "#9933CC"
 glyph = "Dh"

bin/app/data/config/ships.toml

@@ -14,6 +14,9 @@
 #                                  hangar; carrier fits one drone hangar (2x6)
 #                                  but no l gun (its deck rows are broken up
 #                                  by elevator shafts)
+#
+# All new hulls have threat cost_formula = "0" so enemy waves do not spawn
+# them until the balancing pass gives them real stats and default loadouts.
 
 [[ship]]
 id = "drone"
@@ -22,10 +25,13 @@ layout = ["O"]
 default_modules = [{type = "laser_cannon_s", x = 0, y = 0, rotation = "east"}]
 
 [ship.schematic]
-materials = [{item = "iron_ore", amount = 1}]
+materials = [{item = "drone_hull", amount = 1}]
 player_production_level = 1
 production_time_seconds = 5
 
+[ship.threat]
+cost_formula = "10"
+
 [ship.health]
 hp_formula = "3"
 
@@ -60,6 +66,9 @@ materials = [{item = "frigate_hull", amount = 1}]
 player_production_level = 1
 production_time_seconds = 10
 
+[ship.threat]
+cost_formula = "0"
+
 [ship.health]
 hp_formula = "30"
 
@@ -93,6 +102,9 @@ materials = [{item = "destroyer_hull", amount = 1}]
 player_production_level = 1
 production_time_seconds = 15
 
+[ship.threat]
+cost_formula = "0"
+
 [ship.health]
 hp_formula = "50"
 
@@ -128,6 +140,9 @@ materials = [{item = "cruiser_hull", amount = 1}]
 player_production_level = 1
 production_time_seconds = 25
 
+[ship.threat]
+cost_formula = "0"
+
 [ship.health]
 hp_formula = "120"
 
@@ -164,6 +179,9 @@ materials = [{item = "battlecruiser_hull", amount = 1}]
 player_production_level = 1
 production_time_seconds = 35
 
+[ship.threat]
+cost_formula = "0"
+
 [ship.health]
 hp_formula = "180"
 
@@ -203,6 +221,9 @@ materials = [{item = "battleship_hull", amount = 1}]
 player_production_level = 1
 production_time_seconds = 60
 
+[ship.threat]
+cost_formula = "0"
+
 [ship.health]
 hp_formula = "350"
 
@@ -241,6 +262,9 @@ materials = [{item = "dreadnought_hull", amount = 1}]
 player_production_level = 1
 production_time_seconds = 120
 
+[ship.threat]
+cost_formula = "0"
+
 [ship.health]
 hp_formula = "800"
 
@@ -278,6 +302,9 @@ materials = [{item = "carrier_hull", amount = 1}]
 player_production_level = 1
 production_time_seconds = 120
 
+[ship.threat]
+cost_formula = "0"
+
 [ship.health]
 hp_formula = "700"
 

bin/test/data/config/modules.toml

@@ -5,6 +5,7 @@ surface_mask = ["OO"]
 materials = [{item = "iron_ingot", amount = 2}]
 player_production_level = 1
 production_time_seconds = 3
+threat_cost = 2.0
 fill_color = "#808080"
 glyph = "A"
 
@@ -18,6 +19,7 @@ surface_mask = ["O"]
 materials = [{item = "circuit_board", amount = 1}]
 player_production_level = 1
 production_time_seconds = 2
+threat_cost = 1.0
 fill_color = "#40A0FF"
 glyph = "S"
 
@@ -31,6 +33,7 @@ surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}, {item = "circuit_board", amount = 1}]
 player_production_level = 1
 production_time_seconds = 4
+threat_cost = 3.0
 fill_color = "#FF4040"
 glyph = "W"
 
@@ -44,6 +47,7 @@ surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
 player_production_level = 1
 production_time_seconds = 5
+threat_cost = 5.0
 fill_color = "#FF8040"
 glyph = "L"
 
@@ -59,6 +63,7 @@ surface_mask = ["OO"]
 materials = [{item = "iron_ingot", amount = 2}]
 player_production_level = 1
 production_time_seconds = 5
+threat_cost = 0.0
 fill_color = "#AACC44"
 glyph = "Sv"
 
@@ -74,6 +79,7 @@ surface_mask = ["O"]
 materials = [{item = "circuit_board", amount = 2}]
 player_production_level = 1
 production_time_seconds = 5
+threat_cost = 0.0
 fill_color = "#66CCFF"
 glyph = "Rp"
 
@@ -88,6 +94,7 @@ surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
 player_production_level = 1
 production_time_seconds = 4
+threat_cost = 1.0
 fill_color = "#FF4040"
 glyph = "Wp"
 
@@ -101,6 +108,7 @@ surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
 player_production_level = 1
 production_time_seconds = 4
+threat_cost = 1.0
 fill_color = "#FF4040"
 glyph = "Ws"
 
@@ -115,6 +123,7 @@ surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
 player_production_level = 1
 production_time_seconds = 2
+threat_cost = 1.0
 fill_color = "#40A0FF"
 glyph = "Ab"
 
@@ -129,6 +138,7 @@ surface_mask = ["O"]
 materials = [{item = "iron_ingot", amount = 1}]
 player_production_level = 1
 production_time_seconds = 2
+threat_cost = 1.0
 fill_color = "#40A0FF"
 glyph = "Mt"
 

bin/test/data/config/ships.toml

@@ -9,6 +9,9 @@ materials = [{item = "iron_ingot", amount = 3}, {item = "circuit_board", amount
 player_production_level = 3
 production_time_seconds = 10
 
+[ship.threat]
+cost_formula = "5 + 1*x"
+
 [ship.health]
 hp_formula = "40 + 5*x"
 
@@ -37,6 +40,9 @@ materials = [{item = "iron_ingot", amount = 5}, {item = "circuit_board", amount
 player_production_level = 5
 production_time_seconds = 20
 
+[ship.threat]
+cost_formula = "10 + 2*x"
+
 [ship.health]
 hp_formula = "120 + 15*x"
 
@@ -64,6 +70,9 @@ materials = [{item = "iron_ingot", amount = 4}]
 player_production_level = 3
 production_time_seconds = 10
 
+[ship.threat]
+cost_formula = "0"
+
 [ship.health]
 hp_formula = "40 + 4*x"
 
@@ -91,6 +100,9 @@ materials = [{item = "iron_ingot", amount = 4}, {item = "circuit_board", amount
 player_production_level = 3
 production_time_seconds = 15
 
+[ship.threat]
+cost_formula = "0"
+
 [ship.health]
 hp_formula = "60 + 5*x"
 

docs/architecture.md

@@ -59,43 +59,23 @@ Simulation types shared across subsystems:
 - `Item` — `struct Item { ItemType type; }`. Items on belts have no persistent identity across ticks.
 - `Port` — `struct Port { QPoint tile; Rotation direction; }`. Identifies a belt-adjacent cell and the direction of flow across that cell.
 - `MovementIntent` — `struct MovementIntent { int priority; QVector2D target; }`. Priority follows the order declared under Movement Arbitration. Cleared at the start of each tick; the highest-priority write wins; `tickMovement` reads the winner.
-- `WeaponFiredEvent` — `struct WeaponFiredEvent : public Event { entt::entity shooter; entt::entity target; Tick emittedAt; }`. Transient record emitted each time a weapon fires (REQ-SHP-FIRING, REQ-SHP-FIRING-BEAM). Buffered in a sim-owned vector during the tick, then drained and re-emitted via EventManager by the UI frame handler; see Sim → UI Events.
-- `SchematicChoiceOption` — `struct SchematicChoiceOption { string schematicId; SchematicType type; string displayName; bool isNewUnlock; int targetLevel; }`. Describes one option in the schematic choice dialog (REQ-DEF-SCHEMATIC-DROP). Up to three are generated when an enemy station set is destroyed. `SchematicType` is `Ship`, `Module`, or `Recipe`.
-- `SchematicChoicesAvailableEvent` — EventManager event carrying a `vector<SchematicChoiceOption>`. Sent by the UI each frame when pending choices are detected; handled by `MainWindow` which opens the schematic choice dialog.
+- `FireEvent` — `struct FireEvent { EntityId shooter; EntityId target; Tick emittedAt; }`. Transient record emitted each time a weapon fires (REQ-SHP-FIRING, REQ-SHP-FIRING-BEAM). Buffered in a sim-owned queue and drained by the renderer; see Sim → UI Events.
+- `SchematicDropEvent` — `struct SchematicDropEvent { ShipSchematicId schematic; int newLevel; bool wasNewUnlock; }`. Emitted when a destroyed enemy-defence-station set awards a schematic (REQ-DEF-SCHEMATIC-DROP). The UI renders a toast (REQ-UI-SCHEMATIC-TOAST); `wasNewUnlock` chooses between the "unlocked" and "level → N" wording.
 
-## Event System
+## Sim → UI Events
 
-All inter-component communication — both sim→UI and UI→UI — uses a unified `EventManager`/`EventHandler` system. No custom Qt signals/slots are used for inter-widget communication.
+The sim owns a small set of per-frame event queues that the UI drains on each render. These carry one-shot signals that are not derivable from persistent state — currently weapon fires (REQ-SHP-FIRING-BEAM) and schematic drops (REQ-UI-SCHEMATIC-TOAST). Additional event types can be added here later (e.g., building-complete, unit-death flashes) without changing the pattern.
 
-### EventManager
+Implementation: a plain `std::vector<FireEvent>` owned by `Simulation`, one vector per event type. Combat resolution (tick-order step 8) appends to it. The UI calls `simulation.drainFireEvents()` once per rendered frame, which returns the accumulated vector by move and clears the internal one. Beams are tracked by the renderer for 0.3 s of wall time (9 ticks at 30 Hz) using the events' `emittedAt` tick, then discarded. If either the shooter or target entity is gone when the renderer looks them up, the beam is dropped early.
 
-`EventManager` is a singleton (`EventManager::getInstance()`) that routes events to registered handlers.
+We deliberately do **not** use `QObject` signals/slots or `QEvent`:
 
-- `sendEventImmediately(shared_ptr<Event>)` — synchronous dispatch to all handlers of the event's type.
-- `addEvent(shared_ptr<Event>)` — queues the event for later batch processing.
-- `processEvents()` — drains the queue, dispatching each event to its handlers.
+- **Determinism.** A plain ordered vector preserves tick-order exactly; the queue is part of per-tick state, inspectable in tests.
+- **Sim/UI seam.** The sim exposes pull-style access only; the UI never subscribes into the sim, keeping the simulation/presentation split clean.
+- **Headless testability.** Catch2 tests read the queue directly after `tick()`; no event loop, no `QApplication`.
+- **Zero overhead.** Sim types remain plain structs — no `QObject`, no moc, no signal dispatch machinery.
 
-The EventManager is thread-safe (mutex-guarded).
-
-### EventHandler
-
-`EventHandler<T>` is a CRTP-style template that a class inherits to receive events of type `T`. It provides `registerForEvent()` / `unregisterForEvent()` and requires an override of `handleEvent(shared_ptr<const T>)`.
-
-`CombinedEventHandler<Ts...>` is a variadic template for classes that handle multiple event types. It provides `registerForEvents()` / `unregisterForEvents()` and requires one `handleEvent` override per type.
-
-### Sim → UI Events
-
-The simulation layer stays free of EventManager — it uses a plain `std::vector<WeaponFiredEvent>` internally (owned by `CombatSystem`). This preserves determinism, tick-order fidelity, and headless testability (Catch2 tests read the queue directly via `drainWeaponFiredEvents()` after `tick()`).
-
-The UI frame handler (`GameWorldView::onFrame` / `ArenaView::onFrame`) bridges the gap: each frame it calls `simulation.drainWeaponFiredEvents()`, then re-emits each `WeaponFiredEvent` via `EventManager::sendEventImmediately()`. Subscribers (the same view's `handleEvent(WeaponFiredEvent)`) create `ActiveBeam` records tracked for 0.3 s of wall time, then discarded. If either the shooter or target entity is gone when the renderer looks them up, the beam is dropped early.
-
-Schematic drops: when an enemy station set is destroyed, the simulation generates up to 3 `SchematicChoiceOption` entries and stores them as pending state. The UI polls `hasSchematicChoicesPending()` each frame and, when true, sends a `SchematicChoicesAvailableEvent` via EventManager. `MainWindow` handles this event by pausing the game and opening a modal `SchematicChoiceDialog`. The player's selection is fed back via `applySchematicChoice(index)`.
-
-### UI Events
-
-All UI interactions — building selection, builder/blueprint mode transitions, speed changes, demolish mode, escape menu, layout dialog requests — are communicated via EventManager events rather than Qt signals/slots. Each event is a small struct inheriting `Event` (e.g., `SelectionChangedEvent`, `BuildingTypeSelectedEvent`, `SpeedChangeRequestedEvent`). Widgets register as `CombinedEventHandler` for the events they care about and emit events via `EventManager::sendEventImmediately()`.
-
-Bidirectional interactions use separate request/notification event types to avoid infinite recursion (e.g., `ExitBuilderModeRequestedEvent` from `BuildButtonGrid` → `GameWorldView`, vs. `BuilderModeExitedEvent` from `GameWorldView` → `BuildButtonGrid`).
+If the number of event types grows past a handful, we can wrap them in a small `EventQueue<T>` template, still owned by the sim. Signals/slots would only be warranted if we needed multiple independent subscribers or cross-thread dispatch, and we need neither.
 
 ## Tick Order
 
@@ -108,8 +88,8 @@ Within a single simulation tick, subsystems run in this fixed order. The order i
 5. **Building → belt push** — buildings push items from output buffer onto the belt tile at their output port (REQ-MAT-OUTPUT-PORT).
 6. **Belt tick** — advance items along belt tiles; apply splitter routing (REQ-BLD-SPLITTER).
 7. **Ship behavior systems** — clear `MovementIntent` on each ship, then run `tickThreatResponse`, `tickScrapCollector`, `tickRepairBehavior`, `tickHomeReturn` in any order (arbitration is via intent priority).
-8. **Combat resolution** — ships and defence stations acquire targets, fire, apply damage; queue deaths. Each fire appends a `WeaponFiredEvent` to the sim's weapon-fired-event queue (REQ-SHP-FIRING-BEAM).
-9. **Deaths & loot** — process queued deaths: drop scrap (REQ-RES-SCRAP-DROP); if a full enemy-defence-station set was destroyed this tick, generate up to 3 schematic choice options (REQ-DEF-SCHEMATIC-DROP) stored as pending state for the UI to present; remove entities.
+8. **Combat resolution** — ships and defence stations acquire targets, fire, apply damage; queue deaths. Each fire appends a `FireEvent` to the sim's fire-event queue (REQ-SHP-FIRING-BEAM).
+9. **Deaths & loot** — process queued deaths: drop scrap (REQ-RES-SCRAP-DROP); if a full enemy-defence-station set was destroyed this tick, award one schematic (REQ-DEF-SCHEMATIC-DROP) and append a `SchematicDropEvent`; remove entities.
 10. **`tickMovement`** — advance ship positions based on final `MovementIntent`.
 11. **Scrap despawn** — decrement scrap timers; remove expired scrap (REQ-RES-SCRAP-DROP).
 
@@ -300,7 +280,7 @@ The game world is rendered by a single `GameWorldView` widget that inherits `QOp
 
 ### Threading
 
-Sim and UI run on the same thread for v1. `paintEvent` reads sim state directly without locks. If profiling later justifies moving the sim to a worker thread, the pull-style `drainWeaponFiredEvents()` / `getPendingSchematicChoices()` / `applySchematicChoice()` / `forEachVisualItem()` APIs already support a clean snapshot-and-render split; a single mutex at the sim boundary would suffice. The `ArenaSimulation` used by the balancing tool runs headlessly on a worker thread; fire events accumulate in its internal vector and are only drained when `ArenaView` drives `tickOnce()` on the main thread during interactive inspection.
+Sim and UI run on the same thread for v1. `paintEvent` reads sim state directly without locks. If profiling later justifies moving the sim to a worker thread, the pull-style `drainFireEvents()` / `drainSchematicDropEvents()` / `forEachVisualItem()` APIs already support a clean snapshot-and-render split; a single mutex at the sim boundary would suffice.
 
 ### Layer Order (back to front)
 
@@ -309,9 +289,9 @@ Sim and UI run on the same thread for v1. `paintEvent` reads sim state directly
 3. **Belt items** — 10×10 colored squares emitted by `BeltSystem::forEachVisualItem`.
 4. **Scrap** — glyphs at world positions.
 5. **Ships** — colored arrows oriented by velocity; color keyed to role (player combat / salvage / repair / enemy).
-6. **Laser beams** — lines derived from live `WeaponFiredEvent`s kept by the renderer for 0.3 s (REQ-SHP-FIRING-BEAM).
+6. **Laser beams** — lines derived from live `FireEvent`s kept by the renderer for 0.3 s (REQ-SHP-FIRING-BEAM).
 7. **Build overlays** — ghost in builder mode (REQ-BLD-GHOST), demolish-mode tint, tile highlight under cursor, box-drag selection rectangle.
-8. **Screen-space UI** — screen-anchored elements, drawn after resetting the world-space transform.
+8. **Screen-space UI** — schematic toasts (REQ-UI-SCHEMATIC-TOAST) and any other screen-anchored elements, drawn after resetting the world-space transform.
 
 ### Coordinates and Scrolling
 

docs/requirements.md

@@ -7,8 +7,8 @@ Config files use the TOML format. The following config files drive game paramete
 - **world.toml** — world dimensions, region widths, expansion amounts, building refund percentage, wave timing, boss wave timing, enemy ship level formula, belt speed, starting building blocks, departure interval.
 - **buildings.toml** — building block cost and construction time per building type.
 - **recipes.toml** — crafting recipes: inputs, outputs, quantities, durations, and reprocessing plant probabilities. Assembler recipe entries may optionally define `unlock_at_station_level` (integer): -1 means the recipe is explicitly unlocked at game start; a value ≥ 0 means the recipe starts locked and a schematic for it can be awarded via defence station destruction (see REQ-LOCK-EXPLICIT, REQ-DEF-SCHEMATIC-DROP).
-- **ships.toml** — per schematic: a human-readable display name (used in the UI), hull stats (HP, max linear speed, sensor range, main acceleration, maneuvering acceleration, angular acceleration, max rotation speed) as formulas of ship level, required build materials, player production level, the station level at which the schematic becomes available for unlock (`unlock_at_station_level`; -1 means the player starts with the schematic already unlocked), a layout grid defining the ship's module slots, a `scrap_drop` loot value, and a `default_modules` list used for enemy wave ships (see REQ-WAV-DEFAULT-MODULES).
-- **modules.toml** — per module type: id, surface mask, materials list, initial player production level, production time, fill color, glyph, the station level at which the schematic becomes available for unlock (`unlock_at_station_level`; -1 means the player starts with the module schematic already unlocked), and an optional capability section and/or stat modifier formulas. A module with a capability section (`[module.weapon]`, `[module.salvage]`, or `[module.repair]`) containing base stat formulas is a **capability module** that grants the ship a weapon, salvage bay, or repair tool per instance (see REQ-MOD-CONFIG for the full list of formulas per capability type). A module with only `added_*`/`multiplied_*` formulas is a **passive module** that modifies stats on the ship or on capability module instances (see REQ-MOD-STAT-CALC).
+- **ships.toml** — per schematic: a human-readable display name (used in toasts and UI), hull stats (HP, max linear speed, sensor range, main acceleration, maneuvering acceleration, angular acceleration, max rotation speed) as formulas of ship level, required build materials, threat cost formula, player production level, the station level at which the schematic becomes available for unlock (`unlock_at_station_level`; -1 means the player starts with the schematic already unlocked), a layout grid defining the ship's module slots, and a `default_modules` list used for enemy wave ships (see REQ-WAV-DEFAULT-MODULES).
+- **modules.toml** — per module type: id, surface mask, materials list, initial player production level, production time, threat cost, fill color, glyph, the station level at which the schematic becomes available for unlock (`unlock_at_station_level`; -1 means the player starts with the module schematic already unlocked), and an optional capability section and/or stat modifier formulas. A module with a capability section (`[module.weapon]`, `[module.salvage]`, or `[module.repair]`) containing base stat formulas is a **capability module** that grants the ship a weapon, salvage bay, or repair tool per instance (see REQ-MOD-CONFIG for the full list of formulas per capability type). A module with only `added_*`/`multiplied_*` formulas is a **passive module** that modifies stats on the ship or on capability module instances (see REQ-MOD-STAT-CALC).
 - **stations.toml** — HP, damage, range, fire rate, and scrap drop for player and enemy defence stations, defined as formulas of station level.
 - **visuals.toml** — rendering-only config (not game parameters): fill and outline colors and glyphs for every building type, item type, ship schematic, and station type; beam color and width; overlay and toast colors. Loaded by the UI at startup; the simulation does not read it.
 - **ship_layouts.toml** — named layout blueprints per ship type; written and read by the application to persist the layout blueprint panel (REQ-MOD-UI-BLUEPRINT-PANEL through REQ-MOD-UI-BLUEPRINT-FILE-LOAD). Not a game parameter file; the simulation does not read it.
@@ -169,7 +169,7 @@ Modules in `modules.toml` define a `surface_mask` — a list of strings that des
 
   Each repair module instance operates independently: it has its own repair rate (`repair_rate`) and repair range (`repair_range`). On each tick, a module first attempts to heal the ship's current behavior-level navigation target if that target is within the module's `repair_range` and is damaged (HP above zero and below maximum HP). If those conditions are not met — because the target is out of the module's `repair_range`, already at full health, or destroyed — the module independently searches for the nearest damaged friendly (player ship or player defence station) within its own `repair_range` and heals that instead. If no valid target is found within range, the module idles. A ship with multiple repair modules can therefore heal different targets simultaneously. Navigation is driven solely by the behavior-level target; individual module fallback targets do not affect which direction the ship moves.
 - REQ-SHP-ENEMY-AI: **Enemy ships** — engage the closest valid target (player defence station, HQ, or player ship) within their sensor range. If no target is in sensor range, they move toward the asteroid (leftward in world coordinates).
-- REQ-SHP-SCHEMATICS: The player selects a schematic per shipyard by clicking it. New schematics are unlocked by destroying enemy defence station sets (REQ-DEF-SCHEMATIC-DROP) — there is no physical loot to collect.
+- REQ-SHP-SCHEMATICS: The player selects a schematic per shipyard by clicking it. New schematics are unlocked automatically when an enemy defence station set is destroyed (REQ-DEF-SCHEMATIC-DROP) — there is no physical loot to collect.
 
 ## Ship Modules
 
@@ -182,6 +182,7 @@ Modules in `modules.toml` define a `surface_mask` — a list of strings that des
   - `player_production_level` — initial level for this module type; used as `x` in its stat formulas. Incremented by 1 on each duplicate schematic drop (REQ-DEF-SCHEMATIC-DROP).
   - `unlock_at_station_level` — the enemy defence station level at which this module's schematic becomes available for unlock; -1 means the player starts with the module schematic already unlocked.
   - `production_time_seconds` — time added to the ship's production cycle per instance.
+  - `threat_cost` — threat cost added to the ship's threat cost per instance.
   - `fill_color` — fill color used to render this module's cells in the layout grid.
   - `glyph` — single character rendered on this module's cells in the layout grid and preview widget.
   - An optional **capability section** (`[module.weapon]`, `[module.salvage]`, or `[module.repair]`) containing base stat formulas. A module with base stat formulas is a capability module — each placed instance grants the ship an independent weapon, salvage bay, or repair tool with its own state (cooldown, target, cargo). A ship may have multiple capability module instances of the same or different types. Base stat formulas per capability type:
@@ -202,19 +203,7 @@ Modules in `modules.toml` define a `surface_mask` — a list of strings that des
 
 - REQ-MOD-MATERIALS: The total materials required to build a ship are the union of the ship's base `[ship.schematic].materials` and the `materials` of every module instance in the configured layout. Quantities of the same item type are summed.
 - REQ-MOD-PRODUCTION-TIME: The total production time is the ship's base `[ship.schematic].production_time_seconds` plus the sum of `production_time_seconds` for every module instance in the configured layout.
-- REQ-MOD-THREAT: The threat cost of a ship is dynamically derived from the accumulated total production time required to produce that ship from scratch. One second of production time equals one threat. The total production time is the sum of:
-  1. The ship's base `production_time_seconds`.
-  2. The `production_time_seconds` of every module instance in the configured layout.
-  3. For every material required (the union of the ship's base materials and all module instance materials, with quantities summed per item type): the recursive production time of that material multiplied by the required quantity (see REQ-THREAT-ITEM).
-
-- REQ-THREAT-ITEM: The threat value of an item type (in seconds) is determined by the recipe that produces it:
-  - **Miner recipe**: the recipe's `duration_seconds`.
-  - **Smelter recipe**: the recipe's `duration_seconds` plus the sum of each input's threat value multiplied by that input's required quantity.
-  - **Assembler recipe**: the recipe's `duration_seconds` plus the sum of each input's threat value multiplied by that input's required quantity.
-  - **Reprocessing-only item** (an item type that has no miner, smelter, or assembler recipe producing it, and is only obtainable via reprocessing): `(scrap_threat × scrap_per_cycle + duration_seconds) / probability`, where `scrap_threat` is the threat value of scrap (see REQ-THREAT-SCRAP), `scrap_per_cycle` is the number of scrap consumed per reprocessing cycle, `duration_seconds` is the reprocessing cycle time, and `probability` is the normalized weight of that item in the reprocessing output pool.
-  - **Multiple recipes**: if an item type can be produced by more than one non-reprocessing recipe (miner, smelter, or assembler), its threat value is the **maximum** across all such recipes. The reprocessing path is only used when no other recipe exists.
-
-- REQ-THREAT-SCRAP: The threat value of scrap is derived from the ship schematic with the smallest configured `scrap_drop` value (from `ships.toml [ship.loot].scrap_drop`). Scrap threat = that ship's threat cost (REQ-MOD-THREAT) / that ship's `scrap_drop` value. If multiple schematics share the same smallest `scrap_drop`, any one of them may be used.
+- REQ-MOD-THREAT: The total threat cost of a ship is the ship's base `[ship.threat].cost_formula` evaluated at the ship's level, plus the sum of `threat_cost` for every module instance in the configured layout.
 - REQ-MOD-STAT-CALC: For each stat (on the ship hull or on a capability module instance), the final value is computed as: `final = base × total_multiplier + total_additive`, where:
   - `base` is the stat's base formula evaluated at the ship's production level (for hull stats) or at the capability module's `player_production_level` (for capability module stats).
   - `total_multiplier` = 1 + sum of (m_i − 1) for each multiplicative modifier m_i from all passive module instances. Each m_i is evaluated from the module's multiplicative formula at the module's `player_production_level`.
@@ -258,8 +247,6 @@ Modules in `modules.toml` define a `surface_mask` — a list of strings that des
 
   All capability module stat values incorporate passive modifiers targeting the relevant capability category per REQ-MOD-STAT-CALC. Each capability module instance uses its own `player_production_level` for formula evaluation.
 
-  While debug draw mode is active (REQ-UI-DEBUG-DRAW), the panel additionally shows the ship's derived threat cost (REQ-MOD-THREAT) for the current layout configuration. This value updates in real time as modules are placed or removed.
-
 - REQ-MOD-UI-LAYOUT-SIZE: Ship layouts are small enough to display in the layout configuration dialog without scrolling (maximum grid size fits within the dialog).
 
 ### Layout Blueprints
@@ -283,24 +270,13 @@ Modules in `modules.toml` define a `surface_mask` — a list of strings that des
 - REQ-DEF-ENEMY-FIRE: Enemy defence stations automatically fire at player ships within range.
 - REQ-DEF-NO-CROSSFIRE: Enemy and player defence stations are never in each other's firing range.
 - REQ-DEF-PUSH: When both enemy defence stations in a set are destroyed, the boss countdown is advanced (REQ-WAV-BOSS-ADVANCE), the scrollable area is extended (REQ-GW-PUSH-EXPAND), a new set of enemy defence stations is placed at the new boundary, and exactly one schematic drop is awarded for the destroyed set (REQ-DEF-SCHEMATIC-DROP).
-- REQ-DEF-SCHEMATIC-DROP: Each destroyed set of enemy defence stations awards exactly one schematic drop (not one per station). The drop opens a **schematic choice dialog** — a modal dialog that pauses the game (speed set to 0×; on close, speed is restored to what it was before the dialog opened). Up to three schematic options are drawn uniformly at random **without replacement** from the eligible drop pool. If the pool contains fewer than three entries, only that many options are shown. The eligible drop pool contains:
+- REQ-DEF-SCHEMATIC-DROP: Each destroyed set of enemy defence stations awards exactly one schematic drop (not one per station). The drop is automatic — no physical item to collect. A schematic is chosen uniformly at random from the eligible drop pool, which contains:
   - All **ship schematics** and **module schematics** whose `unlock_at_station_level` is -1 or is ≤ the level of the destroyed station set.
   - All **assembler recipe schematics** whose `unlock_at_station_level` is ≥ 0 and ≤ the level of the destroyed station set, whose output item is currently implicitly unlocked (REQ-LOCK-IMPLICIT), and which have not yet been awarded.
 
-  Each option in the dialog displays: the schematic name (ship `display_name` from `ships.toml`, module `id` from `modules.toml`, or the output item type for assembler recipes), the schematic type (ship, module, or assembler recipe), and whether selecting it would be a **new unlock** or a **level-up** (showing the target level for level-ups). Assembler recipe schematics are always new unlocks since they are removed from the pool once awarded.
+  For a **ship or module schematic** drop: if the player does not yet have the schematic, it is unlocked (ship schematics unlock the corresponding shipyard selection; module schematics unlock the module type for placement in the layout configuration dialog (REQ-MOD-UI-DIALOG)). If the player already has it, the schematic's `player_production_level` is incremented by 1 — for ship schematics, subsequent ships of that type are produced at a higher level; for module schematics, all instances of that module type use the higher level in their stat formulas. The player is notified via a toast (REQ-UI-SCHEMATIC-TOAST).
 
-  Each option additionally displays a vertical list of item names labeled "Unlocks recipes for:", showing which recipes would newly become implicitly unlocked (REQ-LOCK-IMPLICIT) if this option were selected — specifically, the output items of miner recipes and assembler recipes (without `unlock_at_station_level`) that are not currently implicitly unlocked but would become so after applying this option's effect:
-  - For a ship or module schematic that would be a **new unlock**, its `materials` are added to the base set per REQ-LOCK-IMPLICIT step 1a before recomputation.
-  - For a ship or module schematic **level-up**, the implicit unlock set is unchanged, so the list is always empty.
-  - For an assembler recipe schematic, its output item is added to the base set per REQ-LOCK-IMPLICIT step 1b before recomputation.
-
-  Item names are deduplicated and sorted alphabetically. If no recipes would be newly unlocked, the list shows "None".
-
-  The player selects one option by clicking it. The selected schematic is applied and the dialog closes:
-
-  For a **ship or module schematic**: if the player does not yet have the schematic, it is unlocked (ship schematics unlock the corresponding shipyard selection; module schematics unlock the module type for placement in the layout configuration dialog (REQ-MOD-UI-DIALOG)). If the player already has it, the schematic's `player_production_level` is incremented by 1 — for ship schematics, subsequent ships of that type are produced at a higher level; for module schematics, all instances of that module type use the higher level in their stat formulas.
-
-  For an **assembler recipe schematic**: the recipe is explicitly unlocked and becomes available in the assembler recipe-selection dropdown (subject to REQ-LOCK-UI-RECIPE). The schematic is removed from the drop pool permanently (REQ-LOCK-EXPLICIT). The implicit unlock set is recomputed (REQ-LOCK-IMPLICIT).
+  For an **assembler recipe schematic** drop: the recipe is explicitly unlocked and becomes available in the assembler recipe-selection dropdown (subject to REQ-LOCK-UI-RECIPE). The schematic is removed from the drop pool permanently (REQ-LOCK-EXPLICIT). The implicit unlock set is recomputed (REQ-LOCK-IMPLICIT). No toast is shown.
 
 ## Progression & Locking
 
@@ -327,8 +303,8 @@ Modules in `modules.toml` define a `surface_mask` — a list of strings that des
 - REQ-WAV-BOSS-COUNTER: A global **boss wave counter** `x` starts at 1 at game start and increments by 1 immediately after each boss wave fires. It represents the current boss wave cycle number and is used as the variable in the threat rate and ship level formulas.
 - REQ-WAV-THREAT-RATE: A global **threat level** accumulates continuously over real game time. The rate of increase per second is determined by `world.toml [waves].threat_rate_formula` where `x` is the boss wave counter (REQ-WAV-BOSS-COUNTER), clamped to a minimum of 0 (negative formula values are treated as 0). The rate is constant within each boss wave cycle and steps up each time `x` increments. Threat accumulation is paused during quiet windows (REQ-WAV-QUIET). Example: `1*x - 30` yields 0 threat/s when x ≤ 30 and increases linearly beyond that.
 - REQ-WAV-GAP: At game start and immediately after each normal wave is triggered, a random inter-wave gap is drawn uniformly from [`world.toml [waves].gap_min_seconds`, `gap_max_seconds`]. The gap timer does not advance while inside a quiet window (REQ-WAV-QUIET); if a gap would expire inside a quiet window, its expiry is deferred until the quiet window ends.
-- REQ-WAV-TRIGGER: When the gap timer expires outside a quiet window, a normal wave is triggered. Ships are selected one at a time: from all schematics whose threat cost (REQ-MOD-THREAT) is > 0, uniformly randomly pick one whose cost fits the remaining threat budget. For wave ship selection, the threat cost is computed using the schematic's `default_modules` layout (REQ-WAV-DEFAULT-MODULES). Repeat until no eligible schematic fits. Any remaining threat carries over to the next normal wave. A longer gap results in a larger wave.
-- REQ-WAV-SHIP-LEVEL: Each wave's (normal and boss) enemy ships are assigned a level determined by `world.toml [waves].ship_level_formula` where `x` is the boss wave counter (REQ-WAV-BOSS-COUNTER). Per-ship stats are computed from the ship level via the formulas in `ships.toml` (see REQ-SHP-STATS). Threat cost is level-independent (REQ-MOD-THREAT).
+- REQ-WAV-TRIGGER: When the gap timer expires outside a quiet window, a normal wave is triggered. Ships are selected one at a time: from all schematics whose `threat.cost_formula` evaluates to > 0 at the current enemy ship level, uniformly randomly pick one whose cost fits the remaining threat budget. Repeat until no eligible schematic fits. Any remaining threat carries over to the next normal wave. A longer gap results in a larger wave. Because enemy ship level increases with the boss wave counter (REQ-WAV-SHIP-LEVEL), threat cost per ship rises as the game progresses.
+- REQ-WAV-SHIP-LEVEL: Each wave's (normal and boss) enemy ships are assigned a level determined by `world.toml [waves].ship_level_formula` where `x` is the boss wave counter (REQ-WAV-BOSS-COUNTER). Per-ship stats and threat cost are computed from the ship level via the formulas in `ships.toml` (see REQ-SHP-STATS).
 - REQ-WAV-BOSS-COUNTDOWN: A **boss countdown** timer starts at `world.toml [waves].boss_countdown_seconds` (default 300) at game start and counts down continuously in real game-time seconds. It is not paused during quiet windows. When it reaches 0, a boss wave is triggered (REQ-WAV-BOSS-TRIGGER). Immediately after the boss wave fires, `x` increments (REQ-WAV-BOSS-COUNTER) and a fresh countdown starts at the same configured value.
 - REQ-WAV-BOSS-ADVANCE: When the player destroys a set of enemy defence stations, the boss countdown is reduced by `world.toml [push].boss_advance_seconds` (default 60), clamped to a minimum of 0. Threat that would have accumulated during the skipped time is not added. If the countdown reaches 0 by this reduction, the boss wave is triggered immediately.
 - REQ-WAV-QUIET: A **quiet window** suppresses normal wave spawning around each boss wave. The pre-boss quiet window begins when the boss countdown falls to or below `world.toml [waves].boss_quiet_before_seconds` and ends when the countdown reaches 0. The post-boss quiet window begins immediately when the boss wave fires and lasts `world.toml [waves].boss_quiet_after_seconds` seconds. Threat accumulation is paused during both windows. The normal wave gap timer does not advance during either window (REQ-WAV-GAP). The new boss countdown runs during the post-boss quiet window.
@@ -349,30 +325,27 @@ Modules in `modules.toml` define a `surface_mask` — a list of strings that des
 
 ### Layout
 
-The screen is divided into two columns: a main column (75% width) containing the header bar and game world, and a side panel column (25% width) containing the three UI panels stacked vertically:
+The screen is divided into three vertical sections:
 
 ```
-+--------------------------------------+--------------+
-|             Header Bar               |              |
-+--------------------------------------+  Selected    |
-|                                      |  Building    |
-|                                      |  Panel       |
-|                                      +--------------+
-|           Game World                 |  Build       |
-|                                      |  Button      |
-|                                      |  Grid        |
-|                                      +--------------+
-|                                      |  Blueprint   |
-|                                      |  Panel       |
-+--------------------------------------+--------------+
-           (75% width)                   (25% width)
++--------------------------------------------------+
+|                  Header Bar                      |
++--------------------------------------------------+
+|                                                  |
+|               Game World (70%)                   |
+|                                                  |
++-----------------+-----------------+--------------+
+| Selected        | Build Button    | Blueprint    |
+| Building Panel  | Grid            | Panel        |
+|    (left)       |   (center)      |   (right)    |
++-----------------+-----------------+--------------+
 ```
 
-- REQ-UI-HEADER: The header bar spans the width of the game world column (75% of the screen width) and always shows the elapsed survival time and the current global building blocks stock on the left, the boss wave counter and boss countdown (REQ-UI-BOSS-STATUS) to the left of the speed buttons, and game speed controls on the right.
+- REQ-UI-HEADER: The header bar spans the full width above the game world and always shows the elapsed survival time and the current global building blocks stock on the left, the boss wave counter and boss countdown (REQ-UI-BOSS-STATUS) to the left of the speed buttons, and game speed controls on the right.
 - REQ-UI-BOSS-STATUS: The header bar displays, to the left of the speed buttons, the current boss wave counter (REQ-WAV-BOSS-COUNTER) and the time remaining on the boss countdown (REQ-WAV-BOSS-COUNTDOWN). The boss wave counter is shown as `Boss Wave #<x>` and the countdown as `Next boss: <M:SS>`, where `<M:SS>` is the remaining seconds formatted as whole minutes and two-digit seconds. Both values update continuously as the simulation runs.
 - REQ-UI-SPEED: The game speed controls in the header bar are buttons for 0×, 0.5×, 1×, 2×, and 4× speed. The currently active speed is shown as selected. All game simulation (production, movement, threat accumulation, wave timing) scales with the selected speed. 0× pauses the game.
-- REQ-UI-WORLD-SIZE: The game world view occupies the full height below the header bar in the main column (75% of the screen width).
-- REQ-UI-PANEL-COLUMN: The side panel column occupies 25% of the screen width and the full screen height. It is divided into three equal-height panels stacked top to bottom: selected building panel (top), build button grid (middle), and blueprint panel (bottom).
+- REQ-UI-WORLD-HEIGHT: The game world view occupies 70% of the remaining screen height below the header bar.
+- REQ-UI-PANEL-HEIGHT: The UI panel occupies the remaining 30% of the screen height, split horizontally into a selected building panel (left), a build button grid (center), and a blueprint panel (right).
 
 ### Game World
 
@@ -381,6 +354,13 @@ The screen is divided into two columns: a main column (75% width) containing the
 - REQ-UI-PORT-GLYPH: Every output port of every building is indicated by a directional glyph drawn on the port's tile. The glyph is a `>` rotated to face the port's exit direction (`>` for East, `^` for North, `<` for West, `v` for South). It is drawn at the midpoint between the tile center and the tile edge that the port exits through (i.e. halfway from center toward the exit edge). The indicator is rendered for all building states: operational buildings, construction sites, and the builder-mode ghost. Buildings with multiple output ports (e.g. splitters) show one indicator per port.
 - REQ-UI-HP-BARS: All entities with HP — the HQ, player and enemy defence stations, and player and enemy ships — render an HP bar below them. The bar is always visible regardless of current HP. The bar's filled portion represents the fraction of current HP to maximum HP.
 - REQ-UI-NO-ZOOM: The view has a fixed zoom level; the player cannot zoom in or out.
+- REQ-UI-SCHEMATIC-TOAST: When a schematic is unlocked or leveled up (REQ-DEF-SCHEMATIC-DROP), a transient notification toast appears in the top-right corner of the game world view for 4 seconds and then fades out. Toast text:
+  - **Ship schematic — new unlock**: `Schematic unlocked: <Ship Name>` (where `<Ship Name>` is `ships.toml [ship.schematic].display_name`).
+  - **Ship schematic — level-up (duplicate drop)**: `<Ship Name> production level → N` (where N is the new level).
+  - **Module schematic — new unlock**: `Module unlocked: <Module Id>` (where `<Module Id>` is the module's `id` from `modules.toml`).
+  - **Module schematic — level-up (duplicate drop)**: `<Module Id> production level → N` (where N is the new level).
+
+  If multiple toasts arrive in close succession, they stack vertically in a queue (most recent at the top) and each fades out independently after its own 4-second lifetime.
 - REQ-UI-HOTKEYS: Global keyboard shortcuts:
   - **Space** — toggles pause. Pressing Space pauses (sets speed to 0×) and stores the previously selected non-zero speed; pressing Space again restores that speed.
   - **W** — increases game speed by one step in the sequence 0×, 0.5×, 1×, 2×, 4× (no wrap-around past 4×).
@@ -397,9 +377,6 @@ The screen is divided into two columns: a main column (75% width) containing the
 - REQ-UI-DEBUG-OVERLAY: While debug draw mode is active (REQ-UI-DEBUG-DRAW), a text overlay is drawn in the upper left corner of the game world view. The overlay has a semi-transparent black background sized to fit its content. It displays the following lines of text:
   - `Accumulated Threat Level: <level>` — where `<level>` is the current accumulated threat level (see REQ-WAV-THREAT-RATE).
   - `Time until Wave: <time_s>` — where `<time_s>` is the remaining time in seconds on the normal-wave inter-wave gap timer (see REQ-WAV-GAP). During a quiet window the gap timer is frozen; the displayed value reflects that frozen state.
-  - `Threat Accumulation Rate: <rate> threat/s` — the rate at which the accumulated threat level is currently increasing (see REQ-WAV-THREAT-RATE). During a quiet window (REQ-WAV-QUIET), this is 0, reflecting that accumulation is currently paused.
-  - `Max Factory Production: <rate> threat/s` — the threat-equivalent of the factory's total possible production: 1 threat/second for each completed (operational, not under construction) miner, smelter, assembler, reprocessing plant, and shipyard. One second of production equals one threat (see REQ-MOD-THREAT).
-  - `Current Factory Production: <rate> threat/s` — the threat-equivalent of the factory's current production: 1 threat/second for each completed miner, smelter, assembler, reprocessing plant, or shipyard that currently has an active production cycle (see REQ-MAT-CYCLE; for shipyards, an in-progress production cycle per REQ-BLD-SHIPYARD).
 
 ### Escape Menu
 
@@ -419,7 +396,7 @@ The screen is divided into two columns: a main column (75% width) containing the
 - REQ-UI-CONFIG-INLINE: Recipe, schematic, ship stance, and target priority configuration for a selected building is shown and changed inline within this panel. For shipyards, the panel additionally shows the ship layout preview and "Configure" button below the schematic dropdown (REQ-MOD-UI-PREVIEW).
 - REQ-UI-BELT-CLEAR: When one or more belt, splitter, tunnel entry, or tunnel exit tiles are selected, the panel shows a "Clear" button that removes all items from the selected tiles. Clearing a tunnel entry or exit also discards all items currently in transit through that tunnel (REQ-BLD-TUNNEL-TRANSIT). This can be used to resolve stalled belts, splitters, and tunnels.
 - REQ-UI-ENTITY-CLICK-SELECT: The player can click any ship (player or enemy) or any defence station (player or enemy) in the game world to select it. Clicking a ship or defence station clears any existing selection and establishes a single-entity selection containing only that entity. Ships and defence stations cannot participate in multi-select together with buildings. Clicking empty world space (no building, ship, or defence station) clears the selection.
-- REQ-UI-SHIP-STATS-PANEL: When a single ship is selected (REQ-UI-ENTITY-CLICK-SELECT), the selected building panel shows a **ship stats panel**. The panel structure mirrors REQ-MOD-UI-STATS-PANEL but reflects the ship's actual live state: stats are computed at the ship's actual level with its installed modules per REQ-MOD-STAT-CALC. The panel always shows all hull stats: HP (current / maximum), max linear speed, sensor range, main acceleration, maneuvering acceleration, angular acceleration, and max rotation speed. In addition, capability module summaries are shown conditioned on which module types are installed, using the same aggregation rules as REQ-MOD-UI-STATS-PANEL: weapons (combined DPS, maximum range), salvage (combined collection rate, maximum range), and repair (combined repair rate, maximum range), each section appearing only if at least one instance of that module type is installed. While debug draw mode is active (REQ-UI-DEBUG-DRAW), the panel additionally shows the ship's derived threat cost (REQ-MOD-THREAT).
+- REQ-UI-SHIP-STATS-PANEL: When a single ship is selected (REQ-UI-ENTITY-CLICK-SELECT), the selected building panel shows a **ship stats panel**. The panel structure mirrors REQ-MOD-UI-STATS-PANEL but reflects the ship's actual live state: stats are computed at the ship's actual level with its installed modules per REQ-MOD-STAT-CALC. The panel always shows all hull stats: HP (current / maximum), max linear speed, sensor range, main acceleration, maneuvering acceleration, angular acceleration, and max rotation speed. In addition, capability module summaries are shown conditioned on which module types are installed, using the same aggregation rules as REQ-MOD-UI-STATS-PANEL: weapons (combined DPS, maximum range), salvage (combined collection rate, maximum range), and repair (combined repair rate, maximum range), each section appearing only if at least one instance of that module type is installed.
 - REQ-UI-STATION-STATS-PANEL: When a single defence station is selected (REQ-UI-ENTITY-CLICK-SELECT), the selected building panel shows a **station stats panel** displaying the station's stats computed at its current level: HP (current / maximum), damage, range, and fire rate.
 
 ### Build Button Grid

src/balancing/ArenaSimulation.cpp

@@ -259,9 +259,9 @@ void ArenaSimulation::tick()
     m_aiSystem->tickSalvageBehavior(m_admin, *m_scrapSystem, *m_buildingSystem);
 
     // Combat resolution (tick step 8).
-    std::vector<WeaponFiredEvent> weaponFiredEvents;
-    m_combatSystem->tick(m_currentTick, m_admin, *m_buildingSystem, weaponFiredEvents);
-    m_weaponFiredEvents.insert(m_weaponFiredEvents.end(), weaponFiredEvents.begin(), weaponFiredEvents.end());
+    std::vector<FireEvent> fireEvents;
+    m_combatSystem->tick(m_currentTick, m_admin, *m_buildingSystem, fireEvents);
+    m_fireEvents.insert(m_fireEvents.end(), fireEvents.begin(), fireEvents.end());
     m_combatSystem->applyPendingDamage(m_currentTick, m_admin);
 
     // Deaths (tick step 9, simplified).
@@ -393,10 +393,10 @@ void ArenaSimulation::tickOnce()
     }
 }
 
-std::vector<WeaponFiredEvent> ArenaSimulation::drainWeaponFiredEvents()
+std::vector<FireEvent> ArenaSimulation::drainFireEvents()
 {
-    std::vector<WeaponFiredEvent> result;
-    result.swap(m_weaponFiredEvents);
+    std::vector<FireEvent> result;
+    result.swap(m_fireEvents);
     return result;
 }
 

src/balancing/ArenaSimulation.h

@@ -13,7 +13,7 @@
 #include "BuildingId.h"
 
 #include "entt/entity/entity.hpp"
-#include "WeaponFiredEvent.h"
+#include "FireEvent.h"
 #include "GameConfig.h"
 #include "Tick.h"
 
@@ -58,7 +58,7 @@ public:
     void requestStop();
 
     void tickOnce();
-    std::vector<WeaponFiredEvent> drainWeaponFiredEvents();
+    std::vector<FireEvent> drainFireEvents();
 
     ArenaStatus status() const;
     bool isFinished() const;
@@ -104,7 +104,7 @@ private:
     int m_winnerTeam;
     std::atomic<bool> m_stopRequested;
 
-    std::vector<WeaponFiredEvent> m_weaponFiredEvents;
+    std::vector<FireEvent> m_fireEvents;
 
     mutable std::mutex m_statusMutex;
     ArenaStatus m_status;

src/balancing/ArenaView.cpp

@@ -16,7 +16,6 @@
 #include "EventManager.h"
 #include "FacingComponent.h"
 #include "FactionComponent.h"
-#include "GameSpeedChangedEvent.h"
 #include "HealthComponent.h"
 #include "PositionComponent.h"
 #include "ScrapSystem.h"
@@ -46,13 +45,6 @@ ArenaView::ArenaView(ArenaSimulation* sim, const VisualsConfig* visuals,
     connect(m_renderTimer, &QTimer::timeout, this, &ArenaView::onFrame);
     m_renderTimer->start();
     m_frameTimer.start();
-
-    registerForEvent();
-}
-
-ArenaView::~ArenaView()
-{
-    unregisterForEvent();
 }
 
 void ArenaView::setGameSpeed(double multiplier)
@@ -62,8 +54,7 @@ void ArenaView::setGameSpeed(double multiplier)
         m_prevNonZeroSpeed = multiplier;
     }
     m_gameSpeedMultiplier = multiplier;
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<GameSpeedChangedEvent>(multiplier));
+    emit speedChanged(multiplier);
 }
 
 double ArenaView::gameSpeed() const
@@ -102,17 +93,34 @@ void ArenaView::onFrame()
         }
     }
 
-    // Emit fire events via EventManager
     {
-        const std::vector<WeaponFiredEvent> fires = m_sim->drainWeaponFiredEvents();
-        for (const WeaponFiredEvent& fe : fires)
+        const std::vector<FireEvent> fires = m_sim->drainFireEvents();
+        for (const FireEvent& fe : fires)
         {
-            EventManager::getInstance()->sendEventImmediately(
-                std::make_shared<WeaponFiredEvent>(fe));
+            float maxRadius = 0.125f;
+            if (m_sim->admin().isValid(fe.target)
+                && m_sim->admin().hasAll<StationBodyComponent>(fe.target))
+            {
+                const StationBodyComponent& sb = m_sim->admin().get<StationBodyComponent>(fe.target);
+                const int shorter = std::min(sb.footprint.width(),
+                                             sb.footprint.height());
+                maxRadius = shorter / 2.0f;
+            }
+
+            std::uniform_real_distribution<float> angleDist(0.0f, 6.28318530f);
+            std::uniform_real_distribution<float> radiusDist(0.0f, maxRadius);
+            const float angle  = angleDist(m_rng);
+            const float radius = radiusDist(m_rng);
+
+            ActiveBeam beam;
+            beam.event         = fe;
+            beam.emittedWallMs = m_wallMs;
+            beam.targetOffset  = QVector2D(radius * std::cos(angle),
+                                           radius * std::sin(angle));
+            m_activeBeams.push_back(beam);
         }
     }
 
-    // Expire old beams
     {
         std::vector<ActiveBeam> live;
         for (const ActiveBeam& b : m_activeBeams)
@@ -128,36 +136,12 @@ void ArenaView::onFrame()
     if (m_sim->isFinished() && !m_finishedEmitted)
     {
         m_finishedEmitted = true;
+        emit finished();
     }
 
     update();
 }
 
-void ArenaView::handleEvent(std::shared_ptr<const WeaponFiredEvent> event)
-{
-    float maxRadius = 0.125f;
-    if (m_sim->admin().isValid(event->target)
-        && m_sim->admin().hasAll<StationBodyComponent>(event->target))
-    {
-        const StationBodyComponent& sb = m_sim->admin().get<StationBodyComponent>(event->target);
-        const int shorter = std::min(sb.footprint.width(),
-                                     sb.footprint.height());
-        maxRadius = shorter / 2.0f;
-    }
-
-    std::uniform_real_distribution<float> angleDist(0.0f, 6.28318530f);
-    std::uniform_real_distribution<float> radiusDist(0.0f, maxRadius);
-    const float angle  = angleDist(m_rng);
-    const float radius = radiusDist(m_rng);
-
-    ActiveBeam beam;
-    beam.event         = *event;
-    beam.emittedWallMs = m_wallMs;
-    beam.targetOffset  = QVector2D(radius * std::cos(angle),
-                                   radius * std::sin(angle));
-    m_activeBeams.push_back(beam);
-}
-
 void ArenaView::paintGL()
 {
     QPainter painter(this);
@@ -430,3 +414,4 @@ void ArenaView::drawBeams(QPainter& painter)
                          worldToWidget(*targetPos + beam.targetOffset));
     }
 }
+

src/balancing/ArenaView.h

@@ -9,8 +9,7 @@
 #include <QTimer>
 #include <QVector2D>
 
-#include "EventHandler.h"
-#include "WeaponFiredEvent.h"
+#include "FireEvent.h"
 
 #include "entt/entity/entity.hpp"
 #include "EntitySelectedEvent.h"
@@ -21,21 +20,23 @@
 class ArenaSimulation;
 class QPainter;
 
-class ArenaView : public QOpenGLWidget,
-                  public EventHandler<WeaponFiredEvent>
+class ArenaView : public QOpenGLWidget
 {
     Q_OBJECT
 
 public:
     ArenaView(ArenaSimulation* sim, const VisualsConfig* visuals,
               QWidget* parent = nullptr);
-    ~ArenaView() override;
 
     void setGameSpeed(double multiplier);
     double gameSpeed() const;
     void togglePause();
     void stopRendering();
 
+signals:
+    void speedChanged(double multiplier);
+    void finished();
+
 protected:
     void paintGL() override;
     void mousePressEvent(QMouseEvent* event) override;
@@ -44,8 +45,6 @@ private slots:
     void onFrame();
 
 private:
-    void handleEvent(std::shared_ptr<const WeaponFiredEvent> event) override;
-
     void drawTiles(QPainter& painter);
     void drawBuildings(QPainter& painter);
     void drawStations(QPainter& painter);
@@ -63,7 +62,7 @@ private:
 
     struct ActiveBeam
     {
-        WeaponFiredEvent event;
+        FireEvent event;
         qint64    emittedWallMs;
         QVector2D targetOffset;
     };

src/balancing/ArenaWidget.cpp

@@ -3,13 +3,8 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
-#include "ArenaInspectRequestedEvent.h"
-#include "ArenaStartRequestedEvent.h"
-#include "EventManager.h"
-
-ArenaWidget::ArenaWidget(int arenaIndex, const std::string& arenaName, QWidget* parent)
+ArenaWidget::ArenaWidget(const std::string& arenaName, QWidget* parent)
     : QFrame(parent)
-    , m_arenaIndex(arenaIndex)
     , m_running(false)
     , m_wasFinished(false)
 {
@@ -36,17 +31,11 @@ void ArenaWidget::buildLayout(const std::string& arenaName)
     titleRow->addStretch();
 
     m_inspectButton = new QPushButton(tr("Inspect"), this);
-    connect(m_inspectButton, &QPushButton::clicked, this, [this]() {
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<ArenaInspectRequestedEvent>(m_arenaIndex));
-    });
+    connect(m_inspectButton, &QPushButton::clicked, this, &ArenaWidget::inspectRequested);
     titleRow->addWidget(m_inspectButton);
 
     m_startButton = new QPushButton(tr("Start"), this);
-    connect(m_startButton, &QPushButton::clicked, this, [this]() {
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<ArenaStartRequestedEvent>(m_arenaIndex));
-    });
+    connect(m_startButton, &QPushButton::clicked, this, &ArenaWidget::startRequested);
     titleRow->addWidget(m_startButton);
 
     outerLayout->addLayout(titleRow);

src/balancing/ArenaWidget.h

@@ -14,16 +14,19 @@ class ArenaWidget : public QFrame
     Q_OBJECT
 
 public:
-    ArenaWidget(int arenaIndex, const std::string& arenaName, QWidget* parent = nullptr);
+    explicit ArenaWidget(const std::string& arenaName, QWidget* parent = nullptr);
 
     void updateStatus(const ArenaStatus& status);
     void startSimulation();
     void resetToGrey();
 
+signals:
+    void startRequested();
+    void inspectRequested();
+
 private:
     void buildLayout(const std::string& arenaName);
 
-    int m_arenaIndex;
     QLabel* m_titleLabel;
     QLabel* m_team1Header;
     QLabel* m_team2Header;

src/balancing/BalancingWindow.cpp

@@ -48,17 +48,14 @@ BalancingWindow::BalancingWindow(const BalancingConfig& balancingConfig,
     m_pollTimer = new QTimer(this);
     connect(m_pollTimer, &QTimer::timeout, this, &BalancingWindow::pollStatuses);
     m_pollTimer->start(100);
-
-    registerForEvents();
 }
 
 BalancingWindow::~BalancingWindow()
 {
-    unregisterForEvents();
-
     m_pollTimer->stop();
     if (m_inspectWindow)
     {
+        m_inspectWindow->disconnect(this);
         delete m_inspectWindow;
         m_inspectWindow = nullptr;
     }
@@ -84,11 +81,16 @@ void BalancingWindow::populateArenas(const BalancingConfig& balancingConfig)
         entry.config = arenaConfig;
         entry.simulation = std::make_unique<ArenaSimulation>(
             m_gameConfig, arenaConfig, m_nextSeed++);
-        entry.widget = new ArenaWidget(index, arenaConfig.name, scrollContent);
+        entry.widget = new ArenaWidget(arenaConfig.name, scrollContent);
         contentLayout->addWidget(entry.widget);
 
         entry.widget->updateStatus(entry.simulation->status());
 
+        connect(entry.widget, &ArenaWidget::startRequested,
+                this, [this, index]() { startArena(index); });
+        connect(entry.widget, &ArenaWidget::inspectRequested,
+                this, [this, index]() { inspectArena(index); });
+
         m_arenas.push_back(std::move(entry));
     }
 
@@ -156,21 +158,6 @@ void BalancingWindow::startAll()
     }
 }
 
-void BalancingWindow::handleEvent(std::shared_ptr<const ArenaStartRequestedEvent> event)
-{
-    startArena(event->arenaIndex);
-}
-
-void BalancingWindow::handleEvent(std::shared_ptr<const ArenaInspectRequestedEvent> event)
-{
-    inspectArena(event->arenaIndex);
-}
-
-void BalancingWindow::handleEvent(std::shared_ptr<const InspectWindowClosedEvent> /*event*/)
-{
-    closeInspectWindow();
-}
-
 void BalancingWindow::startArena(int index)
 {
     ArenaEntry& entry = m_arenas[index];
@@ -192,6 +179,7 @@ void BalancingWindow::inspectArena(int index)
 {
     if (m_inspectWindow)
     {
+        m_inspectWindow->disconnect(this);
         delete m_inspectWindow;
         m_inspectWindow = nullptr;
 
@@ -222,6 +210,8 @@ void BalancingWindow::inspectArena(int index)
 
     m_inspectWindow = new InspectWindow(
         m_inspectedSim.get(), &m_gameConfig, &m_visuals, entry.config.name, nullptr);
+    connect(m_inspectWindow, &InspectWindow::closed,
+            this, &BalancingWindow::closeInspectWindow);
 
     setMainControlsEnabled(false);
     m_inspectWindow->show();
@@ -234,6 +224,7 @@ void BalancingWindow::closeInspectWindow()
         return;
     }
 
+    m_inspectWindow->disconnect(this);
     m_inspectWindow->deleteLater();
     m_inspectWindow = nullptr;
 

src/balancing/BalancingWindow.h

@@ -10,22 +10,15 @@
 #include <QTimer>
 #include <QWidget>
 
-#include "ArenaInspectRequestedEvent.h"
-#include "ArenaStartRequestedEvent.h"
 #include "ArenaWidget.h"
 #include "ArenaSimulation.h"
 #include "BalancingConfig.h"
-#include "EventHandler.h"
 #include "GameConfig.h"
-#include "InspectWindowClosedEvent.h"
 #include "VisualsConfig.h"
 
 class InspectWindow;
 
-class BalancingWindow : public QWidget,
-                        public CombinedEventHandler<ArenaStartRequestedEvent,
-                                                    ArenaInspectRequestedEvent,
-                                                    InspectWindowClosedEvent>
+class BalancingWindow : public QWidget
 {
     Q_OBJECT
 
@@ -37,20 +30,15 @@ public:
                     QWidget* parent = nullptr);
     ~BalancingWindow() override;
 
-private:
-    void handleEvent(std::shared_ptr<const ArenaStartRequestedEvent> event) override;
-    void handleEvent(std::shared_ptr<const ArenaInspectRequestedEvent> event) override;
-    void handleEvent(std::shared_ptr<const InspectWindowClosedEvent> event) override;
-
 private slots:
     void pollStatuses();
     void reloadConfig();
     void startAll();
-
-private:
     void startArena(int index);
     void inspectArena(int index);
     void closeInspectWindow();
+
+private:
     void populateArenas(const BalancingConfig& balancingConfig);
     void stopAllArenas();
     void updateButtons();

src/balancing/InspectWindow.cpp

@@ -10,9 +10,7 @@
 
 #include "ArenaView.h"
 #include "EntityAdmin.h"
-#include "EventManager.h"
 #include "HealthComponent.h"
-#include "InspectWindowClosedEvent.h"
 #include "ModuleOwnerComponent.h"
 #include "ShipIdentityComponent.h"
 #include "ShipStatsCalculator.h"
@@ -78,6 +76,9 @@ InspectWindow::InspectWindow(ArenaSimulation* sim, const GameConfig* config,
     m_arenaView = new ArenaView(sim, visuals, this);
     mainLayout->addWidget(m_arenaView, 1);
 
+    connect(m_arenaView, &ArenaView::speedChanged,
+            this, &InspectWindow::onSpeedChanged);
+
     // Info panel (bottom)
     {
         QWidget* infoPanel = new QWidget(this);
@@ -139,20 +140,19 @@ InspectWindow::InspectWindow(ArenaSimulation* sim, const GameConfig* config,
 
     setFocusPolicy(Qt::StrongFocus);
 
-    registerForEvents();
+    registerForEvent();
 }
 
 InspectWindow::~InspectWindow()
 {
-    unregisterForEvents();
+    unregisterForEvent();
 }
 
 void InspectWindow::closeEvent(QCloseEvent* event)
 {
     m_arenaView->stopRendering();
     m_pollTimer->stop();
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<InspectWindowClosedEvent>());
+    emit closed();
     event->accept();
 }
 
@@ -176,11 +176,11 @@ void InspectWindow::onSpeedButton(int index)
     }
 }
 
-void InspectWindow::handleEvent(std::shared_ptr<const GameSpeedChangedEvent> event)
+void InspectWindow::onSpeedChanged(double multiplier)
 {
     for (int i = 0; i < kSpeedCount; ++i)
     {
-        const bool active = (std::abs(kSpeeds[i] - event->speed) < 0.001);
+        const bool active = (std::abs(kSpeeds[i] - multiplier) < 0.001);
         m_speedButtons[static_cast<std::size_t>(i)]->setChecked(active);
     }
 }

src/balancing/InspectWindow.h

@@ -15,15 +15,13 @@
 #include "EntitySelectedEvent.h"
 #include "EventHandler.h"
 #include "GameConfig.h"
-#include "GameSpeedChangedEvent.h"
 #include "VisualsConfig.h"
 
 class ArenaView;
 class ShipStatsPanel;
 
 class InspectWindow : public QWidget,
-                      public CombinedEventHandler<EntitySelectedEvent,
-                                                  GameSpeedChangedEvent>
+                      public EventHandler<EntitySelectedEvent>
 {
     Q_OBJECT
 
@@ -33,16 +31,19 @@ public:
                   const std::string& arenaName, QWidget* parent = nullptr);
     ~InspectWindow() override;
 
+signals:
+    void closed();
+
 protected:
     void closeEvent(QCloseEvent* event) override;
     void keyPressEvent(QKeyEvent* event) override;
 
 private:
     void handleEvent(std::shared_ptr<const EntitySelectedEvent> event) override;
-    void handleEvent(std::shared_ptr<const GameSpeedChangedEvent> event) override;
 
 private slots:
     void onSpeedButton(int index);
+    void onSpeedChanged(double multiplier);
     void pollStatus();
 
 private:

src/lib/config/ConfigLoader.cpp

@@ -429,6 +429,14 @@ ShipsConfig ConfigLoader::loadShips(const std::string& path)
                 bpMt["production_time_seconds"], file, bpPath + ".production_time_seconds");
         }
 
+        // Threat
+        {
+            const std::string tPath = elemPath + ".threat";
+            const toml::table& tTable = requireTable(mt["threat"], file, tPath);
+            toml::table& tMt = const_cast<toml::table&>(tTable);
+            def.threat.costFormula = requireFormula(tMt["cost_formula"], file, tPath + ".cost_formula");
+        }
+
         // Health
         {
             const std::string hPath = elemPath + ".health";
@@ -579,6 +587,7 @@ ModulesConfig ConfigLoader::loadModules(const std::string& path)
             mt["player_production_level"], file, elemPath + ".player_production_level"));
         def.productionTimeSeconds = requireDouble(
             mt["production_time_seconds"], file, elemPath + ".production_time_seconds");
+        def.threatCost            = requireDouble(mt["threat_cost"], file, elemPath + ".threat_cost");
         def.fillColor             = requireString(mt["fill_color"], file, elemPath + ".fill_color");
         def.glyph                 = requireString(mt["glyph"], file, elemPath + ".glyph");
 
@@ -695,6 +704,5 @@ GameConfig ConfigLoader::loadFromDirectory(const std::string& configDir)
     cfg.ships     = loadShips(configDir + "/ships.toml");
     cfg.stations  = loadStations(configDir + "/stations.toml");
     cfg.modules   = loadModules(configDir + "/modules.toml");
-    cfg.threatCosts = computeThreatCostTable(cfg);
     return cfg;
 }

src/lib/config/GameConfig.h

@@ -6,7 +6,6 @@
 #include "ShipsConfig.h"
 #include "StationsConfig.h"
 #include "ModulesConfig.h"
-#include "ThreatCostCalculator.h"
 
 // Aggregate of all simulation config files. Loaded at startup and reloaded
 // from disk on each game restart (REQ-CFG-RELOAD). See architecture.md "Config Loading".
@@ -18,5 +17,4 @@ struct GameConfig
     ShipsConfig ships;
     StationsConfig stations;
     ModulesConfig modules;
-    ThreatCostTable threatCosts;
 };

src/lib/config/ModulesConfig.h

@@ -45,6 +45,7 @@ struct ModuleDef
     std::vector<RecipeIngredient> materials;
     int playerProductionLevel;
     double productionTimeSeconds;
+    double threatCost;
     std::string fillColor;
     std::string glyph;
     std::vector<ModuleStatModifier> statModifiers;

src/lib/config/ShipsConfig.h

@@ -16,6 +16,13 @@ struct ShipSchematic
     double productionTimeSeconds;
 };
 
+// Wave scheduling cost (REQ-WAV-THREAT-COST). Ships with cost_formula that
+// always evaluates to 0 are ineligible as wave picks.
+struct ShipThreat
+{
+    Formula costFormula;
+};
+
 struct ShipHealth
 {
     Formula hpFormula;  // REQ-SHP-STATS
@@ -48,6 +55,7 @@ struct ShipDef
     std::vector<std::string> layout;
 
     ShipSchematic schematic;
+    ShipThreat threat;
     ShipHealth health;
     ShipMovement movement;
     ShipSensor sensor;

src/lib/core/CMakeLists.txt

@@ -6,11 +6,11 @@ SET(HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/EntityAdmin.h
     ${CMAKE_CURRENT_SOURCE_DIR}/Blueprint.h
     ${CMAKE_CURRENT_SOURCE_DIR}/BuildingId.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/FireEvent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ItemType.h
     ${CMAKE_CURRENT_SOURCE_DIR}/Item.h
     ${CMAKE_CURRENT_SOURCE_DIR}/Port.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/SchematicChoiceOption.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/DisplayName.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/SchematicDropEvent.h
     PARENT_SCOPE
 )
 
@@ -18,7 +18,6 @@ SET(SRCS
     ${SRCS}
     ${CMAKE_CURRENT_SOURCE_DIR}/BuildingType.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/EntityAdmin.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/DisplayName.cpp
     PARENT_SCOPE
 )
 

src/lib/core/DisplayName.cpp

@@ -1,27 +0,0 @@
-#include "DisplayName.h"
-
-#include <cctype>
-
-std::string toDisplayName(const std::string& id)
-{
-    std::string result;
-    bool nextUpper = true;
-    for (char c : id)
-    {
-        if (c == '_')
-        {
-            result += ' ';
-            nextUpper = true;
-        }
-        else if (nextUpper)
-        {
-            result += static_cast<char>(std::toupper(static_cast<unsigned char>(c)));
-            nextUpper = false;
-        }
-        else
-        {
-            result += c;
-        }
-    }
-    return result;
-}

src/lib/core/DisplayName.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <string>
-
-std::string toDisplayName(const std::string& id);

src/lib/core/FireEvent.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "Tick.h"
+
+#include "entt/entity/entity.hpp"
+
+// Transient record emitted each time a weapon fires (REQ-SHP-FIRING,
+// REQ-SHP-FIRING-BEAM). Buffered in a sim-owned queue and drained by the
+// renderer each frame to draw the 0.3-second laser beam.
+struct FireEvent
+{
+    entt::entity shooter;
+    entt::entity target;
+    Tick emittedAt;
+};

src/lib/core/SchematicChoiceOption.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-
-enum class SchematicType
-{
-    Ship,
-    Module,
-    Recipe
-};
-
-// One option presented to the player in the schematic choice dialog
-// (REQ-DEF-SCHEMATIC-DROP). Built by the simulation when enemy stations are
-// destroyed; the UI reads these to populate the dialog.
-struct SchematicChoiceOption
-{
-    std::string schematicId;
-    SchematicType type;
-    std::string displayName;
-    bool isNewUnlock;
-    int targetLevel;
-
-    // Display names of items produced by recipes that would newly become
-    // implicitly unlocked (REQ-LOCK-IMPLICIT) if this option is selected.
-    // Deduplicated and sorted alphabetically; empty if none.
-    std::vector<std::string> newlyUnlockedItemNames;
-};

src/lib/core/SchematicDropEvent.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <string>
+
+// Emitted in tick step 9 (Deaths & loot) when a destroyed enemy-defence-station
+// set awards a schematic (REQ-DEF-SCHEMATIC-DROP). The UI renders a toast
+// (REQ-UI-SCHEMATIC-TOAST); wasNewUnlock chooses between the "unlocked" and
+// "level -> N" wording. isModuleSchematic selects ship vs. module toast text.
+struct SchematicDropEvent
+{
+    std::string schematicId;   // matches ShipDef::id or ModuleDef::id in the config.
+    int newLevel;
+    bool wasNewUnlock;
+    bool isModuleSchematic;
+};

src/lib/ecs/system/CombatSystem.cpp

@@ -21,7 +21,7 @@ CombatSystem::CombatSystem(const GameConfig& config)
 void CombatSystem::tick(Tick currentTick,
                          EntityAdmin& admin,
                          BuildingSystem& /*buildings*/,
-                         std::vector<WeaponFiredEvent>& outWeaponFiredEvents)
+                         std::vector<FireEvent>& outFireEvents)
 {
 	TRACE();
     // All weapons (ships and stations) are child entities linked via ModuleOwnerComponent.
@@ -35,7 +35,7 @@ void CombatSystem::tick(Tick currentTick,
             }
             const PositionComponent& pos     = admin.get<PositionComponent>(owner.owner);
             const FactionComponent&  faction = admin.get<FactionComponent>(owner.owner);
-            resolveWeapon(owner.owner, weapon, pos, faction, currentTick, admin, outWeaponFiredEvents);
+            resolveWeapon(owner.owner, weapon, pos, faction, currentTick, admin, outFireEvents);
         });
 }
 
@@ -46,7 +46,7 @@ void CombatSystem::resolveWeapon(
     const FactionComponent& ownFaction,
     Tick currentTick,
     EntityAdmin& admin,
-    std::vector<WeaponFiredEvent>& out)
+    std::vector<FireEvent>& out)
 {
     if (weapon.cooldownTicks > 0.0f)
     {
@@ -115,7 +115,7 @@ void CombatSystem::resolveWeapon(
     m_pendingDamage.push_back({targetEntity, weapon.damage,
                                currentTick + kWeaponImpactDelayTicks});
 
-    WeaponFiredEvent evt;
+    FireEvent evt;
     evt.shooter   = shipEntity;
     evt.target    = targetEntity;
     evt.emittedAt = currentTick;

src/lib/ecs/system/CombatSystem.h

@@ -7,7 +7,7 @@
 
 #include "Building.h"
 #include "FactionComponent.h"
-#include "WeaponFiredEvent.h"
+#include "FireEvent.h"
 #include "GameConfig.h"
 #include "PositionComponent.h"
 #include "Tick.h"
@@ -26,7 +26,7 @@ public:
     void tick(Tick currentTick,
               EntityAdmin& admin,
               BuildingSystem& buildings,
-              std::vector<WeaponFiredEvent>& outWeaponFiredEvents);
+              std::vector<FireEvent>& outFireEvents);
 
     void applyPendingDamage(Tick currentTick, EntityAdmin& admin);
 
@@ -47,7 +47,7 @@ private:
         const FactionComponent& ownFaction,
         Tick currentTick,
         EntityAdmin& admin,
-        std::vector<WeaponFiredEvent>& out);
+        std::vector<FireEvent>& out);
 
     const GameConfig& m_config;
 };

src/lib/eventsystem/event/ArenaInspectRequestedEvent.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class ArenaInspectRequestedEvent : public Event
-{
-public:
-    explicit ArenaInspectRequestedEvent(int arenaIndex) : arenaIndex(arenaIndex) {}
-    const int arenaIndex;
-};

src/lib/eventsystem/event/ArenaStartRequestedEvent.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class ArenaStartRequestedEvent : public Event
-{
-public:
-    explicit ArenaStartRequestedEvent(int arenaIndex) : arenaIndex(arenaIndex) {}
-    const int arenaIndex;
-};

src/lib/eventsystem/event/BlueprintModeExitedEvent.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class BlueprintModeExitedEvent : public Event
-{
-};

src/lib/eventsystem/event/BlueprintPlacementRequestedEvent.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "Blueprint.h"
-#include "Event.h"
-
-class BlueprintPlacementRequestedEvent : public Event
-{
-public:
-    explicit BlueprintPlacementRequestedEvent(Blueprint blueprint)
-        : blueprint(std::move(blueprint)) {}
-    const Blueprint blueprint;
-};

src/lib/eventsystem/event/BuilderModeExitedEvent.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class BuilderModeExitedEvent : public Event
-{
-};

src/lib/eventsystem/event/BuildingTypeSelectedEvent.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#include "BuildingType.h"
-#include "Event.h"
-
-class BuildingTypeSelectedEvent : public Event
-{
-public:
-    explicit BuildingTypeSelectedEvent(BuildingType type) : type(type) {}
-    const BuildingType type;
-};

src/lib/eventsystem/event/CMakeLists.txt

@@ -6,25 +6,6 @@ SET(HDRS
 	${CMAKE_CURRENT_SOURCE_DIR}/EntitySelectedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/GameSpeedChangedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/BossWaveUpdatedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/SchematicChoicesAvailableEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/SelectionChangedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/GameOverEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/BuilderModeExitedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/BlueprintModeExitedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/EscapeMenuRequestedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/DemolishModeChangedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/BuildingTypeSelectedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/ExitBuilderModeRequestedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/DemolishModeToggleRequestedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/BlueprintPlacementRequestedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/ExitBlueprintModeRequestedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/SpeedChangeRequestedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/LayoutDialogRequestedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/InspectWindowClosedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/ArenaStartRequestedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/ArenaInspectRequestedEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/WeaponFiredEvent.h
-	${CMAKE_CURRENT_SOURCE_DIR}/DebugDrawToggledEvent.h
 	PARENT_SCOPE
 )
 

src/lib/eventsystem/event/DebugDrawToggledEvent.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class DebugDrawToggledEvent : public Event
-{
-public:
-    explicit DebugDrawToggledEvent(bool active)
-        : active(active)
-    {
-    }
-
-    const bool active;
-};

src/lib/eventsystem/event/DemolishModeChangedEvent.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class DemolishModeChangedEvent : public Event
-{
-public:
-    explicit DemolishModeChangedEvent(bool active) : active(active) {}
-    const bool active;
-};

src/lib/eventsystem/event/DemolishModeToggleRequestedEvent.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class DemolishModeToggleRequestedEvent : public Event
-{
-};

src/lib/eventsystem/event/EscapeMenuRequestedEvent.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class EscapeMenuRequestedEvent : public Event
-{
-};

src/lib/eventsystem/event/ExitBlueprintModeRequestedEvent.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class ExitBlueprintModeRequestedEvent : public Event
-{
-};

src/lib/eventsystem/event/ExitBuilderModeRequestedEvent.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class ExitBuilderModeRequestedEvent : public Event
-{
-};

src/lib/eventsystem/event/GameOverEvent.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class GameOverEvent : public Event
-{
-};

src/lib/eventsystem/event/InspectWindowClosedEvent.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class InspectWindowClosedEvent : public Event
-{
-};

src/lib/eventsystem/event/LayoutDialogRequestedEvent.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "BuildingId.h"
-#include "Event.h"
-
-class LayoutDialogRequestedEvent : public Event
-{
-public:
-    explicit LayoutDialogRequestedEvent(BuildingId shipyardId)
-        : shipyardId(shipyardId) {}
-    const BuildingId shipyardId;
-};

src/lib/eventsystem/event/SchematicChoicesAvailableEvent.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#include "Event.h"
-#include "SchematicChoiceOption.h"
-
-class SchematicChoicesAvailableEvent : public Event
-{
-public:
-    explicit SchematicChoicesAvailableEvent(std::vector<SchematicChoiceOption> choices)
-        : choices(std::move(choices)) {}
-    const std::vector<SchematicChoiceOption> choices;
-};

src/lib/eventsystem/event/SelectionChangedEvent.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#include "BuildingId.h"
-#include "Event.h"
-
-class SelectionChangedEvent : public Event
-{
-public:
-    explicit SelectionChangedEvent(std::vector<BuildingId> ids)
-        : ids(std::move(ids)) {}
-    const std::vector<BuildingId> ids;
-};

src/lib/eventsystem/event/SpeedChangeRequestedEvent.h

@@ -1,10 +0,0 @@
-#pragma once
-
-#include "Event.h"
-
-class SpeedChangeRequestedEvent : public Event
-{
-public:
-    explicit SpeedChangeRequestedEvent(double multiplier) : multiplier(multiplier) {}
-    const double multiplier;
-};

src/lib/eventsystem/event/WeaponFiredEvent.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include "Event.h"
-#include "Tick.h"
-
-#include "entt/entity/entity.hpp"
-
-struct WeaponFiredEvent : public Event
-{
-    WeaponFiredEvent() = default;
-    WeaponFiredEvent(entt::entity shooter, entt::entity target, Tick emittedAt)
-        : shooter(shooter), target(target), emittedAt(emittedAt) {}
-
-    entt::entity shooter = entt::null;
-    entt::entity target = entt::null;
-    Tick emittedAt = 0;
-};

src/lib/sim/BeltSystem.cpp

@@ -756,13 +756,13 @@ void BeltSystem::routeSplitterItems()
             else if (preferA && !st.frontB)
             {
                 // Preferred (A) is full — fall back to B; nextOutputIsA stays.
-                st.frontB = BeltItemSlot{item, 0.75};
+                st.frontB = BeltItemSlot{item, 0.0};
                 routed = true;
             }
             else if (!preferA && !st.frontA)
             {
                 // Preferred (B) is full — fall back to A; nextOutputIsA stays.
-                st.frontA = BeltItemSlot{item, 0.75};
+                st.frontA = BeltItemSlot{item, 0.0};
                 routed = true;
             }
             // else both fronts occupied — back stays.
@@ -963,4 +963,3 @@ void BeltSystem::forEachVisualItem(QRect viewportTiles,
     }
 }
 
-

src/lib/sim/BuildingSystem.cpp

@@ -867,44 +867,6 @@ std::vector<ConstructionSite> BuildingSystem::allSites() const
                                          m_constructionQueue.end());
 }
 
-namespace
-{
-bool isProductionBuildingType(BuildingType type)
-{
-    switch (type)
-    {
-    case BuildingType::Miner:
-    case BuildingType::Smelter:
-    case BuildingType::Assembler:
-    case BuildingType::ReprocessingPlant:
-    case BuildingType::Shipyard:
-        return true;
-    default:
-        return false;
-    }
-}
-}  // namespace
-
-int BuildingSystem::productionBuildingCount() const
-{
-    int count = 0;
-    for (const Building& b : m_buildings)
-    {
-        if (isProductionBuildingType(b.type)) { ++count; }
-    }
-    return count;
-}
-
-int BuildingSystem::activeProductionBuildingCount() const
-{
-    int count = 0;
-    for (const Building& b : m_buildings)
-    {
-        if (isProductionBuildingType(b.type) && b.production.has_value()) { ++count; }
-    }
-    return count;
-}
-
 std::vector<BuildingSystem::BeltTileInfo> BuildingSystem::allBeltTiles() const
 {
     std::vector<BeltTileInfo> result;

src/lib/sim/BuildingSystem.h

@@ -79,14 +79,6 @@ public:
     const ConstructionSite*   findSite(BuildingId id)      const;
     std::vector<Building>     allBuildings()             const;
     std::vector<ConstructionSite> allSites()             const;
-
-    // REQ-UI-DEBUG-OVERLAY "Max Factory Production": count of completed
-    // (operational) Miner/Smelter/Assembler/ReprocessingPlant/Shipyard buildings.
-    int productionBuildingCount() const;
-
-    // REQ-UI-DEBUG-OVERLAY "Current Factory Production": subset of the above
-    // that currently has an active production cycle.
-    int activeProductionBuildingCount() const;
     std::vector<BeltTileInfo> allBeltTiles()             const;
     bool                      isTileOccupied(QPoint tile) const;
 

src/lib/sim/CMakeLists.txt

@@ -9,7 +9,6 @@ SET(HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipLayout.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipLayoutBlueprint.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipStatsCalculator.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/ThreatCostCalculator.h
     ${CMAKE_CURRENT_SOURCE_DIR}/WaveSystem.h
     PARENT_SCOPE
 )
@@ -22,7 +21,6 @@ SET(SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/BuildingSystem.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/EntityHitTest.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipStatsCalculator.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ThreatCostCalculator.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/WaveSystem.cpp
     PARENT_SCOPE
 )

src/lib/sim/Simulation.cpp

@@ -1,10 +1,8 @@
 #include "Simulation.h"
 
-#include <algorithm>
 #include <cassert>
 
 #include "AiSystem.h"
-#include "DisplayName.h"
 #include "BuildingSystem.h"
 #include "CombatSystem.h"
 #include "DynamicBodySystem.h"
@@ -136,8 +134,8 @@ void Simulation::reset(unsigned int seed)
     m_playerStation2Entity          = entt::null;
     m_currentEnemyStationEntities[0] = entt::null;
     m_currentEnemyStationEntities[1] = entt::null;
-    m_weaponFiredEvents.clear();
-    m_pendingSchematicChoices.clear();
+    m_fireEvents.clear();
+    m_schematicDropEvents.clear();
 
     m_admin.clear();
     m_beltSystem = BeltSystem(m_config.world.beltSpeed_tps);
@@ -246,7 +244,7 @@ void Simulation::tick()
 
     // Step 8: combat resolution
     m_combatSystem->tick(m_currentTick, m_admin,
-                         *m_buildingSystem, m_weaponFiredEvents);
+                         *m_buildingSystem, m_fireEvents);
 
     // Step 8b: deferred damage whose impact tick has arrived
     m_combatSystem->applyPendingDamage(m_currentTick, m_admin);
@@ -534,11 +532,11 @@ void Simulation::tickDeathsAndLoot()
         const int destroyedLevel = m_waveSystem->generation();
         m_waveSystem->onEnemyStationsDestroyed();
         placeEnemyStationSet(m_waveSystem->generation());
-        generateSchematicChoices(destroyedLevel);
+        awardSchematicDrop(destroyedLevel);
     }
 }
 
-void Simulation::generateSchematicChoices(int destroyedStationLevel)
+void Simulation::awardSchematicDrop(int destroyedStationLevel)
 {
     enum class DropType { Ship, Module, Recipe };
     struct PoolEntry { std::string id; DropType type; };
@@ -574,103 +572,32 @@ void Simulation::generateSchematicChoices(int destroyedStationLevel)
         pool.push_back({def.id, DropType::Recipe});
     }
 
-    if (pool.empty()) { return; }
+    std::uniform_int_distribution<int> dist(0, static_cast<int>(pool.size()) - 1);
+    const PoolEntry& chosen = pool[static_cast<std::size_t>(dist(m_rng))];
 
-    const int numChoices = std::min(static_cast<int>(pool.size()), 3);
-    m_pendingSchematicChoices.clear();
-
-    const std::set<std::string> currentShipIds   = getUnlockedShipSchematicIds();
-    const std::set<std::string> currentModuleIds = getUnlockedModuleSchematicIds();
-
-    for (int i = 0; i < numChoices; ++i)
+    if (chosen.type == DropType::Recipe)
     {
-        std::uniform_int_distribution<int> dist(0, static_cast<int>(pool.size()) - 1 - i);
-        const int roll = dist(m_rng);
-        const std::size_t rollIdx = static_cast<std::size_t>(roll);
-        const std::size_t endIdx  = pool.size() - 1 - static_cast<std::size_t>(i);
-        std::swap(pool[rollIdx], pool[endIdx]);
-        const PoolEntry& entry = pool[endIdx];
-
-        SchematicChoiceOption option;
-        option.schematicId = entry.id;
-
-        if (entry.type == DropType::Ship)
-        {
-            option.type = SchematicType::Ship;
-            option.displayName = toDisplayName(entry.id);
-            const SchematicState& state = m_schematicLevels.at(entry.id);
-            option.isNewUnlock = !state.unlocked;
-            option.targetLevel = state.level + 1;
-        }
-        else if (entry.type == DropType::Module)
-        {
-            option.type = SchematicType::Module;
-            option.displayName = toDisplayName(entry.id);
-            const SchematicState& state = m_moduleSchematicLevels.at(entry.id);
-            option.isNewUnlock = !state.unlocked;
-            option.targetLevel = state.level + 1;
+        m_unlockedRecipeSchematicIds.insert(chosen.id);
+        recomputeUnlocked();
     }
     else
     {
-            option.type = SchematicType::Recipe;
-            option.isNewUnlock = true;
-            option.targetLevel = 0;
-            for (const RecipeDef& def : m_config.recipes.recipes)
-            {
-                if (def.id == entry.id && !def.outputs.empty())
-                {
-                    option.displayName = toDisplayName(def.outputs[0].item);
-                    break;
-                }
-            }
-        }
-
-        // REQ-DEF-SCHEMATIC-DROP: preview recipes newly implicitly unlocked by this option.
-        std::set<std::string> hypotheticalShipIds              = currentShipIds;
-        std::set<std::string> hypotheticalModuleIds            = currentModuleIds;
-        std::set<std::string> hypotheticalRecipeSchematicIds   = m_unlockedRecipeSchematicIds;
-
-        if (entry.type == DropType::Ship && option.isNewUnlock)
-        {
-            hypotheticalShipIds.insert(entry.id);
-        }
-        else if (entry.type == DropType::Module && option.isNewUnlock)
-        {
-            hypotheticalModuleIds.insert(entry.id);
-        }
-        else if (entry.type == DropType::Recipe)
-        {
-            hypotheticalRecipeSchematicIds.insert(entry.id);
-        }
-
-        const UnlockedSets hypothetical = computeUnlockedSets(
-            hypotheticalShipIds, hypotheticalModuleIds, hypotheticalRecipeSchematicIds);
-        option.newlyUnlockedItemNames = computeNewlyUnlockedItemNames(hypothetical);
-
-        m_pendingSchematicChoices.push_back(option);
-    }
-}
-
-void Simulation::applySchematicChoice(int choiceIndex)
-{
-    assert(choiceIndex >= 0 && choiceIndex < static_cast<int>(m_pendingSchematicChoices.size()));
-    const SchematicChoiceOption& chosen = m_pendingSchematicChoices[static_cast<std::size_t>(choiceIndex)];
-
-    if (chosen.type == SchematicType::Recipe)
-    {
-        m_unlockedRecipeSchematicIds.insert(chosen.schematicId);
-    }
-    else
-    {
-        SchematicState& state = (chosen.type == SchematicType::Module)
-            ? m_moduleSchematicLevels.at(chosen.schematicId)
-            : m_schematicLevels.at(chosen.schematicId);
+        SchematicState& state = (chosen.type == DropType::Module)
+            ? m_moduleSchematicLevels.at(chosen.id)
+            : m_schematicLevels.at(chosen.id);
+        const bool wasNew = !state.unlocked;
         state.unlocked = true;
         state.level   += 1;
-    }
+
+        SchematicDropEvent evt;
+        evt.schematicId       = chosen.id;
+        evt.newLevel          = state.level;
+        evt.wasNewUnlock      = wasNew;
+        evt.isModuleSchematic = (chosen.type == DropType::Module);
+        m_schematicDropEvents.push_back(evt);
 
         recomputeUnlocked();
-    m_pendingSchematicChoices.clear();
+    }
 }
 
 // ---------------------------------------------------------------------------
@@ -679,64 +606,34 @@ void Simulation::applySchematicChoice(int choiceIndex)
 
 void Simulation::recomputeUnlocked()
 {
-    const UnlockedSets result = computeUnlockedSets(
-        getUnlockedShipSchematicIds(), getUnlockedModuleSchematicIds(), m_unlockedRecipeSchematicIds);
-    m_unlockedItemIds   = result.itemIds;
-    m_unlockedRecipeIds = result.recipeIds;
-}
-
-std::set<std::string> Simulation::getUnlockedShipSchematicIds() const
-{
-    std::set<std::string> ids;
-    for (const auto& [id, state] : m_schematicLevels)
-    {
-        if (state.unlocked) { ids.insert(id); }
-    }
-    return ids;
-}
-
-std::set<std::string> Simulation::getUnlockedModuleSchematicIds() const
-{
-    std::set<std::string> ids;
-    for (const auto& [id, state] : m_moduleSchematicLevels)
-    {
-        if (state.unlocked) { ids.insert(id); }
-    }
-    return ids;
-}
-
-Simulation::UnlockedSets Simulation::computeUnlockedSets(
-    const std::set<std::string>& unlockedShipSchematicIds,
-    const std::set<std::string>& unlockedModuleSchematicIds,
-    const std::set<std::string>& unlockedRecipeSchematicIds) const
-{
-    UnlockedSets result;
+    m_unlockedItemIds.clear();
+    m_unlockedRecipeIds.clear();
 
     for (const ShipDef& def : m_config.ships.ships)
     {
-        if (unlockedShipSchematicIds.count(def.id) == 0) { continue; }
+        if (!isSchematicUnlocked(def.id)) { continue; }
         for (const RecipeIngredient& mat : def.schematic.materials)
         {
-            result.itemIds.insert(mat.item);
+            m_unlockedItemIds.insert(mat.item);
         }
     }
     for (const ModuleDef& def : m_config.modules.modules)
     {
-        if (unlockedModuleSchematicIds.count(def.id) == 0) { continue; }
+        if (!isModuleSchematicUnlocked(def.id)) { continue; }
         for (const RecipeIngredient& mat : def.materials)
         {
-            result.itemIds.insert(mat.item);
+            m_unlockedItemIds.insert(mat.item);
         }
     }
     for (const RecipeDef& def : m_config.recipes.recipes)
     {
         if (def.building == BuildingType::Assembler
             && def.unlockAtStationLevel.has_value()
-            && unlockedRecipeSchematicIds.count(def.id) > 0)
+            && m_unlockedRecipeSchematicIds.count(def.id) > 0)
         {
             for (const RecipeOutput& out : def.outputs)
             {
-                result.itemIds.insert(out.item);
+                m_unlockedItemIds.insert(out.item);
             }
         }
     }
@@ -755,14 +652,14 @@ Simulation::UnlockedSets Simulation::computeUnlockedSets(
             }
             if (recipe.building == BuildingType::Assembler
                 && recipe.unlockAtStationLevel.has_value()
-                && unlockedRecipeSchematicIds.count(recipe.id) == 0)
+                && m_unlockedRecipeSchematicIds.count(recipe.id) == 0)
             {
                 continue;
             }
             bool producesUnlocked = false;
             for (const RecipeOutput& out : recipe.outputs)
             {
-                if (result.itemIds.count(out.item) > 0)
+                if (m_unlockedItemIds.count(out.item) > 0)
                 {
                     producesUnlocked = true;
                     break;
@@ -773,38 +670,17 @@ Simulation::UnlockedSets Simulation::computeUnlockedSets(
             if (recipe.building == BuildingType::Miner
                 || recipe.building == BuildingType::Assembler)
             {
-                result.recipeIds.insert(recipe.id);
+                m_unlockedRecipeIds.insert(recipe.id);
             }
             for (const RecipeIngredient& ing : recipe.inputs)
             {
-                if (result.itemIds.insert(ing.item).second)
+                if (m_unlockedItemIds.insert(ing.item).second)
                 {
                     changed = true;
                 }
             }
         }
     }
-
-    return result;
-}
-
-std::vector<std::string> Simulation::computeNewlyUnlockedItemNames(const UnlockedSets& hypothetical) const
-{
-    std::set<std::string> itemNames;
-    for (const std::string& recipeId : hypothetical.recipeIds)
-    {
-        if (m_unlockedRecipeIds.count(recipeId) > 0) { continue; }
-        for (const RecipeDef& def : m_config.recipes.recipes)
-        {
-            if (def.id != recipeId) { continue; }
-            for (const RecipeOutput& out : def.outputs)
-            {
-                itemNames.insert(toDisplayName(out.item));
-            }
-            break;
-        }
-    }
-    return std::vector<std::string>(itemNames.begin(), itemNames.end());
 }
 
 bool Simulation::isRecipeUnlocked(const std::string& recipeId) const
@@ -821,24 +697,20 @@ bool Simulation::isItemUnlocked(const std::string& itemId) const
 // Drains
 // ---------------------------------------------------------------------------
 
-std::vector<WeaponFiredEvent> Simulation::drainWeaponFiredEvents()
+std::vector<FireEvent> Simulation::drainFireEvents()
 {
-    std::vector<WeaponFiredEvent> result;
-    result.swap(m_weaponFiredEvents);
+    std::vector<FireEvent> result;
+    result.swap(m_fireEvents);
     return result;
 }
 
-const std::vector<SchematicChoiceOption>& Simulation::getPendingSchematicChoices() const
+std::vector<SchematicDropEvent> Simulation::drainSchematicDropEvents()
 {
-    return m_pendingSchematicChoices;
+    std::vector<SchematicDropEvent> result;
+    result.swap(m_schematicDropEvents);
+    return result;
 }
 
-bool Simulation::hasSchematicChoicesPending() const
-{
-    return !m_pendingSchematicChoices.empty();
-}
-
-
 // ---------------------------------------------------------------------------
 // Accessors
 // ---------------------------------------------------------------------------
@@ -863,21 +735,6 @@ double Simulation::threatLevel() const
     return m_waveSystem->threatLevel();
 }
 
-double Simulation::threatAccumulationRate() const
-{
-    return m_waveSystem->threatAccumulationRate();
-}
-
-double Simulation::maxFactoryProductionThreatRate() const
-{
-    return static_cast<double>(m_buildingSystem->productionBuildingCount());
-}
-
-double Simulation::currentFactoryProductionThreatRate() const
-{
-    return static_cast<double>(m_buildingSystem->activeProductionBuildingCount());
-}
-
 int Simulation::bossWaveCounter() const
 {
     return m_waveSystem->bossWaveCounter();

src/lib/sim/Simulation.h

@@ -12,11 +12,11 @@
 #include "BeltSystem.h"
 #include "EntityAdmin.h"
 #include "entt/entity/entity.hpp"
-#include "SchematicChoiceOption.h"
+#include "SchematicDropEvent.h"
 #include "BuildingType.h"
 #include "BuildingId.h"
 #include "EventHandler.h"
-#include "WeaponFiredEvent.h"
+#include "FireEvent.h"
 #include "GameConfig.h"
 #include "Rotation.h"
 #include "Tick.h"
@@ -50,26 +50,15 @@ public:
 
     // Returns all fire events accumulated since the last drain, clearing the
     // internal queue. Call once per rendered frame (REQ-SHP-FIRING-BEAM).
-    std::vector<WeaponFiredEvent> drainWeaponFiredEvents();
+    std::vector<FireEvent> drainFireEvents();
 
-    // Returns the pending schematic choices (empty if no drop is pending).
-    const std::vector<SchematicChoiceOption>& getPendingSchematicChoices() const;
-
-    // Returns true if there are pending schematic choices waiting for player input.
-    bool hasSchematicChoicesPending() const;
-
-    // Applies the player's chosen schematic from the pending choices.
-    // choiceIndex must be in [0, pendingChoices.size()).
-    // Clears the pending choices after application.
-    void applySchematicChoice(int choiceIndex);
+    // Returns all schematic drop events since the last drain.
+    std::vector<SchematicDropEvent> drainSchematicDropEvents();
 
     Tick   currentTick()          const;
     int    buildingBlocksStock()  const;
     bool   isGameOver()           const;
     double threatLevel()          const;
-    double threatAccumulationRate() const;
-    double maxFactoryProductionThreatRate()     const;
-    double currentFactoryProductionThreatRate() const;
     int    bossWaveCounter()      const;
     Tick   bossCountdownTicks()         const;
     Tick   normalGapRemainingTicks()    const;
@@ -119,8 +108,8 @@ private:
     // Tick step 9: remove dead ships and buildings, drop scrap, handle push.
     void tickDeathsAndLoot();
 
-    // Generate up to 3 schematic choices (REQ-DEF-SCHEMATIC-DROP) for the player.
-    void generateSchematicChoices(int destroyedStationLevel);
+    // Award a random schematic drop (REQ-DEF-SCHEMATIC-DROP) and emit the event.
+    void awardSchematicDrop(int destroyedStationLevel);
 
     GameConfig m_config;
     std::mt19937 m_rng;
@@ -157,26 +146,6 @@ private:
     // Recomputes m_unlockedRecipeIds and m_unlockedItemIds from current schematic state.
     void recomputeUnlocked();
 
-    // Result of the REQ-LOCK-IMPLICIT traversal.
-    struct UnlockedSets
-    {
-        std::set<std::string> itemIds;
-        std::set<std::string> recipeIds;
-    };
-
-    // Pure REQ-LOCK-IMPLICIT traversal given hypothetical explicit-unlock sets.
-    UnlockedSets computeUnlockedSets(const std::set<std::string>& unlockedShipSchematicIds,
-                                      const std::set<std::string>& unlockedModuleSchematicIds,
-                                      const std::set<std::string>& unlockedRecipeSchematicIds) const;
-
-    // Current explicit-unlock id sets, derived from m_schematicLevels / m_moduleSchematicLevels.
-    std::set<std::string> getUnlockedShipSchematicIds() const;
-    std::set<std::string> getUnlockedModuleSchematicIds() const;
-
-    // Display names (deduplicated, alphabetical) of output items of recipes in
-    // hypothetical.recipeIds that are not yet in m_unlockedRecipeIds.
-    std::vector<std::string> computeNewlyUnlockedItemNames(const UnlockedSets& hypothetical) const;
-
     EntityAdmin                       m_admin;
     BeltSystem                        m_beltSystem;
     std::unique_ptr<BuildingSystem>   m_buildingSystem;
@@ -188,6 +157,6 @@ private:
     std::unique_ptr<WaveSystem>       m_waveSystem;
     std::unique_ptr<CombatSystem>     m_combatSystem;
 
-    std::vector<WeaponFiredEvent>          m_weaponFiredEvents;
-    std::vector<SchematicChoiceOption> m_pendingSchematicChoices;
+    std::vector<FireEvent>          m_fireEvents;
+    std::vector<SchematicDropEvent> m_schematicDropEvents;
 };

src/lib/sim/ThreatCostCalculator.cpp

@@ -1,247 +0,0 @@
-#include "ThreatCostCalculator.h"
-
-#include <limits>
-#include <set>
-
-#include "GameConfig.h"
-
-namespace
-{
-
-struct RecipeRef
-{
-    const RecipeDef* recipe;
-    std::string outputItem;
-    int outputAmount;
-    double probability;
-};
-
-double computeMaterialThreat(const ThreatCostTable& table,
-                             const std::vector<RecipeIngredient>& materials)
-{
-    double total = 0.0;
-    for (const RecipeIngredient& mat : materials)
-    {
-        std::map<std::string, double>::const_iterator it = table.itemThreat.find(mat.item);
-        if (it != table.itemThreat.end())
-        {
-            total += it->second * mat.amount;
-        }
-    }
-    return total;
-}
-
-bool allInputsResolved(const RecipeDef& recipe,
-                       const std::map<std::string, double>& resolved)
-{
-    for (const RecipeIngredient& input : recipe.inputs)
-    {
-        if (resolved.find(input.item) == resolved.end())
-        {
-            return false;
-        }
-    }
-    return true;
-}
-
-double computeRecipeThreat(const RecipeDef& recipe,
-                           const std::map<std::string, double>& resolved)
-{
-    double threat = recipe.durationSeconds;
-    for (const RecipeIngredient& input : recipe.inputs)
-    {
-        threat += resolved.at(input.item) * input.amount;
-    }
-    return threat;
-}
-
-}  // namespace
-
-
-ThreatCostTable computeThreatCostTable(const GameConfig& config)
-{
-    ThreatCostTable table;
-
-    // Build lookup: output item → non-reprocessing recipes and reprocessing recipes.
-    std::map<std::string, std::vector<RecipeRef>> nonReprocessingRecipes;
-    std::map<std::string, std::vector<RecipeRef>> reprocessingRecipes;
-
-    for (const RecipeDef& recipe : config.recipes.recipes)
-    {
-        if (recipe.building == BuildingType::ReprocessingPlant)
-        {
-            for (const RecipeOutput& out : recipe.outputs)
-            {
-                RecipeRef ref;
-                ref.recipe = &recipe;
-                ref.outputItem = out.item;
-                ref.outputAmount = out.amount;
-                ref.probability = out.probability.value_or(1.0);
-                reprocessingRecipes[out.item].push_back(ref);
-            }
-        }
-        else
-        {
-            for (const RecipeOutput& out : recipe.outputs)
-            {
-                RecipeRef ref;
-                ref.recipe = &recipe;
-                ref.outputItem = out.item;
-                ref.outputAmount = out.amount;
-                ref.probability = 1.0;
-                nonReprocessingRecipes[out.item].push_back(ref);
-            }
-        }
-    }
-
-    // Collect all item names that need resolving.
-    std::set<std::string> unresolved;
-    for (const std::pair<const std::string, std::vector<RecipeRef>>& entry : nonReprocessingRecipes)
-    {
-        unresolved.insert(entry.first);
-    }
-    for (const std::pair<const std::string, std::vector<RecipeRef>>& entry : reprocessingRecipes)
-    {
-        unresolved.insert(entry.first);
-    }
-
-    // Iteratively resolve non-reprocessing items.
-    bool progress = true;
-    while (progress)
-    {
-        progress = false;
-        std::set<std::string> newlyResolved;
-        for (const std::string& item : unresolved)
-        {
-            std::map<std::string, std::vector<RecipeRef>>::const_iterator it =
-                nonReprocessingRecipes.find(item);
-            if (it == nonReprocessingRecipes.end())
-            {
-                continue;
-            }
-
-            double maxThreat = -1.0;
-            for (const RecipeRef& ref : it->second)
-            {
-                if (allInputsResolved(*ref.recipe, table.itemThreat))
-                {
-                    double threat = computeRecipeThreat(*ref.recipe, table.itemThreat);
-                    if (threat > maxThreat)
-                    {
-                        maxThreat = threat;
-                    }
-                }
-            }
-
-            if (maxThreat >= 0.0)
-            {
-                table.itemThreat[item] = maxThreat;
-                newlyResolved.insert(item);
-                progress = true;
-            }
-        }
-        for (const std::string& item : newlyResolved)
-        {
-            unresolved.erase(item);
-        }
-    }
-
-    // Compute scrap threat (REQ-THREAT-SCRAP): find the ship with the smallest
-    // scrap_drop and use its threat cost.
-    int minScrapDrop = std::numeric_limits<int>::max();
-    const ShipDef* cheapestScrapShip = nullptr;
-    for (const ShipDef& def : config.ships.ships)
-    {
-        if (def.loot.scrapDrop > 0 && def.loot.scrapDrop < minScrapDrop)
-        {
-            minScrapDrop = def.loot.scrapDrop;
-            cheapestScrapShip = &def;
-        }
-    }
-
-    if (cheapestScrapShip != nullptr)
-    {
-        double shipThreat = calculateShipThreatCost(table, config,
-            cheapestScrapShip->id, cheapestScrapShip->defaultModules);
-        table.scrapThreat = shipThreat / minScrapDrop;
-    }
-
-    // Resolve reprocessing-only items.
-    for (const std::string& item : unresolved)
-    {
-        std::map<std::string, std::vector<RecipeRef>>::const_iterator it =
-            reprocessingRecipes.find(item);
-        if (it == reprocessingRecipes.end())
-        {
-            continue;
-        }
-
-        for (const RecipeRef& ref : it->second)
-        {
-            int scrapPerCycle = 0;
-            for (const RecipeIngredient& input : ref.recipe->inputs)
-            {
-                scrapPerCycle += input.amount;
-            }
-
-            double threat = (table.scrapThreat * scrapPerCycle
-                             + ref.recipe->durationSeconds) / ref.probability;
-            std::map<std::string, double>::iterator existing = table.itemThreat.find(item);
-            if (existing == table.itemThreat.end() || threat > existing->second)
-            {
-                table.itemThreat[item] = threat;
-            }
-        }
-    }
-
-    return table;
-}
-
-
-double calculateShipThreatCost(const ThreatCostTable& table,
-                               const GameConfig& config,
-                               const std::string& shipId,
-                               const std::vector<PlacedModule>& modules)
-{
-    const ShipDef* shipDef = nullptr;
-    for (const ShipDef& d : config.ships.ships)
-    {
-        if (d.id == shipId)
-        {
-            shipDef = &d;
-            break;
-        }
-    }
-    if (shipDef == nullptr)
-    {
-        return 0.0;
-    }
-
-    double threat = shipDef->schematic.productionTimeSeconds;
-
-    // Add material threat for ship base materials.
-    threat += computeMaterialThreat(table, shipDef->schematic.materials);
-
-    // Add module production times and material threats.
-    for (const PlacedModule& pm : modules)
-    {
-        const ModuleDef* moduleDef = nullptr;
-        for (const ModuleDef& d : config.modules.modules)
-        {
-            if (d.id == pm.moduleId)
-            {
-                moduleDef = &d;
-                break;
-            }
-        }
-        if (moduleDef == nullptr)
-        {
-            continue;
-        }
-
-        threat += moduleDef->productionTimeSeconds;
-        threat += computeMaterialThreat(table, moduleDef->materials);
-    }
-
-    return threat;
-}

src/lib/sim/ThreatCostCalculator.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "ShipLayout.h"
-
-struct GameConfig;
-
-struct ThreatCostTable
-{
-    std::map<std::string, double> itemThreat;
-    double scrapThreat = 0.0;
-};
-
-ThreatCostTable computeThreatCostTable(const GameConfig& config);
-
-double calculateShipThreatCost(const ThreatCostTable& table,
-                               const GameConfig& config,
-                               const std::string& shipId,
-                               const std::vector<PlacedModule>& modules);

src/lib/sim/WaveSystem.cpp

@@ -3,7 +3,6 @@
 #include <algorithm>
 
 #include "ShipSystem.h"
-#include "ThreatCostCalculator.h"
 #include "tracing.h"
 
 WaveSystem::WaveSystem(const GameConfig& config, std::mt19937& rng)
@@ -103,16 +102,6 @@ double WaveSystem::threatLevel() const
     return m_threatLevel;
 }
 
-double WaveSystem::threatAccumulationRate() const
-{
-    if (isInQuietWindow())
-    {
-        return 0.0;
-    }
-    const double x = static_cast<double>(m_bossWaveCounter);
-    return std::max(0.0, m_config.world.waves.threatRateFormula.evaluate(x));
-}
-
 int WaveSystem::generation() const
 {
     return m_generation;
@@ -188,8 +177,7 @@ std::vector<WaveSystem::SpawnEntry> WaveSystem::selectWaveShips(double& budget,
     std::vector<EligibleShip> eligible;
     for (const ShipDef& def : m_config.ships.ships)
     {
-        const double cost = calculateShipThreatCost(m_config.threatCosts, m_config,
-                                                      def.id, def.defaultModules);
+        const double cost = def.threat.costFormula.evaluate(static_cast<double>(shipLevel));
         if (cost > 0.0)
         {
             EligibleShip es;

src/lib/sim/WaveSystem.h

@@ -36,11 +36,6 @@ public:
 
     double threatLevel() const;
 
-    // Current rate at which threatLevel() is increasing, in threat/second
-    // (REQ-WAV-THREAT-RATE). 0 during a quiet window (REQ-WAV-QUIET) or when
-    // the rate formula evaluates to a negative value.
-    double threatAccumulationRate() const;
-
     // Current enemy-station generation level (0 for initial set,
     // incremented by 1 after each push — REQ-PSH-STATION-STATS).
     int generation() const;

src/test/BeltSystemTest.cpp

@@ -1,7 +1,5 @@
 #include "catch.hpp"
 
-#include <optional>
-#include <string>
 #include <vector>
 
 #include <QPoint>
@@ -555,64 +553,6 @@ TEST_CASE("BeltSystem: splitter falls back to other output when preferred is blo
     REQUIRE_FALSE(bs.peekItem(Port{tileSpl, Rotation::South}).has_value());
 }
 
-TEST_CASE("BeltSystem: splitter fallback enters the open output at progress 0.75", "[belt]")
-{
-    // When the preferred output is blocked, the diverted item is dropped onto the
-    // open output near its edge (progress 0.75) instead of at progress 0.0. This
-    // closes the large gap that would otherwise appear between items leaving the
-    // open side of a half-blocked splitter.
-    //
-    // Progress/tick = 0.25 so the 0.0-vs-0.75 entry position is observable: a
-    // normally-routed item starts at 0.0, a fallback item starts at 0.75.
-    const double quarterSpeed = 0.25 * static_cast<double>(kTickRateHz);
-    BeltSystem bs(quarterSpeed);
-
-    const QPoint tileSpl(1, 0);
-    const QPoint tileB(1, 1);    // South output belt; North output has no belt (blocked).
-
-    bs.placeSplitter(tileSpl, Rotation::North, Rotation::South);
-    bs.placeBelt(tileB, Rotation::South);
-
-    // Reads a named item's progress along the South output via the rendering contract.
-    // slotWorldPos maps a South-bound slot on tileSpl (y = 0) to worldPos.y == progress.
-    // Matching by id avoids the blocked North item, which also renders at worldPos.y 0.
-    auto southProgressOf = [&bs](const std::string& id) -> std::optional<double>
-    {
-        std::optional<double> progress;
-        bs.forEachVisualItem(QRect(-5, -5, 20, 20), [&](VisualItem vi)
-        {
-            if (vi.type.id == id)
-            {
-                progress = vi.worldPos.y();
-            }
-        });
-        return progress;
-    };
-
-    // Permanently block output A: route one item to frontA where it sticks at 1.0
-    // (North has no downstream tile, so it can never move out).
-    bs.tryPutItem(tileSpl, makeItem("blockA"));
-    bs.tick();  // back: 0.25
-    bs.tick();  // back: 0.5 -> frontA at 0.0 (preferred A), nextOutputIsA = false
-    bs.tick(); bs.tick(); bs.tick(); bs.tick();  // frontA: 0.25 -> 0.5 -> 0.75 -> 1.0 (stuck)
-
-    // Item routed to B as the *preferred* output enters at progress 0.0.
-    bs.tryPutItem(tileSpl, makeItem("toB_pref"));
-    bs.tick();  // back: 0.25
-    bs.tick();  // back: 0.5 -> frontB at 0.0 (preferred B), nextOutputIsA = true
-    REQUIRE(southProgressOf("toB_pref") == Approx(0.0));
-
-    // Let it traverse and hand off to the downstream belt, freeing frontB.
-    bs.tick(); bs.tick(); bs.tick(); bs.tick();  // frontB: 0.25 -> 0.5 -> 0.75 -> 1.0 -> tileB
-
-    // Next item prefers A again (nextOutputIsA == true), but A is still blocked,
-    // so it falls back to B — and must enter near the edge at progress 0.75.
-    bs.tryPutItem(tileSpl, makeItem("toB_fallback"));
-    bs.tick();  // back: 0.25
-    bs.tick();  // back: 0.5 -> fallback routes to frontB at 0.75
-    REQUIRE(southProgressOf("toB_fallback") == Approx(0.75));
-}
-
 // ---------------------------------------------------------------------------
 // Splitter — direct building input (no output belts)
 // ---------------------------------------------------------------------------

src/test/BuildingTest.cpp

@@ -337,85 +337,6 @@ TEST_CASE("BuildingSystem: miner output buffer stalls when full", "[building]")
     REQUIRE_FALSE(b->production.has_value());
 }
 
-// ---------------------------------------------------------------------------
-// REQ-UI-DEBUG-OVERLAY production counts
-// ---------------------------------------------------------------------------
-
-TEST_CASE("BuildingSystem: productionBuildingCount excludes construction sites", "[building]")
-{
-    const GameConfig cfg = loadConfig();
-    BeltSystem belts(cfg.world.beltSpeed_tps);
-    int stock = 0;
-    std::mt19937 rng(0);
-    BuildingId nextBuildingId = 1;
-    BuildingSystem bs(cfg, belts,
-                      [&nextBuildingId]() { return nextBuildingId++; },
-                      [&stock](int n) { stock += n; },
-                      [](const std::string&, QVector2D, const std::optional<ShipLayoutConfig>&) {},
-                      [](const std::string&) -> bool { return true; },
-                      rng);
-
-    const BuildingId minerId   = bs.place(BuildingType::Miner,   QPoint(0, 0),  Rotation::East, 0);
-    const BuildingId smelterId = bs.place(BuildingType::Smelter, QPoint(10, 0), Rotation::East, 0);
-    (void)smelterId;
-
-    Tick tick = 0;
-    // Both still under construction.
-    REQUIRE(bs.productionBuildingCount() == 0);
-
-    // The queue builds one at a time: miner (10s) completes at tick 300, then
-    // the smelter (15s) starts and completes at tick 300 + 450 = 750.
-    runTicks(bs, belts, static_cast<int>(secondsToTicks(10.0)) + 1, tick);
-    REQUIRE(bs.productionBuildingCount() == 1);
-
-    runTicks(bs, belts, static_cast<int>(secondsToTicks(15.0)), tick);
-    REQUIRE(bs.productionBuildingCount() == 2);
-
-    // Neither has a recipe selected, so neither has an active cycle.
-    REQUIRE(bs.activeProductionBuildingCount() == 0);
-
-    bs.setRecipe(minerId, "mine_iron_ore");
-    runTicks(bs, belts, 1, tick);
-    REQUIRE(bs.activeProductionBuildingCount() == 1);
-}
-
-TEST_CASE("BuildingSystem: activeProductionBuildingCount tracks production cycle state",
-          "[building]")
-{
-    const GameConfig cfg = loadConfig();
-    BeltSystem belts(cfg.world.beltSpeed_tps);
-    int stock = 0;
-    std::mt19937 rng(0);
-    BuildingId nextBuildingId = 1;
-    BuildingSystem bs(cfg, belts,
-                      [&nextBuildingId]() { return nextBuildingId++; },
-                      [&stock](int n) { stock += n; },
-                      [](const std::string&, QVector2D, const std::optional<ShipLayoutConfig>&) {},
-                      [](const std::string&) -> bool { return true; },
-                      rng);
-
-    const BuildingId id = bs.place(BuildingType::Miner, QPoint(0, 0), Rotation::East, 0);
-    bs.setRecipe(id, "mine_iron_ore");
-
-    Tick tick = 0;
-    // Not yet operational while under construction.
-    REQUIRE(bs.activeProductionBuildingCount() == 0);
-
-    // Construction completes at tick 300; cycle 1 starts the same tick (completesAt=330).
-    runTicks(bs, belts, static_cast<int>(secondsToTicks(10.0)) + 1, tick);
-    REQUIRE(bs.activeProductionBuildingCount() == 1);
-
-    // Run cycles 1 and 2 to completion (1s each); cycle 3 stalls once the
-    // output buffer (capacity 2) is full (REQ-MAT-OUTPUT-BUFFER).
-    runTicks(bs, belts, 2 * static_cast<int>(secondsToTicks(1.0)) + 1, tick);
-
-    const Building* b = bs.findBuilding(id);
-    REQUIRE(b != nullptr);
-    REQUIRE(static_cast<int>(b->outputBuffer.items.size()) == 2);
-    REQUIRE_FALSE(b->production.has_value());
-    REQUIRE(bs.activeProductionBuildingCount() == 0);
-}
-
 // ---------------------------------------------------------------------------
 // Belt pull → input buffer
 // ---------------------------------------------------------------------------

src/test/CMakeLists.txt

@@ -19,6 +19,5 @@ add_files(
     BlueprintSerializerTest.cpp
     ModuleConfigTest.cpp
     ShipModuleTest.cpp
-    ThreatCostCalculatorTest.cpp
     RecipeSchematicTest.cpp
 )

src/test/CombatSystemTest.cpp

@@ -10,7 +10,7 @@
 #include "ConfigLoader.h"
 #include "EntityAdmin.h"
 #include "FactionComponent.h"
-#include "WeaponFiredEvent.h"
+#include "FireEvent.h"
 #include "HealthComponent.h"
 #include "HqProxyComponent.h"
 #include "ModuleOwnerComponent.h"
@@ -111,7 +111,7 @@ TEST_CASE("CombatSystem: ship fires when cooldown=0 and target in range", "[comb
 
     const float hpBefore = f.admin.get<HealthComponent>(player).hp;
 
-    std::vector<WeaponFiredEvent> events;
+    std::vector<FireEvent> events;
     f.combat.tick(0, f.admin, f.buildings, events);
     f.combat.applyPendingDamage(5, f.admin);
 
@@ -135,16 +135,16 @@ TEST_CASE("CombatSystem: cooldown prevents firing before it expires", "[combat]"
         f.admin.get<WeaponComponent>(wc).cooldownTicks = 3.0f;  // override to 3
     }
 
-    auto enemyFiredIn = [&enemy](const std::vector<WeaponFiredEvent>& evts)
+    auto enemyFiredIn = [&enemy](const std::vector<FireEvent>& evts)
     {
-        for (const WeaponFiredEvent& evt : evts)
+        for (const FireEvent& evt : evts)
         {
             if (evt.shooter == enemy) { return true; }
         }
         return false;
     };
 
-    std::vector<WeaponFiredEvent> events;
+    std::vector<FireEvent> events;
     f.combat.tick(0, f.admin, f.buildings, events);
     REQUIRE_FALSE(enemyFiredIn(events));
 
@@ -165,7 +165,7 @@ TEST_CASE("CombatSystem: no fire when target is out of range", "[combat]")
     const entt::entity player = f.ships.spawn(combatDef->id, 1, QVector2D(500.0f, 0.0f), false);
     f.wireEnemyTarget(enemy, player);
 
-    std::vector<WeaponFiredEvent> events;
+    std::vector<FireEvent> events;
     f.combat.tick(0, f.admin, f.buildings, events);
     REQUIRE(events.empty());
 }
@@ -204,9 +204,9 @@ TEST_CASE("CombatSystem: player station fires at enemy ship in range", "[combat]
 
     sim.tick();
 
-    const std::vector<WeaponFiredEvent> events = sim.drainWeaponFiredEvents();
+    const std::vector<FireEvent> events = sim.drainFireEvents();
     bool stationFired = false;
-    for (const WeaponFiredEvent& evt : events)
+    for (const FireEvent& evt : events)
     {
         if (evt.shooter == stationEntity) { stationFired = true; }
     }
@@ -242,9 +242,9 @@ TEST_CASE("CombatSystem: enemy station fires at player ship in range", "[combat]
 
     sim.tick();
 
-    const std::vector<WeaponFiredEvent> events = sim.drainWeaponFiredEvents();
+    const std::vector<FireEvent> events = sim.drainFireEvents();
     bool stationFired = false;
-    for (const WeaponFiredEvent& evt : events)
+    for (const FireEvent& evt : events)
     {
         if (evt.shooter == stationEntity) { stationFired = true; }
     }
@@ -280,9 +280,9 @@ TEST_CASE("CombatSystem: player ship fires at enemy station in range", "[combat]
 
     sim.tick();
 
-    const std::vector<WeaponFiredEvent> events = sim.drainWeaponFiredEvents();
+    const std::vector<FireEvent> events = sim.drainFireEvents();
     bool playerFiredAtStation = false;
-    for (const WeaponFiredEvent& evt : events)
+    for (const FireEvent& evt : events)
     {
         if (evt.shooter == playerShip && evt.target == stationEntity)
         {
@@ -308,7 +308,7 @@ TEST_CASE("CombatSystem: damage not applied before impact tick", "[combat]")
 
     const float hpBefore = f.admin.get<HealthComponent>(player).hp;
 
-    std::vector<WeaponFiredEvent> events;
+    std::vector<FireEvent> events;
     f.combat.tick(0, f.admin, f.buildings, events);
 
     for (Tick t = 1; t < 5; ++t)
@@ -330,7 +330,7 @@ TEST_CASE("CombatSystem: damage applied exactly at impact tick", "[combat]")
 
     const float hpBefore = f.admin.get<HealthComponent>(player).hp;
 
-    std::vector<WeaponFiredEvent> events;
+    std::vector<FireEvent> events;
     f.combat.tick(0, f.admin, f.buildings, events);
     f.combat.applyPendingDamage(5, f.admin);
 
@@ -347,7 +347,7 @@ TEST_CASE("CombatSystem: damage silently dropped if target already dead", "[comb
     const entt::entity player = f.ships.spawn(combatDef->id, 1, QVector2D(4.0f, 5.0f), false);
     f.wireEnemyTarget(enemy, player);
 
-    std::vector<WeaponFiredEvent> events;
+    std::vector<FireEvent> events;
     f.combat.tick(0, f.admin, f.buildings, events);
 
     f.ships.despawn(player);
@@ -370,7 +370,7 @@ TEST_CASE("CombatSystem: damage still applied if shooter already dead", "[combat
 
     const float hpBefore = f.admin.get<HealthComponent>(player).hp;
 
-    std::vector<WeaponFiredEvent> events;
+    std::vector<FireEvent> events;
     f.combat.tick(0, f.admin, f.buildings, events);
 
     f.ships.despawn(enemy);

src/test/ModuleConfigTest.cpp

@@ -40,6 +40,7 @@ TEST_CASE("ConfigLoader: loadModules parses modules.toml", "[config][modules]")
     CHECK(armor.materials[0].amount == 2);
     CHECK(armor.playerProductionLevel == 1);
     CHECK(armor.productionTimeSeconds == Approx(3.0));
+    CHECK(armor.threatCost == Approx(2.0));
     CHECK(armor.fillColor == "#808080");
     CHECK(armor.glyph == "A");
     REQUIRE(armor.statModifiers.size() == 1);

src/test/RecipeSchematicTest.cpp

@@ -3,12 +3,10 @@
 #include "catch.hpp"
 
 #include "ConfigLoader.h"
-#include "DisplayName.h"
 #include "FactionComponent.h"
 #include "GameConfig.h"
 #include "HealthComponent.h"
 #include "RecipesConfig.h"
-#include "SchematicChoiceOption.h"
 #include "Simulation.h"
 #include "StationBodyComponent.h"
 
@@ -18,7 +16,7 @@ static GameConfig loadConfig()
 }
 
 // Zeros the HP of both enemy defence stations and advances one tick so that
-// tickDeathsAndLoot fires, triggering the push and schematic choices.
+// tickDeathsAndLoot fires, triggering the push and schematic drop.
 static void killEnemyStations(Simulation& sim)
 {
     sim.admin().forEach<StationBodyComponent, FactionComponent, HealthComponent>(
@@ -32,25 +30,15 @@ static void killEnemyStations(Simulation& sim)
     sim.tick();
 }
 
-// Kills enemy stations and applies the first schematic choice (index 0).
-static void killEnemyStationsAndApply(Simulation& sim)
-{
-    killEnemyStations(sim);
-    if (sim.hasSchematicChoicesPending())
-    {
-        sim.applySchematicChoice(0);
-    }
-}
-
 // Destroys station sets until recipeId is unlocked or maxDestructions is reached.
-// Applies schematic choice 0 after each destruction. Returns true if unlocked.
+// Returns true if the recipe is unlocked on exit.
 static bool awaitRecipeUnlock(Simulation& sim, const std::string& recipeId,
                               int maxDestructions = 150)
 {
     for (int i = 0; i < maxDestructions; ++i)
     {
         if (sim.isRecipeUnlocked(recipeId)) { return true; }
-        killEnemyStationsAndApply(sim);
+        killEnemyStations(sim);
     }
     return sim.isRecipeUnlocked(recipeId);
 }
@@ -187,7 +175,7 @@ TEST_CASE("RecipeSchematic: recipe whose output is not implicitly unlocked is ne
     Simulation sim(loadConfig());
     for (int i = 0; i < 50; ++i)
     {
-        killEnemyStationsAndApply(sim);
+        killEnemyStations(sim);
     }
     REQUIRE_FALSE(sim.isRecipeUnlocked("exotic_alloy"));
 }
@@ -198,7 +186,7 @@ TEST_CASE("RecipeSchematic: recipe with level > destroyed station level is not a
     // advanced_circuit has unlock_at_station_level = 1. Destroying a single
     // level-0 station set must not award it regardless of the RNG outcome.
     Simulation sim(loadConfig());
-    killEnemyStationsAndApply(sim);
+    killEnemyStations(sim);
     REQUIRE_FALSE(sim.isRecipeUnlocked("advanced_circuit"));
 }
 
@@ -221,35 +209,25 @@ TEST_CASE("RecipeSchematic: awarded recipe schematic stays unlocked and is not a
     // Destroy 30 more station sets; the recipe is no longer in the pool.
     for (int i = 0; i < 30; ++i)
     {
-        killEnemyStationsAndApply(sim);
+        killEnemyStations(sim);
     }
 
     REQUIRE(sim.isRecipeUnlocked("quick_circuit"));
 }
 
-TEST_CASE("RecipeSchematic: recipe schematic can appear in pending choices",
+TEST_CASE("RecipeSchematic: no SchematicDropEvent is emitted for a recipe schematic drop",
           "[recipe_schematic]")
 {
     Simulation sim(loadConfig());
+    sim.drainSchematicDropEvents(); // clear any startup events
 
-    bool foundRecipeChoice = false;
-    for (int i = 0; i < 150 && !foundRecipeChoice; ++i)
+    awaitRecipeUnlock(sim, "quick_circuit");
+
+    const std::vector<SchematicDropEvent> events = sim.drainSchematicDropEvents();
+    for (const SchematicDropEvent& ev : events)
     {
-        killEnemyStations(sim);
-        if (sim.hasSchematicChoicesPending())
-        {
-            for (const SchematicChoiceOption& opt : sim.getPendingSchematicChoices())
-            {
-                if (opt.type == SchematicType::Recipe)
-                {
-                    foundRecipeChoice = true;
-                    break;
+        CHECK(ev.schematicId != "quick_circuit");
     }
-            }
-            sim.applySchematicChoice(0);
-        }
-    }
-    CHECK(foundRecipeChoice);
 }
 
 // ---------------------------------------------------------------------------
@@ -278,85 +256,3 @@ TEST_CASE("RecipeSchematic: reset keeps -1 recipes unlocked and their seed items
     REQUIRE(sim.isItemUnlocked("premium_circuit"));
 }
 
-// ---------------------------------------------------------------------------
-// Unlock dialog: newly-unlocked recipe preview (REQ-DEF-SCHEMATIC-DROP)
-// ---------------------------------------------------------------------------
-
-TEST_CASE("RecipeSchematic: newlyUnlockedItemNames is sorted, deduplicated, and empty for level-ups",
-          "[recipe_schematic]")
-{
-    Simulation sim(loadConfig());
-
-    for (int i = 0; i < 100; ++i)
-    {
-        killEnemyStations(sim);
-        if (!sim.hasSchematicChoicesPending()) { continue; }
-
-        for (const SchematicChoiceOption& opt : sim.getPendingSchematicChoices())
-        {
-            // Strictly ascending implies sorted and deduplicated.
-            for (std::size_t j = 1; j < opt.newlyUnlockedItemNames.size(); ++j)
-            {
-                CHECK(opt.newlyUnlockedItemNames[j - 1] < opt.newlyUnlockedItemNames[j]);
-            }
-
-            // A level-up doesn't change the explicit unlock state, so the
-            // implicit unlock set - and thus this preview - must be empty.
-            if (!opt.isNewUnlock)
-            {
-                CHECK(opt.newlyUnlockedItemNames.empty());
-            }
-        }
-
-        sim.applySchematicChoice(0);
-    }
-}
-
-TEST_CASE("RecipeSchematic: newlyUnlockedItemNames matches recipes that actually become unlocked",
-          "[recipe_schematic]")
-{
-    Simulation sim(loadConfig());
-    const GameConfig cfg = loadConfig();
-
-    auto unlockedTrackedRecipeIds = [&]()
-    {
-        std::set<std::string> ids;
-        for (const RecipeDef& def : cfg.recipes.recipes)
-        {
-            if ((def.building == BuildingType::Miner || def.building == BuildingType::Assembler)
-                && sim.isRecipeUnlocked(def.id))
-            {
-                ids.insert(def.id);
-            }
-        }
-        return ids;
-    };
-
-    for (int i = 0; i < 100; ++i)
-    {
-        killEnemyStations(sim);
-        if (!sim.hasSchematicChoicesPending()) { continue; }
-
-        const std::set<std::string> unlockedBefore = unlockedTrackedRecipeIds();
-        const SchematicChoiceOption choice = sim.getPendingSchematicChoices()[0];
-
-        sim.applySchematicChoice(0);
-
-        std::set<std::string> expectedNames;
-        for (const RecipeDef& def : cfg.recipes.recipes)
-        {
-            if ((def.building == BuildingType::Miner || def.building == BuildingType::Assembler)
-                && sim.isRecipeUnlocked(def.id) && unlockedBefore.count(def.id) == 0)
-            {
-                for (const RecipeOutput& out : def.outputs)
-                {
-                    expectedNames.insert(toDisplayName(out.item));
-                }
-            }
-        }
-        const std::vector<std::string> expected(expectedNames.begin(), expectedNames.end());
-
-        REQUIRE(choice.newlyUnlockedItemNames == expected);
-    }
-}
-

src/test/SimulationTest.cpp

@@ -43,29 +43,29 @@ TEST_CASE("Simulation::tick 10 times yields currentTick == 10", "[simulation]")
     REQUIRE(sim.currentTick() == 10);
 }
 
-TEST_CASE("Simulation::drainWeaponFiredEvents returns empty initially", "[simulation]")
+TEST_CASE("Simulation::drainFireEvents returns empty initially", "[simulation]")
 {
     Simulation sim(loadConfig());
 
-    REQUIRE(sim.drainWeaponFiredEvents().empty());
+    REQUIRE(sim.drainFireEvents().empty());
 }
 
-TEST_CASE("Simulation::drainWeaponFiredEvents clears queue on drain", "[simulation]")
+TEST_CASE("Simulation::drainFireEvents clears queue on drain", "[simulation]")
 {
     Simulation sim(loadConfig());
 
     // First drain: empty.
-    sim.drainWeaponFiredEvents();
+    sim.drainFireEvents();
 
     // Second drain must also be empty (not a double-return).
-    REQUIRE(sim.drainWeaponFiredEvents().empty());
+    REQUIRE(sim.drainFireEvents().empty());
 }
 
-TEST_CASE("Simulation::hasSchematicChoicesPending returns false initially", "[simulation]")
+TEST_CASE("Simulation::drainSchematicDropEvents returns empty initially", "[simulation]")
 {
     Simulation sim(loadConfig());
 
-    REQUIRE_FALSE(sim.hasSchematicChoicesPending());
+    REQUIRE(sim.drainSchematicDropEvents().empty());
 }
 
 // ---------------------------------------------------------------------------

src/test/ThreatCostCalculatorTest.cpp

@@ -1,110 +0,0 @@
-#include "catch.hpp"
-
-#include "ConfigLoader.h"
-#include "ThreatCostCalculator.h"
-
-static GameConfig loadConfig()
-{
-    return ConfigLoader::loadFromDirectory(CONFIG_DIR);
-}
-
-TEST_CASE("ThreatCostCalculator: miner item threat equals duration", "[threat]")
-{
-    const GameConfig cfg = loadConfig();
-    const ThreatCostTable& table = cfg.threatCosts;
-
-    CHECK(table.itemThreat.at("iron_ore") == Approx(1.0));
-    CHECK(table.itemThreat.at("copper_ore") == Approx(1.5));
-}
-
-TEST_CASE("ThreatCostCalculator: smelter item threat includes input costs", "[threat]")
-{
-    const GameConfig cfg = loadConfig();
-    const ThreatCostTable& table = cfg.threatCosts;
-
-    // iron_ingot: duration 2.0 + iron_ore(1.0) * 2 = 4.0
-    CHECK(table.itemThreat.at("iron_ingot") == Approx(4.0));
-    // copper_ingot: duration 2.5 + copper_ore(1.5) * 2 = 5.5
-    CHECK(table.itemThreat.at("copper_ingot") == Approx(5.5));
-}
-
-TEST_CASE("ThreatCostCalculator: assembler takes max across recipes", "[threat]")
-{
-    const GameConfig cfg = loadConfig();
-    const ThreatCostTable& table = cfg.threatCosts;
-
-    // circuit_board has three non-reprocessing recipes:
-    //   5.0 + iron_ingot(4.0)*3 + copper_ingot(5.5)*2 = 28.0
-    //   3.0 + copper_ingot(5.5)*3 = 19.5
-    //   6.0 + iron_ingot(4.0)*5 = 26.0
-    // max = 28.0
-    CHECK(table.itemThreat.at("circuit_board") == Approx(28.0));
-}
-
-TEST_CASE("ThreatCostCalculator: scrap threat from cheapest ship", "[threat]")
-{
-    const GameConfig cfg = loadConfig();
-    const ThreatCostTable& table = cfg.threatCosts;
-
-    // Cheapest ship by scrap_drop is interceptor (scrap_drop=2).
-    // Interceptor threat: 10 + iron_ingot(4)*3 + circuit_board(28)*1
-    //   + laser_cannon(5 + iron_ingot(4)*1) = 10 + 12 + 28 + 9 = 59.0
-    // scrapThreat = 59.0 / 2 = 29.5
-    CHECK(table.scrapThreat == Approx(29.5));
-}
-
-TEST_CASE("ThreatCostCalculator: reprocessing-only item threat", "[threat]")
-{
-    const GameConfig cfg = loadConfig();
-    const ThreatCostTable& table = cfg.threatCosts;
-
-    // advanced_alloy: reprocessing recipe with scrap*5, duration 3.0, probability 0.1
-    // (29.5 * 5 + 3.0) / 0.1 = 1505.0
-    CHECK(table.itemThreat.at("advanced_alloy") == Approx(1505.0));
-}
-
-TEST_CASE("ThreatCostCalculator: ship threat with default modules", "[threat]")
-{
-    const GameConfig cfg = loadConfig();
-    const ThreatCostTable& table = cfg.threatCosts;
-
-    // interceptor: 10 + iron_ingot(4)*3 + circuit_board(28)*1 + laser_cannon(5 + 4*1) = 59.0
-    double interceptorThreat = calculateShipThreatCost(
-        table, cfg, "interceptor", cfg.ships.ships[0].defaultModules);
-    CHECK(interceptorThreat == Approx(59.0));
-
-    // salvage_ship (no default modules): 10 + iron_ingot(4)*4 = 26.0
-    double salvageThreat = calculateShipThreatCost(
-        table, cfg, "salvage_ship", cfg.ships.ships[2].defaultModules);
-    CHECK(salvageThreat == Approx(26.0));
-}
-
-TEST_CASE("ThreatCostCalculator: ship threat with custom modules", "[threat]")
-{
-    const GameConfig cfg = loadConfig();
-    const ThreatCostTable& table = cfg.threatCosts;
-
-    // interceptor base: 10 + iron_ingot(4)*3 + circuit_board(28)*1 = 50.0
-    // + armor_plate: 3 + iron_ingot(4)*2 = 11.0
-    // + sensor_booster: 2 + circuit_board(28)*1 = 30.0
-    // total = 50.0 + 11.0 + 30.0 = 91.0
-    std::vector<PlacedModule> modules;
-    PlacedModule armor;
-    armor.moduleId = "armor_plate";
-    modules.push_back(armor);
-    PlacedModule sensor;
-    sensor.moduleId = "sensor_booster";
-    modules.push_back(sensor);
-
-    double threat = calculateShipThreatCost(table, cfg, "interceptor", modules);
-    CHECK(threat == Approx(91.0));
-}
-
-TEST_CASE("ThreatCostCalculator: unknown ship returns zero", "[threat]")
-{
-    const GameConfig cfg = loadConfig();
-    const ThreatCostTable& table = cfg.threatCosts;
-
-    double threat = calculateShipThreatCost(table, cfg, "nonexistent_ship", {});
-    CHECK(threat == Approx(0.0));
-}

src/test/WaveSystemTest.cpp

@@ -17,12 +17,9 @@
 #include "StationBodyComponent.h"
 #include "WeaponComponent.h"
 #include "ModulesConfig.h"
-#include "RecipesConfig.h"
-#include "SchematicChoiceOption.h"
 #include "ShipsConfig.h"
 #include "Simulation.h"
 #include "Tick.h"
-#include "ThreatCostCalculator.h"
 #include "WaveSystem.h"
 
 static GameConfig loadConfig()
@@ -51,35 +48,6 @@ TEST_CASE("WaveSystem: threat accumulates at boss wave counter rate", "[wave]")
     REQUIRE(ws.threatLevel() == Approx(1.0));
 }
 
-TEST_CASE("WaveSystem: threatAccumulationRate matches the rate formula outside quiet windows",
-          "[wave]")
-{
-    const GameConfig cfg = loadConfig();
-    std::mt19937 rng(42);
-    WaveSystem ws(cfg, rng);
-
-    // threat_rate_formula = "x", boss wave counter starts at 1 → rate = 1 threat/s.
-    REQUIRE(ws.threatAccumulationRate() == Approx(1.0));
-}
-
-TEST_CASE("WaveSystem: threatAccumulationRate is 0 during a quiet window", "[wave]")
-{
-    GameConfig cfg = loadConfig();
-    // Start with the boss countdown already at the pre-boss quiet threshold.
-    cfg.world.waves.bossCountdownSeconds = cfg.world.waves.bossQuietBeforeSeconds;
-    std::mt19937 rng(42);
-    WaveSystem ws(cfg, rng);
-
-    REQUIRE(ws.threatAccumulationRate() == Approx(0.0));
-
-    const double before = ws.threatLevel();
-    for (int i = 0; i < static_cast<int>(secondsToTicks(1.0)); ++i)
-    {
-        ws.tickThreatAccumulation();
-    }
-    REQUIRE(ws.threatLevel() == Approx(before));
-}
-
 TEST_CASE("WaveSystem: generation starts at 0 and increments on station destruction", "[wave]")
 {
     const GameConfig cfg = loadConfig();
@@ -231,16 +199,25 @@ TEST_CASE("WaveSystem: enemy ships spawn after the initial gap elapses", "[wave]
     REQUIRE(foundEnemyShip);
 }
 
-TEST_CASE("WaveSystem: all ships have positive dynamic threat cost", "[wave]")
+TEST_CASE("WaveSystem: only eligible ships (cost > 0) appear in waves", "[wave]")
 {
-    const GameConfig cfg = loadConfig();
+    Simulation sim(loadConfig(), 42);
 
-    for (const ShipDef& def : cfg.ships.ships)
+    // Run long enough for several waves.
+    const int limit = static_cast<int>(secondsToTicks(120.0));
+    for (int i = 0; i < limit; ++i)
     {
-        const double cost = calculateShipThreatCost(cfg.threatCosts, cfg,
-                                                       def.id, def.defaultModules);
-        CHECK(cost > 0.0);
+        sim.tick();
     }
+
+    sim.admin().forEach<ShipIdentityComponent, FactionComponent>(
+        [&](entt::entity /*e*/, const ShipIdentityComponent& si, const FactionComponent& f)
+        {
+            if (!f.isEnemy) { return; }
+            // salvage_ship and repair_ship have cost_formula = "0" and must not spawn.
+            REQUIRE(si.schematicId != "salvage_ship");
+            REQUIRE(si.schematicId != "repair_ship");
+        });
 }
 
 // ---------------------------------------------------------------------------
@@ -270,7 +247,7 @@ TEST_CASE("WaveSystem: destroying both enemy stations triggers a push", "[wave]"
     REQUIRE(enemyCount == 2);
 }
 
-TEST_CASE("WaveSystem: push generates pending schematic choices", "[wave]")
+TEST_CASE("WaveSystem: push emits exactly one SchematicDropEvent", "[wave]")
 {
     Simulation sim(loadConfig(), 42);
 
@@ -282,13 +259,11 @@ TEST_CASE("WaveSystem: push generates pending schematic choices", "[wave]")
 
     sim.tick();
 
-    REQUIRE(sim.hasSchematicChoicesPending());
-    const std::vector<SchematicChoiceOption>& choices = sim.getPendingSchematicChoices();
-    REQUIRE(choices.size() >= 1);
-    REQUIRE(choices.size() <= 3);
+    const std::vector<SchematicDropEvent> events = sim.drainSchematicDropEvents();
+    REQUIRE(events.size() == 1);
 }
 
-TEST_CASE("WaveSystem: push schematic choices have valid ids", "[wave]")
+TEST_CASE("WaveSystem: push schematic drop awards a known ship id", "[wave]")
 {
     Simulation sim(loadConfig(), 42);
 
@@ -299,68 +274,23 @@ TEST_CASE("WaveSystem: push schematic choices have valid ids", "[wave]")
         });
 
     sim.tick();
-    const std::vector<SchematicChoiceOption>& choices = sim.getPendingSchematicChoices();
-    REQUIRE_FALSE(choices.empty());
+    const std::vector<SchematicDropEvent> events = sim.drainSchematicDropEvents();
+    REQUIRE(events.size() == 1);
 
-    for (const SchematicChoiceOption& opt : choices)
-    {
     bool validId = false;
     for (const ShipDef& def : sim.config().ships.ships)
     {
-            if (def.id == opt.schematicId) { validId = true; break; }
+        if (def.id == events[0].schematicId) { validId = true; break; }
     }
     if (!validId)
     {
         for (const ModuleDef& def : sim.config().modules.modules)
         {
-                if (def.id == opt.schematicId) { validId = true; break; }
-            }
-        }
-        if (!validId)
-        {
-            for (const RecipeDef& def : sim.config().recipes.recipes)
-            {
-                if (def.id == opt.schematicId) { validId = true; break; }
+            if (def.id == events[0].schematicId) { validId = true; break; }
         }
     }
     REQUIRE(validId);
-    }
-}
-
-TEST_CASE("WaveSystem: schematic choices have no duplicates", "[wave]")
-{
-    Simulation sim(loadConfig(), 42);
-
-    sim.admin().forEach<StationBodyComponent, FactionComponent, HealthComponent>(
-        [](entt::entity /*e*/, const StationBodyComponent& /*sb*/, const FactionComponent& f, HealthComponent& h)
-        {
-            if (f.isEnemy) { h.hp = -1.0f; }
-        });
-
-    sim.tick();
-    const std::vector<SchematicChoiceOption>& choices = sim.getPendingSchematicChoices();
-    std::set<std::string> ids;
-    for (const SchematicChoiceOption& opt : choices)
-    {
-        ids.insert(opt.schematicId);
-    }
-    REQUIRE(ids.size() == choices.size());
-}
-
-TEST_CASE("WaveSystem: applySchematicChoice clears pending and applies", "[wave]")
-{
-    Simulation sim(loadConfig(), 42);
-
-    sim.admin().forEach<StationBodyComponent, FactionComponent, HealthComponent>(
-        [](entt::entity /*e*/, const StationBodyComponent& /*sb*/, const FactionComponent& f, HealthComponent& h)
-        {
-            if (f.isEnemy) { h.hp = -1.0f; }
-        });
-
-    sim.tick();
-    REQUIRE(sim.hasSchematicChoicesPending());
-    sim.applySchematicChoice(0);
-    REQUIRE_FALSE(sim.hasSchematicChoicesPending());
+    REQUIRE(events[0].newLevel >= 1);
 }
 
 TEST_CASE("WaveSystem: push places new enemy stations further right", "[wave]")

src/ui/BlueprintPanel.cpp

@@ -12,11 +12,8 @@
 #include <QScrollArea>
 #include <QVBoxLayout>
 
-#include "BlueprintPlacementRequestedEvent.h"
 #include "BlueprintSerializer.h"
 #include "BuildingBlocksChangedEvent.h"
-#include "EventManager.h"
-#include "ExitBlueprintModeRequestedEvent.h"
 
 #include "Building.h"
 #include "BuildingSystem.h"
@@ -65,12 +62,12 @@ BlueprintPanel::BlueprintPanel(Simulation* sim, const GameConfig* config, QWidge
     connect(m_saveBtn, &QPushButton::clicked, this, &BlueprintPanel::onSaveClicked);
     connect(m_loadBtn, &QPushButton::clicked, this, &BlueprintPanel::onLoadClicked);
 
-    registerForEvents();
+    registerForEvent();
 }
 
 BlueprintPanel::~BlueprintPanel()
 {
-    unregisterForEvents();
+    unregisterForEvent();
 }
 
 void BlueprintPanel::onSelectionChanged(const std::vector<BuildingId>& ids)
@@ -117,8 +114,7 @@ void BlueprintPanel::onDeleteBlueprintClicked(int index)
     if (m_activeIndex == index)
     {
         m_activeIndex = -1;
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<ExitBlueprintModeRequestedEvent>());
+        emit exitBlueprintModeRequested();
     }
     else if (m_activeIndex > index)
     {
@@ -135,8 +131,7 @@ void BlueprintPanel::onBlueprintButtonClicked(int index)
     if (m_activeIndex == index)
     {
         clearActiveBlueprintButton();
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<ExitBlueprintModeRequestedEvent>());
+        emit exitBlueprintModeRequested();
         return;
     }
 
@@ -147,8 +142,7 @@ void BlueprintPanel::onBlueprintButtonClicked(int index)
 
     m_activeIndex = index;
     m_blueprintButtons[static_cast<std::size_t>(index)]->setChecked(true);
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<BlueprintPlacementRequestedEvent>(m_blueprints[static_cast<std::size_t>(index)]));
+    emit blueprintPlacementRequested(m_blueprints[static_cast<std::size_t>(index)]);
 }
 
 Blueprint BlueprintPanel::createBlueprintFromSelection() const
@@ -318,8 +312,7 @@ void BlueprintPanel::onLoadClicked()
 
         if (m_activeIndex >= 0)
         {
-            EventManager::getInstance()->sendEventImmediately(
-                std::make_shared<ExitBlueprintModeRequestedEvent>());
+            emit exitBlueprintModeRequested();
             m_activeIndex = -1;
         }
 
@@ -357,13 +350,3 @@ void BlueprintPanel::refreshButtonStates()
             canAfford || m_activeIndex == i);
     }
 }
-
-void BlueprintPanel::handleEvent(std::shared_ptr<const SelectionChangedEvent> event)
-{
-    onSelectionChanged(event->ids);
-}
-
-void BlueprintPanel::handleEvent(std::shared_ptr<const BlueprintModeExitedEvent> /*event*/)
-{
-    clearActiveBlueprintButton();
-}

src/ui/BlueprintPanel.h

@@ -5,12 +5,10 @@
 #include <QWidget>
 
 #include "Blueprint.h"
-#include "BlueprintModeExitedEvent.h"
 #include "BuildingBlocksChangedEvent.h"
 #include "BuildingId.h"
 #include "EventHandler.h"
 #include "GameConfig.h"
-#include "SelectionChangedEvent.h"
 #include "Tick.h"
 
 class Simulation;
@@ -19,9 +17,7 @@ class QScrollArea;
 class QVBoxLayout;
 
 class BlueprintPanel : public QWidget,
-                       public CombinedEventHandler<BuildingBlocksChangedEvent,
-                                                   SelectionChangedEvent,
-                                                   BlueprintModeExitedEvent>
+                       public EventHandler<BuildingBlocksChangedEvent>
 {
     Q_OBJECT
 
@@ -29,10 +25,16 @@ public:
     BlueprintPanel(Simulation* sim, const GameConfig* config, QWidget* parent = nullptr);
     ~BlueprintPanel() override;
 
+public slots:
+    void onSelectionChanged(const std::vector<BuildingId>& ids);
+    void clearActiveBlueprintButton();
+
+signals:
+    void blueprintPlacementRequested(Blueprint blueprint);
+    void exitBlueprintModeRequested();
+
 private:
     void handleEvent(std::shared_ptr<const BuildingBlocksChangedEvent> event) override;
-    void handleEvent(std::shared_ptr<const SelectionChangedEvent> event) override;
-    void handleEvent(std::shared_ptr<const BlueprintModeExitedEvent> event) override;
 
 private slots:
     void onCreateClicked();
@@ -42,8 +44,6 @@ private slots:
     void onLoadClicked();
 
 private:
-    void onSelectionChanged(const std::vector<BuildingId>& ids);
-    void clearActiveBlueprintButton();
     Blueprint createBlueprintFromSelection() const;
     int       computeBlueprintCost(const Blueprint& bp) const;
     void      rebuildButtons();

src/ui/BuildButtonGrid.cpp

@@ -1,5 +1,6 @@
 #include "BuildButtonGrid.h"
 
+#include <cctype>
 #include <string>
 
 #include <QGridLayout>
@@ -7,11 +8,35 @@
 #include <QSignalMapper>
 
 #include "BuildingType.h"
-#include "BuildingTypeSelectedEvent.h"
-#include "DemolishModeToggleRequestedEvent.h"
-#include "DisplayName.h"
-#include "EventManager.h"
-#include "ExitBuilderModeRequestedEvent.h"
+
+namespace
+{
+
+QString displayName(const std::string& id)
+{
+    QString result;
+    bool nextUpper = true;
+    for (char c : id)
+    {
+        if (c == '_')
+        {
+            result += ' ';
+            nextUpper = true;
+        }
+        else if (nextUpper)
+        {
+            result += static_cast<char>(std::toupper(static_cast<unsigned char>(c)));
+            nextUpper = false;
+        }
+        else
+        {
+            result += c;
+        }
+    }
+    return result;
+}
+
+}  // namespace
 
 
 BuildButtonGrid::BuildButtonGrid(const GameConfig* config, QWidget* parent)
@@ -37,7 +62,7 @@ BuildButtonGrid::BuildButtonGrid(const GameConfig* config, QWidget* parent)
         m_types.push_back(def.type);
         m_costs[def.type] = def.cost;
 
-        const QString label = QString::fromStdString(toDisplayName(def.id))
+        const QString label = displayName(def.id)
             + "\n" + tr("%1 Blocks").arg(def.cost);
         QPushButton* btn = new QPushButton(label, this);
         btn->setCheckable(true);
@@ -62,17 +87,7 @@ BuildButtonGrid::BuildButtonGrid(const GameConfig* config, QWidget* parent)
     m_demolishButton->setCheckable(true);
     m_demolishButton->setFixedHeight(48);
     layout->addWidget(m_demolishButton, row, col);
-    connect(m_demolishButton, &QPushButton::clicked, this, [this]() {
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<DemolishModeToggleRequestedEvent>());
-    });
-
-    registerForEvents();
-}
-
-BuildButtonGrid::~BuildButtonGrid()
-{
-    unregisterForEvents();
+    connect(m_demolishButton, SIGNAL(clicked()), this, SIGNAL(demolishModeToggleRequested()));
 }
 
 void BuildButtonGrid::updateAffordability(int buildingBlocks)
@@ -86,6 +101,11 @@ void BuildButtonGrid::updateAffordability(int buildingBlocks)
     }
 }
 
+void BuildButtonGrid::setDemolishModeActive(bool active)
+{
+    m_demolishButton->setChecked(active);
+}
+
 void BuildButtonGrid::clearActiveButton()
 {
     if (m_activeIndex >= 0 && m_activeIndex < static_cast<int>(m_buttons.size()))
@@ -105,8 +125,7 @@ void BuildButtonGrid::onBuildButton(int index)
     if (m_activeIndex == index)
     {
         clearActiveButton();
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<ExitBuilderModeRequestedEvent>());
+        emit builderModeExited();
         return;
     }
 
@@ -117,16 +136,5 @@ void BuildButtonGrid::onBuildButton(int index)
 
     m_activeIndex = index;
     m_buttons[static_cast<std::size_t>(index)]->setChecked(true);
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<BuildingTypeSelectedEvent>(m_types[static_cast<std::size_t>(index)]));
-}
-
-void BuildButtonGrid::handleEvent(std::shared_ptr<const BuilderModeExitedEvent> /*event*/)
-{
-    clearActiveButton();
-}
-
-void BuildButtonGrid::handleEvent(std::shared_ptr<const DemolishModeChangedEvent> event)
-{
-    m_demolishButton->setChecked(event->active);
+    emit buildingTypeSelected(m_types[static_cast<std::size_t>(index)]);
 }

src/ui/BuildButtonGrid.h

@@ -5,30 +5,28 @@
 
 #include <QWidget>
 
-#include "BuilderModeExitedEvent.h"
 #include "BuildingType.h"
-#include "DemolishModeChangedEvent.h"
-#include "EventHandler.h"
 #include "GameConfig.h"
 
 class QPushButton;
 
-class BuildButtonGrid : public QWidget,
-                        public CombinedEventHandler<BuilderModeExitedEvent,
-                                                    DemolishModeChangedEvent>
+class BuildButtonGrid : public QWidget
 {
     Q_OBJECT
 
 public:
     BuildButtonGrid(const GameConfig* config, QWidget* parent = nullptr);
-    ~BuildButtonGrid() override;
 
     void updateAffordability(int buildingBlocks);
     void clearActiveButton();
 
-private:
-    void handleEvent(std::shared_ptr<const BuilderModeExitedEvent> event) override;
-    void handleEvent(std::shared_ptr<const DemolishModeChangedEvent> event) override;
+signals:
+    void buildingTypeSelected(BuildingType type);
+    void builderModeExited();
+    void demolishModeToggleRequested();
+
+public slots:
+    void setDemolishModeActive(bool active);
 
 private slots:
     void onBuildButton(int index);

src/ui/CMakeLists.txt

@@ -11,7 +11,6 @@ SET(HDRS
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipLayoutDialog.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipLayoutPreview.h
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipStatsPanel.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/SchematicChoiceDialog.h
     PARENT_SCOPE
 )
 
@@ -27,6 +26,5 @@ SET(SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipLayoutDialog.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipLayoutPreview.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/ShipStatsPanel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/SchematicChoiceDialog.cpp
     PARENT_SCOPE
 )

src/ui/GameWorldView.cpp

@@ -15,23 +15,19 @@
 #include <QPainter>
 #include <QPen>
 #include <QPolygonF>
-#include <QStringList>
 #include <QTimer>
 
 #include "BeltSystem.h"
 #include "Building.h"
 #include "BuildingSystem.h"
-#include "DemolishModeChangedEvent.h"
 #include "EntityHitTest.h"
 #include "EntitySelectedEvent.h"
 #include "EventManager.h"
 #include "FacingComponent.h"
 #include "FactionComponent.h"
-#include "GameOverEvent.h"
 #include "HealthComponent.h"
 #include "PositionComponent.h"
 #include "ScrapSystem.h"
-#include "SelectionChangedEvent.h"
 #include "SensorRangeComponent.h"
 #include "ShipIdentityComponent.h"
 #include "ShipSystem.h"
@@ -39,14 +35,10 @@
 #include "StationBodyComponent.h"
 #include "SurfaceMask.h"
 #include "Tick.h"
-#include "EscapeMenuRequestedEvent.h"
 #include "TracePrintRequestedEvent.h"
 #include "BossWaveUpdatedEvent.h"
-#include "BuilderModeExitedEvent.h"
-#include "BlueprintModeExitedEvent.h"
 #include "BuildingBlocksChangedEvent.h"
 #include "GameSpeedChangedEvent.h"
-#include "SchematicChoicesAvailableEvent.h"
 #include "TickAdvancedEvent.h"
 
 namespace
@@ -76,6 +68,31 @@ Rotation rotateCounterClockwise(Rotation r)
     return Rotation::East;
 }
 
+
+QString toDisplayName(const std::string& id)
+{
+    QString result;
+    bool nextUpper = true;
+    for (char c : id)
+    {
+        if (c == '_')
+        {
+            result += ' ';
+            nextUpper = true;
+        }
+        else if (nextUpper)
+        {
+            result += static_cast<char>(std::toupper(static_cast<unsigned char>(c)));
+            nextUpper = false;
+        }
+        else
+        {
+            result += c;
+        }
+    }
+    return result;
+}
+
 QPoint portBodyTile(QPoint portTile, Rotation direction)
 {
     switch (direction)
@@ -112,7 +129,6 @@ GameWorldView::GameWorldView(Simulation* sim, const GameConfig* config,
     , m_scrollLeft(false)
     , m_scrollRight(false)
     , m_gameOverShown(false)
-    , m_schematicChoiceShown(false)
 {
     setFocusPolicy(Qt::StrongFocus);
     setMouseTracking(true);
@@ -122,13 +138,6 @@ GameWorldView::GameWorldView(Simulation* sim, const GameConfig* config,
     connect(m_renderTimer, &QTimer::timeout, this, &GameWorldView::onFrame);
     m_renderTimer->start();
     m_frameTimer.start();
-
-    registerForEvents();
-}
-
-GameWorldView::~GameWorldView()
-{
-    unregisterForEvents();
 }
 
 void GameWorldView::initializeGL()
@@ -151,13 +160,56 @@ void GameWorldView::onFrame()
         }
     }
 
-    // Emit fire events via EventManager
+    // Drain fire events → active beams
     {
-        const std::vector<WeaponFiredEvent> fires = m_sim->drainWeaponFiredEvents();
-        for (const WeaponFiredEvent& fe : fires)
+        const std::vector<FireEvent> fires = m_sim->drainFireEvents();
+        for (const FireEvent& fe : fires)
         {
-            EventManager::getInstance()->sendEventImmediately(
-                std::make_shared<WeaponFiredEvent>(fe));
+            float maxRadius = 0.125f;
+            if (m_sim->admin().isValid(fe.target)
+                && m_sim->admin().hasAll<StationBodyComponent>(fe.target))
+            {
+                const StationBodyComponent& sb = m_sim->admin().get<StationBodyComponent>(fe.target);
+                const int shorter = std::min(sb.footprint.width(), sb.footprint.height());
+                maxRadius = shorter / 2.0f;
+            }
+
+            std::uniform_real_distribution<float> angleDist(0.0f, 6.28318530f);
+            std::uniform_real_distribution<float> radiusDist(0.0f, maxRadius);
+            const float angle  = angleDist(m_rng);
+            const float radius = radiusDist(m_rng);
+
+            ActiveBeam beam;
+            beam.event         = fe;
+            beam.emittedWallMs = m_wallMs;
+            beam.targetOffset  = QVector2D(radius * std::cos(angle),
+                                           radius * std::sin(angle));
+            m_activeBeams.push_back(beam);
+        }
+    }
+
+    // Drain schematic drop events → toasts
+    {
+        const std::vector<SchematicDropEvent> drops =
+            m_sim->drainSchematicDropEvents();
+        for (const SchematicDropEvent& ev : drops)
+        {
+            const QString name = toDisplayName(ev.schematicId);
+            ToastEntry toast;
+            if (ev.isModuleSchematic)
+            {
+                toast.text = ev.wasNewUnlock
+                    ? tr("Module unlocked: ") + name
+                    : name + tr(" production level -> ") + QString::number(ev.newLevel);
+            }
+            else
+            {
+                toast.text = ev.wasNewUnlock
+                    ? tr("Schematic unlocked: ") + name
+                    : name + tr(" production level -> ") + QString::number(ev.newLevel);
+            }
+            toast.createdWallMs = m_wallMs;
+            m_toasts.push_back(toast);
         }
     }
 
@@ -174,6 +226,19 @@ void GameWorldView::onFrame()
         m_activeBeams = std::move(live);
     }
 
+    // Expire old toasts
+    {
+        std::vector<ToastEntry> live;
+        for (const ToastEntry& t : m_toasts)
+        {
+            if (m_wallMs - t.createdWallMs < kToastLifetimeMs)
+            {
+                live.push_back(t);
+            }
+        }
+        m_toasts = std::move(live);
+    }
+
     // Apply held scroll
     {
         const float delta = kScrollSpeedTilesPerSec
@@ -211,25 +276,12 @@ void GameWorldView::onFrame()
         }
     }
 
-    // Schematic choice available
-    if (m_sim->hasSchematicChoicesPending() && !m_schematicChoiceShown)
-    {
-        m_schematicChoiceShown = true;
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<SchematicChoicesAvailableEvent>(m_sim->getPendingSchematicChoices()));
-    }
-    if (!m_sim->hasSchematicChoicesPending())
-    {
-        m_schematicChoiceShown = false;
-    }
-
     // Game over check
     if (m_sim->isGameOver() && !m_gameOverShown)
     {
         m_gameOverShown = true;
         m_gameSpeedMultiplier = 0.0;
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<GameOverEvent>());
+        emit gameOver();
     }
 
     update();
@@ -925,18 +977,10 @@ void GameWorldView::drawDebugOverlay(QPainter& painter)
 {
     painter.resetTransform();
 
-    const QStringList lines = {
-        tr("Accumulated Threat Level: %1")
-            .arg(m_sim->threatLevel(), 0, 'f', 1),
-        tr("Time until Wave: %1s")
-            .arg(ticksToSeconds(m_sim->normalGapRemainingTicks()), 0, 'f', 1),
-        tr("Threat Accumulation Rate: %1 threat/s")
-            .arg(m_sim->threatAccumulationRate(), 0, 'f', 1),
-        tr("Max Factory Production: %1 threat/s")
-            .arg(m_sim->maxFactoryProductionThreatRate(), 0, 'f', 1),
-        tr("Current Factory Production: %1 threat/s")
-            .arg(m_sim->currentFactoryProductionThreatRate(), 0, 'f', 1),
-    };
+    const QString line1 = tr("Accumulated Threat Level: %1")
+        .arg(m_sim->threatLevel(), 0, 'f', 1);
+    const QString line2 = tr("Time until Wave: %1s")
+        .arg(ticksToSeconds(m_sim->normalGapRemainingTicks()), 0, 'f', 1);
 
     QFont font = painter.font();
     font.setPointSize(m_visuals->toast.fontSize);
@@ -946,26 +990,19 @@ void GameWorldView::drawDebugOverlay(QPainter& painter)
     const int lineH   = fm.height();
     const int padding = 8;
     const int spacing = 4;
-
-    int textW = 0;
-    for (const QString& line : lines)
-    {
-        textW = std::max(textW, fm.horizontalAdvance(line));
-    }
+    const int textW   = std::max(fm.horizontalAdvance(line1),
+                                 fm.horizontalAdvance(line2));
     const int bgW = textW + padding * 2;
-    const int bgH = lineH * lines.size() + spacing * (lines.size() - 1) + padding * 2;
+    const int bgH = lineH * 2 + spacing + padding * 2;
 
     const QRect bgRect(padding, padding, bgW, bgH);
     painter.fillRect(bgRect, QColor(0, 0, 0, 160));
 
     painter.setPen(Qt::white);
-    int y = padding * 2;
-    for (const QString& line : lines)
-    {
-        const QRect textRect(padding * 2, y, textW, lineH);
-        painter.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, line);
-        y += lineH + spacing;
-    }
+    const QRect textRect1(padding * 2, padding + padding, textW, lineH);
+    const QRect textRect2(padding * 2, textRect1.bottom() + spacing, textW, lineH);
+    painter.drawText(textRect1, Qt::AlignLeft | Qt::AlignVCenter, line1);
+    painter.drawText(textRect2, Qt::AlignLeft | Qt::AlignVCenter, line2);
 }
 
 void GameWorldView::drawBeams(QPainter& painter)
@@ -1060,8 +1097,41 @@ void GameWorldView::drawOverlays(QPainter& painter)
     }
 }
 
-void GameWorldView::drawScreenSpace(QPainter& /*painter*/)
+void GameWorldView::drawScreenSpace(QPainter& painter)
 {
+    painter.resetTransform();
+
+    const int margin   = 8;
+    const int toastW   = 320;
+    const int toastH   = 36;
+    const int spacing  = 4;
+
+    QFont toastFont = painter.font();
+    toastFont.setPointSize(m_visuals->toast.fontSize);
+    painter.setFont(toastFont);
+
+    int y = margin;
+    for (const ToastEntry& toast : m_toasts)
+    {
+        const qint64 age = m_wallMs - toast.createdWallMs;
+        double opacity   = 1.0;
+        if (age > kToastFadeStartMs)
+        {
+            opacity = 1.0 - static_cast<double>(age - kToastFadeStartMs)
+                          / static_cast<double>(kToastLifetimeMs - kToastFadeStartMs);
+            opacity = std::max(0.0, opacity);
+        }
+
+        painter.setOpacity(opacity);
+        const int x = width() - toastW - margin;
+        const QRect toastRect(x, y, toastW, toastH);
+        painter.fillRect(toastRect, m_visuals->toast.bg);
+        painter.setPen(m_visuals->toast.fg);
+        painter.drawText(toastRect.adjusted(8, 0, -8, 0),
+                         Qt::AlignVCenter | Qt::AlignLeft, toast.text);
+        painter.setOpacity(1.0);
+        y += toastH + spacing;
+    }
 }
 
 // ---------------------------------------------------------------------------
@@ -1152,16 +1222,13 @@ void GameWorldView::keyPressEvent(QKeyEvent* event)
         }
         break;
     case Qt::Key_Escape:
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<EscapeMenuRequestedEvent>());
+        emit escapeMenuRequested();
         break;
     case Qt::Key_Backspace:
         toggleDemolishMode();
         break;
 	case Qt::Key_M:
 		m_debugDraw = !m_debugDraw;
-		EventManager::getInstance()->sendEventImmediately(
-			std::make_shared<DebugDrawToggledEvent>(m_debugDraw));
 		break;
 	case Qt::Key_L:
 		EventManager::getInstance()->addEvent(std::make_shared<TracePrintRequestedEvent>());
@@ -1242,8 +1309,7 @@ void GameWorldView::mousePressEvent(QMouseEvent* event)
         if (hitEntity != entt::null)
         {
             m_selectedBuildingIds.clear();
-            EventManager::getInstance()->sendEventImmediately(
-                std::make_shared<SelectionChangedEvent>(m_selectedBuildingIds));
+            emit selectionChanged(m_selectedBuildingIds);
             m_selectedEntity = hitEntity;
             EventManager::getInstance()->sendEventImmediately(
                 std::make_shared<EntitySelectedEvent>(hitEntity));
@@ -1280,16 +1346,14 @@ void GameWorldView::mousePressEvent(QMouseEvent* event)
                 {
                     m_selectedBuildingIds = { id };
                 }
-                EventManager::getInstance()->sendEventImmediately(
-                std::make_shared<SelectionChangedEvent>(m_selectedBuildingIds));
+                emit selectionChanged(m_selectedBuildingIds);
             }
             else
             {
                 if (!(event->modifiers() & Qt::ControlModifier))
                 {
                     m_selectedBuildingIds.clear();
-                    EventManager::getInstance()->sendEventImmediately(
-                std::make_shared<SelectionChangedEvent>(m_selectedBuildingIds));
+                    emit selectionChanged(m_selectedBuildingIds);
                 }
                 m_boxSelecting    = true;
                 m_boxStartTile    = tile;
@@ -1388,13 +1452,12 @@ void GameWorldView::mouseReleaseEvent(QMouseEvent* event)
                 if (!found) { m_selectedBuildingIds.push_back(id); }
             }
         }
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<SelectionChangedEvent>(m_selectedBuildingIds));
+        emit selectionChanged(m_selectedBuildingIds);
     }
 }
 
 // ---------------------------------------------------------------------------
-// Methods (formerly slots)
+// Slots
 // ---------------------------------------------------------------------------
 
 void GameWorldView::toggleDemolishMode()
@@ -1410,8 +1473,7 @@ void GameWorldView::toggleDemolishMode()
         if (m_blueprintMode.has_value())      { exitBlueprintMode(); }
         m_demolishMode = true;
     }
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<DemolishModeChangedEvent>(m_demolishMode));
+    emit demolishModeChanged(m_demolishMode);
 }
 
 void GameWorldView::enterBuilderMode(BuildingType type)
@@ -1421,16 +1483,14 @@ void GameWorldView::enterBuilderMode(BuildingType type)
     m_ghostValid    = false;
     m_demolishMode  = false;
     m_blueprintMode.reset();
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<DemolishModeChangedEvent>(false));
+    emit demolishModeChanged(false);
 }
 
 void GameWorldView::enterBlueprintMode(Blueprint blueprint)
 {
     if (m_builderType.has_value()) { exitBuilderMode(); }
     m_demolishMode = false;
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<DemolishModeChangedEvent>(false));
+    emit demolishModeChanged(false);
     m_blueprintGhostTile = m_ghostTile;
     m_blueprintMode      = std::move(blueprint);
 }
@@ -1438,8 +1498,7 @@ void GameWorldView::enterBlueprintMode(Blueprint blueprint)
 void GameWorldView::exitBlueprintMode()
 {
     m_blueprintMode.reset();
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<BlueprintModeExitedEvent>());
+    emit blueprintModeExited();
 }
 
 void GameWorldView::exitBuilderMode()
@@ -1447,8 +1506,7 @@ void GameWorldView::exitBuilderMode()
     m_builderType.reset();
     m_beltDragTiles.clear();
     m_dragging = false;
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<BuilderModeExitedEvent>());
+    emit builderModeExited();
 }
 
 double GameWorldView::gameSpeed() const
@@ -1456,16 +1514,6 @@ double GameWorldView::gameSpeed() const
     return m_gameSpeedMultiplier;
 }
 
-bool GameWorldView::isDebugDrawEnabled() const
-{
-    return m_debugDraw;
-}
-
-void GameWorldView::resetFrameTimer()
-{
-    m_frameTimer.restart();
-}
-
 void GameWorldView::setGameSpeed(double multiplier)
 {
     m_gameSpeedMultiplier = multiplier;
@@ -1478,13 +1526,12 @@ void GameWorldView::resetForNewGame()
     exitBuilderMode();
     exitBlueprintMode();
     m_activeBeams.clear();
-    m_schematicChoiceShown = false;
+    m_toasts.clear();
     m_ghostRotation    = Rotation::East;
     m_ghostValid       = false;
     m_demolishMode     = false;
     m_demolishHoverBuildingId  = kInvalidBuildingId;
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<DemolishModeChangedEvent>(false));
+    emit demolishModeChanged(false);
     m_selectedBuildingIds.clear();
     m_boxSelecting     = false;
     m_scrollXTiles     = 0.0f;
@@ -1496,66 +1543,7 @@ void GameWorldView::resetForNewGame()
     m_lastBlocks        = -1;
     m_lastBossCounter   = -1;
     m_lastBossCountdown = Tick(-1);
-    EventManager::getInstance()->sendEventImmediately(
-        std::make_shared<SelectionChangedEvent>(std::vector<BuildingId>{}));
+    emit selectionChanged({});
 	setGameSpeed(1.0);
     update();
 }
-
-// ---------------------------------------------------------------------------
-// Event handlers
-// ---------------------------------------------------------------------------
-
-void GameWorldView::handleEvent(std::shared_ptr<const WeaponFiredEvent> event)
-{
-    float maxRadius = 0.125f;
-    if (m_sim->admin().isValid(event->target)
-        && m_sim->admin().hasAll<StationBodyComponent>(event->target))
-    {
-        const StationBodyComponent& sb = m_sim->admin().get<StationBodyComponent>(event->target);
-        const int shorter = std::min(sb.footprint.width(), sb.footprint.height());
-        maxRadius = shorter / 2.0f;
-    }
-
-    std::uniform_real_distribution<float> angleDist(0.0f, 6.28318530f);
-    std::uniform_real_distribution<float> radiusDist(0.0f, maxRadius);
-    const float angle  = angleDist(m_rng);
-    const float radius = radiusDist(m_rng);
-
-    ActiveBeam beam;
-    beam.event         = *event;
-    beam.emittedWallMs = m_wallMs;
-    beam.targetOffset  = QVector2D(radius * std::cos(angle),
-                                   radius * std::sin(angle));
-    m_activeBeams.push_back(beam);
-}
-
-void GameWorldView::handleEvent(std::shared_ptr<const BuildingTypeSelectedEvent> event)
-{
-    enterBuilderMode(event->type);
-}
-
-void GameWorldView::handleEvent(std::shared_ptr<const ExitBuilderModeRequestedEvent> /*event*/)
-{
-    exitBuilderMode();
-}
-
-void GameWorldView::handleEvent(std::shared_ptr<const DemolishModeToggleRequestedEvent> /*event*/)
-{
-    toggleDemolishMode();
-}
-
-void GameWorldView::handleEvent(std::shared_ptr<const BlueprintPlacementRequestedEvent> event)
-{
-    enterBlueprintMode(event->blueprint);
-}
-
-void GameWorldView::handleEvent(std::shared_ptr<const ExitBlueprintModeRequestedEvent> /*event*/)
-{
-    exitBlueprintMode();
-}
-
-void GameWorldView::handleEvent(std::shared_ptr<const SpeedChangeRequestedEvent> event)
-{
-    setGameSpeed(event->multiplier);
-}

src/ui/GameWorldView.h

@@ -13,21 +13,10 @@
 #include <QVector2D>
 
 #include "Blueprint.h"
-#include "BlueprintModeExitedEvent.h"
-#include "BlueprintPlacementRequestedEvent.h"
-#include "BuilderModeExitedEvent.h"
+#include "SchematicDropEvent.h"
 #include "BuildingType.h"
-#include "BuildingTypeSelectedEvent.h"
 #include "BuildingId.h"
-#include "DemolishModeChangedEvent.h"
-#include "DemolishModeToggleRequestedEvent.h"
-#include "EventHandler.h"
-#include "ExitBlueprintModeRequestedEvent.h"
-#include "ExitBuilderModeRequestedEvent.h"
-#include "DebugDrawToggledEvent.h"
-#include "WeaponFiredEvent.h"
-#include "SchematicChoiceOption.h"
-#include "SpeedChangeRequestedEvent.h"
+#include "FireEvent.h"
 
 #include "entt/entity/entity.hpp"
 #include "EntitySelectedEvent.h"
@@ -49,25 +38,31 @@ struct QPointCompare
     }
 };
 
-class GameWorldView : public QOpenGLWidget,
-                      public CombinedEventHandler<WeaponFiredEvent,
-                                                  BuildingTypeSelectedEvent,
-                                                  ExitBuilderModeRequestedEvent,
-                                                  DemolishModeToggleRequestedEvent,
-                                                  BlueprintPlacementRequestedEvent,
-                                                  ExitBlueprintModeRequestedEvent,
-                                                  SpeedChangeRequestedEvent>
+class GameWorldView : public QOpenGLWidget
 {
     Q_OBJECT
 
 public:
     GameWorldView(Simulation* sim, const GameConfig* config,
                   const VisualsConfig* visuals, QWidget* parent = nullptr);
-    ~GameWorldView() override;
 
+signals:
+    void selectionChanged(const std::vector<BuildingId>& ids);
+    void gameOver();
+    void builderModeExited();
+    void blueprintModeExited();
+    void escapeMenuRequested();
+    void demolishModeChanged(bool active);
+
+public:
     double gameSpeed() const;
-    bool isDebugDrawEnabled() const;
-    void resetFrameTimer();
+
+public slots:
+    void enterBuilderMode(BuildingType type);
+    void exitBuilderMode();
+    void enterBlueprintMode(Blueprint blueprint);
+    void exitBlueprintMode();
+    void toggleDemolishMode();
     void setGameSpeed(double multiplier);
     void resetForNewGame();
 
@@ -84,14 +79,6 @@ private slots:
     void onFrame();
 
 private:
-    void handleEvent(std::shared_ptr<const WeaponFiredEvent> event) override;
-    void handleEvent(std::shared_ptr<const BuildingTypeSelectedEvent> event) override;
-    void handleEvent(std::shared_ptr<const ExitBuilderModeRequestedEvent> event) override;
-    void handleEvent(std::shared_ptr<const DemolishModeToggleRequestedEvent> event) override;
-    void handleEvent(std::shared_ptr<const BlueprintPlacementRequestedEvent> event) override;
-    void handleEvent(std::shared_ptr<const ExitBlueprintModeRequestedEvent> event) override;
-    void handleEvent(std::shared_ptr<const SpeedChangeRequestedEvent> event) override;
-
     void drawTiles(QPainter& painter);
     void drawBuildings(QPainter& painter);
     void drawStations(QPainter& painter);
@@ -131,20 +118,22 @@ private:
     void                     stepSpeed(int delta);
     void                     placeAtTile(QPoint tile);
 
-    void     enterBuilderMode(BuildingType type);
-    void     exitBuilderMode();
-    void     enterBlueprintMode(Blueprint blueprint);
-    void     exitBlueprintMode();
-    void     toggleDemolishMode();
-
     struct ActiveBeam
     {
-        WeaponFiredEvent event;
+        FireEvent event;
         qint64    emittedWallMs;
         QVector2D targetOffset;
     };
 
+    struct ToastEntry
+    {
+        QString text;
+        qint64  createdWallMs;
+    };
+
     static constexpr qint64  kBeamLifetimeMs        = 300;
+    static constexpr qint64  kToastLifetimeMs        = 4000;
+    static constexpr qint64  kToastFadeStartMs       = 3500;
     static constexpr float   kScrollSpeedTilesPerSec = 10.0f;
 
     Simulation*          m_sim;
@@ -162,6 +151,7 @@ private:
     QTimer* m_renderTimer;
 
     std::vector<ActiveBeam> m_activeBeams;
+    std::vector<ToastEntry> m_toasts;
 
     std::optional<BuildingType>          m_builderType;
     Rotation                             m_ghostRotation;
@@ -186,7 +176,6 @@ private:
     bool m_scrollLeft;
     bool m_scrollRight;
     bool m_gameOverShown;
-    bool m_schematicChoiceShown;
 
     Tick m_lastTick          = Tick(-1);
     int  m_lastBlocks        = -1;

src/ui/HeaderBar.cpp

@@ -8,8 +8,6 @@
 #include <QPushButton>
 #include <QSignalMapper>
 
-#include "EventManager.h"
-#include "SpeedChangeRequestedEvent.h"
 #include "Tick.h"
 
 const double HeaderBar::kSpeeds[]   = { 0.0, 0.5, 1.0, 2.0, 10.0 };
@@ -92,7 +90,6 @@ void HeaderBar::onSpeedButton(int index)
 {
     if (index >= 0 && index < kSpeedCount)
     {
-        EventManager::getInstance()->sendEventImmediately(
-            std::make_shared<SpeedChangeRequestedEvent>(kSpeeds[index]));
+        emit speedChanged(kSpeeds[index]);
     }
 }

src/ui/HeaderBar.h

@@ -26,6 +26,9 @@ public:
     explicit HeaderBar(QWidget* parent = nullptr);
     ~HeaderBar() override;
 
+signals:
+    void speedChanged(double multiplier);
+
 private slots:
     void onSpeedButton(int index);
 

src/ui/MainWindow.cpp

@@ -6,6 +6,7 @@
 #include <QApplication>
 #include <QCloseEvent>
 #include <QFile>
+#include <QHBoxLayout>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QResizeEvent>
@@ -17,7 +18,6 @@
 #include "BuildingSystem.h"
 #include "ConfigLoader.h"
 #include "GameWorldView.h"
-#include "SchematicChoiceDialog.h"
 #include "HeaderBar.h"
 #include "SelectedBuildingPanel.h"
 #include "ShipLayoutBlueprintSerializer.h"
@@ -39,18 +39,64 @@ MainWindow::MainWindow(Simulation* sim, const std::string& configDir, QWidget* p
 
     m_gameWorldView = new GameWorldView(sim, &sim->config(), &m_visuals, this);
 
-    m_sidePanel = new QWidget(this);
-    QVBoxLayout* sideLayout = new QVBoxLayout(m_sidePanel);
-    sideLayout->setContentsMargins(0, 0, 0, 0);
-    sideLayout->setSpacing(0);
+    m_bottomPanel = new QWidget(this);
+    QHBoxLayout* bottomLayout = new QHBoxLayout(m_bottomPanel);
+    bottomLayout->setContentsMargins(0, 0, 0, 0);
+    bottomLayout->setSpacing(0);
 
-    m_selectedBuildingPanel = new SelectedBuildingPanel(sim, &sim->config(), m_sidePanel);
-    m_buildButtonGrid       = new BuildButtonGrid(&sim->config(), m_sidePanel);
-    m_blueprintPanel        = new BlueprintPanel(sim, &sim->config(), m_sidePanel);
+    m_selectedBuildingPanel = new SelectedBuildingPanel(sim, &sim->config(), m_bottomPanel);
+    m_buildButtonGrid       = new BuildButtonGrid(&sim->config(), m_bottomPanel);
+    m_blueprintPanel        = new BlueprintPanel(sim, &sim->config(), m_bottomPanel);
 
-    sideLayout->addWidget(m_selectedBuildingPanel, 1);
-    sideLayout->addWidget(m_buildButtonGrid,       1);
-    sideLayout->addWidget(m_blueprintPanel,        1);
+    bottomLayout->addWidget(m_selectedBuildingPanel, 1);
+    bottomLayout->addWidget(m_buildButtonGrid,       1);
+    bottomLayout->addWidget(m_blueprintPanel,        1);
+
+    // Signals: game world → other panels
+    connect(m_gameWorldView, &GameWorldView::selectionChanged,
+            m_selectedBuildingPanel, &SelectedBuildingPanel::onSelectionChanged);
+
+    connect(m_gameWorldView, &GameWorldView::gameOver,
+            this, &MainWindow::onGameOver);
+
+    connect(m_gameWorldView, &GameWorldView::escapeMenuRequested,
+            this, &MainWindow::onEscapeMenuRequested);
+
+    connect(m_selectedBuildingPanel, &SelectedBuildingPanel::layoutDialogRequested,
+            this, &MainWindow::onLayoutDialogRequested);
+
+    // Signals: build grid → game world
+    connect(m_buildButtonGrid, &BuildButtonGrid::buildingTypeSelected,
+            m_gameWorldView, &GameWorldView::enterBuilderMode);
+
+    connect(m_buildButtonGrid, &BuildButtonGrid::builderModeExited,
+            m_gameWorldView, &GameWorldView::exitBuilderMode);
+
+    connect(m_gameWorldView, &GameWorldView::builderModeExited,
+            m_buildButtonGrid, &BuildButtonGrid::clearActiveButton);
+
+    connect(m_buildButtonGrid, &BuildButtonGrid::demolishModeToggleRequested,
+            m_gameWorldView, &GameWorldView::toggleDemolishMode);
+
+    connect(m_gameWorldView, &GameWorldView::demolishModeChanged,
+            m_buildButtonGrid, &BuildButtonGrid::setDemolishModeActive);
+
+    // Signals: blueprint panel ↔ game world
+    connect(m_gameWorldView, &GameWorldView::selectionChanged,
+            m_blueprintPanel, &BlueprintPanel::onSelectionChanged);
+
+    connect(m_blueprintPanel, &BlueprintPanel::blueprintPlacementRequested,
+            m_gameWorldView, &GameWorldView::enterBlueprintMode);
+
+    connect(m_blueprintPanel, &BlueprintPanel::exitBlueprintModeRequested,
+            m_gameWorldView, &GameWorldView::exitBlueprintMode);
+
+    connect(m_gameWorldView, &GameWorldView::blueprintModeExited,
+            m_blueprintPanel, &BlueprintPanel::clearActiveBlueprintButton);
+
+    // Signals: header bar → game world
+    connect(m_headerBar, &HeaderBar::speedChanged,
+            m_gameWorldView, &GameWorldView::setGameSpeed);
 
     m_gameWorldView->setFocus();
 
@@ -79,12 +125,12 @@ MainWindow::MainWindow(Simulation* sim, const std::string& configDir, QWidget* p
         }
     }
 
-    registerForEvents();
+    registerForEvent();
 }
 
 MainWindow::~MainWindow()
 {
-    unregisterForEvents();
+    unregisterForEvent();
 }
 
 void MainWindow::resizeEvent(QResizeEvent* event)
@@ -116,12 +162,13 @@ void MainWindow::layoutPanels()
     const int totalH  = height();
     const int headerH = m_headerBar->sizeHint().height();
     if (headerH <= 0) { return; }
-    const int mainW = totalW * 75 / 100;
-    const int sideW = totalW - mainW;
+    const int remaining = totalH - headerH;
+    const int gameH     = remaining * 70 / 100;
+    const int panelH    = remaining - gameH;
 
-    m_headerBar->setGeometry(0, 0, mainW, headerH);
-    m_gameWorldView->setGeometry(0, headerH, mainW, totalH - headerH);
-    m_sidePanel->setGeometry(mainW, 0, sideW, totalH);
+    m_headerBar->setGeometry(0, 0, totalW, headerH);
+    m_gameWorldView->setGeometry(0, headerH, totalW, gameH);
+    m_bottomPanel->setGeometry(0, headerH + gameH, totalW, panelH);
 }
 
 void MainWindow::handleEvent(std::shared_ptr<const BuildingBlocksChangedEvent> event)
@@ -129,21 +176,7 @@ void MainWindow::handleEvent(std::shared_ptr<const BuildingBlocksChangedEvent> e
     m_buildButtonGrid->updateAffordability(event->blocks);
 }
 
-void MainWindow::handleEvent(std::shared_ptr<const SchematicChoicesAvailableEvent> event)
-{
-    const double prevSpeed = m_gameWorldView->gameSpeed();
-    m_gameWorldView->setGameSpeed(0.0);
-
-    SchematicChoiceDialog dialog(event->choices, this);
-    dialog.exec();
-
-    m_sim->applySchematicChoice(dialog.getChosenIndex());
-
-    m_gameWorldView->setGameSpeed(prevSpeed);
-    m_gameWorldView->resetFrameTimer();
-}
-
-void MainWindow::handleEvent(std::shared_ptr<const EscapeMenuRequestedEvent> /*event*/)
+void MainWindow::onEscapeMenuRequested()
 {
     const double prevSpeed = m_gameWorldView->gameSpeed();
     m_gameWorldView->setGameSpeed(0.0);
@@ -171,7 +204,6 @@ void MainWindow::handleEvent(std::shared_ptr<const EscapeMenuRequestedEvent> /*e
             QMessageBox::critical(this, tr("Config Error"),
                 tr("Failed to reload config:\n%1").arg(e.what()));
             m_gameWorldView->setGameSpeed(prevSpeed);
-            m_gameWorldView->resetFrameTimer();
             return;
         }
         m_gameWorldView->resetForNewGame();
@@ -183,20 +215,18 @@ void MainWindow::handleEvent(std::shared_ptr<const EscapeMenuRequestedEvent> /*e
     else
     {
         m_gameWorldView->setGameSpeed(prevSpeed);
-        m_gameWorldView->resetFrameTimer();
     }
 }
 
-void MainWindow::handleEvent(std::shared_ptr<const LayoutDialogRequestedEvent> event)
+void MainWindow::onLayoutDialogRequested(BuildingId shipyardId)
 {
     const double prevSpeed = m_gameWorldView->gameSpeed();
     m_gameWorldView->setGameSpeed(0.0);
 
-    const Building* b = m_sim->buildings().findBuilding(event->shipyardId);
+    const Building* b = m_sim->buildings().findBuilding(shipyardId);
     if (!b)
     {
         m_gameWorldView->setGameSpeed(prevSpeed);
-        m_gameWorldView->resetFrameTimer();
         return;
     }
 
@@ -221,18 +251,16 @@ void MainWindow::handleEvent(std::shared_ptr<const LayoutDialogRequestedEvent> e
                             m_layoutBlueprints,
                             std::move(unlockedModuleIds),
                             std::move(moduleLevels),
-                            m_gameWorldView->isDebugDrawEnabled(),
                             this);
     if (dialog.exec() == QDialog::Accepted && dialog.result().has_value())
     {
-        m_sim->buildings().setShipLayout(event->shipyardId, *dialog.result());
+        m_sim->buildings().setShipLayout(shipyardId, *dialog.result());
     }
 
     m_gameWorldView->setGameSpeed(prevSpeed);
-    m_gameWorldView->resetFrameTimer();
 }
 
-void MainWindow::handleEvent(std::shared_ptr<const GameOverEvent> /*event*/)
+void MainWindow::onGameOver()
 {
     const Tick tick = m_sim->currentTick();
     const int totalSeconds = static_cast<int>(ticksToSeconds(tick));

src/ui/MainWindow.h

@@ -7,11 +7,7 @@
 
 #include "BuildingBlocksChangedEvent.h"
 #include "BuildingId.h"
-#include "EscapeMenuRequestedEvent.h"
 #include "EventHandler.h"
-#include "GameOverEvent.h"
-#include "LayoutDialogRequestedEvent.h"
-#include "SchematicChoicesAvailableEvent.h"
 #include "ShipLayoutBlueprint.h"
 #include "Tick.h"
 #include "VisualsConfig.h"
@@ -26,11 +22,7 @@ class QCloseEvent;
 class QResizeEvent;
 
 class MainWindow : public QWidget,
-                   public CombinedEventHandler<BuildingBlocksChangedEvent,
-                                               SchematicChoicesAvailableEvent,
-                                               GameOverEvent,
-                                               EscapeMenuRequestedEvent,
-                                               LayoutDialogRequestedEvent>
+                   public EventHandler<BuildingBlocksChangedEvent>
 {
     Q_OBJECT
 
@@ -44,12 +36,13 @@ protected:
 
 private:
     void handleEvent(std::shared_ptr<const BuildingBlocksChangedEvent> event) override;
-    void handleEvent(std::shared_ptr<const SchematicChoicesAvailableEvent> event) override;
-    void handleEvent(std::shared_ptr<const GameOverEvent> event) override;
-    void handleEvent(std::shared_ptr<const EscapeMenuRequestedEvent> event) override;
-    void handleEvent(std::shared_ptr<const LayoutDialogRequestedEvent> event) override;
     void layoutPanels();
 
+private slots:
+    void onGameOver();
+    void onEscapeMenuRequested();
+    void onLayoutDialogRequested(BuildingId shipyardId);
+
 private:
     std::string            m_configDir;
     VisualsConfig          m_visuals;
@@ -59,7 +52,7 @@ private:
     SelectedBuildingPanel* m_selectedBuildingPanel;
     BuildButtonGrid*       m_buildButtonGrid;
     BlueprintPanel*        m_blueprintPanel;
-    QWidget*               m_sidePanel;
+    QWidget*               m_bottomPanel;
 
     std::vector<ShipLayoutBlueprint> m_layoutBlueprints;
 };

src/ui/SchematicChoiceDialog.cpp

@@ -1,125 +0,0 @@
-#include "SchematicChoiceDialog.h"
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QStringList>
-#include <QVBoxLayout>
-
-SchematicChoiceDialog::SchematicChoiceDialog(
-    const std::vector<SchematicChoiceOption>& options,
-    QWidget* parent)
-    : QDialog(parent)
-    , m_chosenIndex(0)
-{
-    setWindowTitle(tr("Schematic Drop"));
-    setWindowFlags(windowFlags() & ~Qt::WindowCloseButtonHint);
-    setModal(true);
-
-    QVBoxLayout* mainLayout = new QVBoxLayout(this);
-
-    QLabel* titleLabel = new QLabel(tr("Choose a schematic to unlock:"), this);
-    QFont titleFont = titleLabel->font();
-    titleFont.setPointSize(titleFont.pointSize() + 2);
-    titleFont.setBold(true);
-    titleLabel->setFont(titleFont);
-    titleLabel->setAlignment(Qt::AlignCenter);
-    mainLayout->addWidget(titleLabel);
-
-    QHBoxLayout* optionsLayout = new QHBoxLayout();
-    mainLayout->addLayout(optionsLayout);
-
-    for (int i = 0; i < static_cast<int>(options.size()); ++i)
-    {
-        const SchematicChoiceOption& option = options[static_cast<std::size_t>(i)];
-
-        QWidget* card = new QWidget(this);
-        QVBoxLayout* cardLayout = new QVBoxLayout(card);
-        card->setStyleSheet("QWidget { border: 1px solid gray; padding: 8px; }");
-
-        QLabel* nameLabel = new QLabel(QString::fromStdString(option.displayName), card);
-        QFont nameFont = nameLabel->font();
-        nameFont.setPointSize(nameFont.pointSize() + 1);
-        nameFont.setBold(true);
-        nameLabel->setFont(nameFont);
-        nameLabel->setAlignment(Qt::AlignCenter);
-        cardLayout->addWidget(nameLabel);
-
-        QString typeText;
-        if (option.type == SchematicType::Ship)
-        {
-            typeText = tr("Ship");
-        }
-        else if (option.type == SchematicType::Module)
-        {
-            typeText = tr("Module");
-        }
-        else
-        {
-            typeText = tr("Recipe");
-        }
-        QLabel* typeLabel = new QLabel(typeText, card);
-        typeLabel->setAlignment(Qt::AlignCenter);
-        cardLayout->addWidget(typeLabel);
-
-        QString statusText;
-        if (option.isNewUnlock)
-        {
-            statusText = tr("New unlock");
-        }
-        else
-        {
-            statusText = tr("Level up -> %1").arg(option.targetLevel);
-        }
-        QLabel* statusLabel = new QLabel(statusText, card);
-        statusLabel->setAlignment(Qt::AlignCenter);
-        cardLayout->addWidget(statusLabel);
-
-        QLabel* unlocksHeaderLabel = new QLabel(tr("Unlocks recipes for:"), card);
-        QFont unlocksHeaderFont = unlocksHeaderLabel->font();
-        unlocksHeaderFont.setBold(true);
-        unlocksHeaderLabel->setFont(unlocksHeaderFont);
-        unlocksHeaderLabel->setAlignment(Qt::AlignCenter);
-        cardLayout->addWidget(unlocksHeaderLabel);
-
-        QString unlocksText;
-        if (option.newlyUnlockedItemNames.empty())
-        {
-            unlocksText = tr("None");
-        }
-        else
-        {
-            QStringList itemLines;
-            for (const std::string& itemName : option.newlyUnlockedItemNames)
-            {
-                itemLines << QString::fromStdString(itemName);
-            }
-            unlocksText = itemLines.join("\n");
-        }
-        QLabel* unlocksLabel = new QLabel(unlocksText, card);
-        unlocksLabel->setAlignment(Qt::AlignCenter);
-        cardLayout->addWidget(unlocksLabel);
-
-        QPushButton* selectButton = new QPushButton(tr("Select"), card);
-        cardLayout->addWidget(selectButton);
-
-        const int index = i;
-        connect(selectButton, &QPushButton::clicked, this, [this, index]()
-        {
-            onOptionClicked(index);
-        });
-
-        optionsLayout->addWidget(card);
-    }
-}
-
-int SchematicChoiceDialog::getChosenIndex() const
-{
-    return m_chosenIndex;
-}
-
-void SchematicChoiceDialog::onOptionClicked(int index)
-{
-    m_chosenIndex = index;
-    accept();
-}

src/ui/SchematicChoiceDialog.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#include <QDialog>
-
-#include "SchematicChoiceOption.h"
-
-class SchematicChoiceDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    SchematicChoiceDialog(const std::vector<SchematicChoiceOption>& options,
-                          QWidget* parent = nullptr);
-
-    int getChosenIndex() const;
-
-private:
-    void onOptionClicked(int index);
-
-    int m_chosenIndex;
-};

src/ui/SelectedBuildingPanel.cpp

@@ -16,21 +16,18 @@
 #include "DynamicBodyComponent.h"
 #include "EntityAdmin.h"
 #include "EntitySelectedEvent.h"
-#include "EventManager.h"
 #include "FactionComponent.h"
 #include "HealthComponent.h"
 #include "ModuleOwnerComponent.h"
 #include "ShipIdentityComponent.h"
 #include "ShipStatsCalculator.h"
 #include "ShipStatsPanel.h"
-#include "ThreatCostCalculator.h"
 #include "StationBodyComponent.h"
 #include "TickAdvancedEvent.h"
 #include "Building.h"
 #include "BuildingSystem.h"
 #include "BuildingType.h"
 #include "ItemType.h"
-#include "LayoutDialogRequestedEvent.h"
 #include "ModulesConfig.h"
 #include "Rotation.h"
 #include "ShipLayoutPreview.h"
@@ -142,8 +139,7 @@ SelectedBuildingPanel::SelectedBuildingPanel(Simulation* sim,
     connect(m_configureLayoutBtn, &QPushButton::clicked, this, [this]() {
         if (m_singleBuildingId != kInvalidBuildingId)
         {
-            EventManager::getInstance()->sendEventImmediately(
-                std::make_shared<LayoutDialogRequestedEvent>(m_singleBuildingId));
+            emit layoutDialogRequested(m_singleBuildingId);
         }
     });
     connect(m_filterAList, &QListWidget::itemChanged,
@@ -785,19 +781,6 @@ void SelectedBuildingPanel::buildEntityShip(entt::entity entity)
 
     const ShipStats stats = buildShipStatsFromEntity(admin, entity);
     m_entityStatsPanel->refreshFromLive(stats, health.hp);
-    m_entityStatsPanel->setDebugDrawEnabled(m_debugDraw);
-
-    for (const ShipDef& def : m_config->ships.ships)
-    {
-        if (def.id == identity.schematicId)
-        {
-            double threat = calculateShipThreatCost(
-                m_config->threatCosts, *m_config, def.id, def.defaultModules);
-            m_entityStatsPanel->setThreatCost(threat);
-            break;
-        }
-    }
-
     m_entityStatsPanel->show();
 
     m_stationStatsLabel->hide();
@@ -878,14 +861,3 @@ void SelectedBuildingPanel::clearEntityDisplay()
     m_entityStatsPanel->hide();
     m_stationStatsLabel->hide();
 }
-
-void SelectedBuildingPanel::handleEvent(std::shared_ptr<const SelectionChangedEvent> event)
-{
-    onSelectionChanged(event->ids);
-}
-
-void SelectedBuildingPanel::handleEvent(std::shared_ptr<const DebugDrawToggledEvent> event)
-{
-    m_debugDraw = event->active;
-    m_entityStatsPanel->setDebugDrawEnabled(event->active);
-}

src/ui/SelectedBuildingPanel.h

@@ -11,12 +11,10 @@
 
 #include "Building.h"
 #include "BuildingId.h"
-#include "DebugDrawToggledEvent.h"
 #include "EntitySelectedEvent.h"
 #include "EventHandler.h"
 #include "GameConfig.h"
 #include "RecipesConfig.h"
-#include "SelectionChangedEvent.h"
 #include "ShipLayout.h"
 #include "ShipsConfig.h"
 #include "Tick.h"
@@ -32,10 +30,7 @@ class QPushButton;
 class QVBoxLayout;
 
 class SelectedBuildingPanel : public QWidget,
-                               public CombinedEventHandler<TickAdvancedEvent,
-                                                           EntitySelectedEvent,
-                                                           SelectionChangedEvent,
-                                                           DebugDrawToggledEvent>
+                               public CombinedEventHandler<TickAdvancedEvent, EntitySelectedEvent>
 {
     Q_OBJECT
 
@@ -44,11 +39,15 @@ public:
                           QWidget* parent = nullptr);
     ~SelectedBuildingPanel() override;
 
+signals:
+    void layoutDialogRequested(BuildingId shipyardId);
+
+public slots:
+    void onSelectionChanged(const std::vector<BuildingId>& ids);
+
 private:
     void handleEvent(std::shared_ptr<const TickAdvancedEvent> event) override;
     void handleEvent(std::shared_ptr<const EntitySelectedEvent> event) override;
-    void handleEvent(std::shared_ptr<const SelectionChangedEvent> event) override;
-    void handleEvent(std::shared_ptr<const DebugDrawToggledEvent> event) override;
 
 private slots:
     void onRecipeChanged(int comboIndex);
@@ -56,7 +55,6 @@ private slots:
     void onSplitterFilterChanged();
 
 private:
-    void onSelectionChanged(const std::vector<BuildingId>& ids);
     void rebuild();
     void clearContent();
     void buildEmpty();
@@ -89,7 +87,6 @@ private:
     QPoint       m_splitterTile;
     std::string  m_currentRecipeId;
 
-    bool m_debugDraw = false;
     std::optional<entt::entity> m_selectedEntity;
     ShipStatsPanel* m_entityStatsPanel;
     QLabel*         m_entityTitleLabel;

src/ui/ShipLayoutDialog.cpp

@@ -1,10 +1,9 @@
 #include "ShipLayoutDialog.h"
 #include "ShipStatsPanel.h"
 
+#include <cctype>
 #include <functional>
 
-#include "DisplayName.h"
-
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QInputDialog>
@@ -21,6 +20,30 @@ namespace
 
 const int kCellSize = 32;
 
+QString displayName(const std::string& id)
+{
+    QString result;
+    bool nextUpper = true;
+    for (char c : id)
+    {
+        if (c == '_')
+        {
+            result += ' ';
+            nextUpper = true;
+        }
+        else if (nextUpper)
+        {
+            result += static_cast<char>(std::toupper(static_cast<unsigned char>(c)));
+            nextUpper = false;
+        }
+        else
+        {
+            result += c;
+        }
+    }
+    return result;
+}
+
 std::vector<std::string> rotateMaskCW(const std::vector<std::string>& grid)
 {
     if (grid.empty())
@@ -366,7 +389,6 @@ ShipLayoutDialog::ShipLayoutDialog(const GameConfig* config,
                                    std::vector<ShipLayoutBlueprint>& allBlueprints,
                                    std::set<std::string> unlockedModuleIds,
                                    std::map<std::string, int> moduleLevels,
-                                   bool debugDraw,
                                    QWidget* parent)
     : QDialog(parent)
     , m_config(config)
@@ -381,7 +403,6 @@ ShipLayoutDialog::ShipLayoutDialog(const GameConfig* config,
     , m_removeButton(nullptr)
     , m_gridWidget(nullptr)
     , m_statsPanel(nullptr)
-    , m_debugDraw(debugDraw)
 {
     setWindowTitle(tr("Configure Ship Layout"));
     setModal(true);
@@ -436,7 +457,6 @@ ShipLayoutDialog::ShipLayoutDialog(const GameConfig* config,
 
     // Left column: ship stats panel.
     m_statsPanel = new ShipStatsPanel(config, this);
-    m_statsPanel->setDebugDrawEnabled(m_debugDraw);
     columnsLayout->addWidget(m_statsPanel);
 
     // Center column: module selection buttons.
@@ -458,7 +478,7 @@ ShipLayoutDialog::ShipLayoutDialog(const GameConfig* config,
             m_moduleButtons.push_back(nullptr);
             continue;
         }
-        const QString label = QString::fromStdString(toDisplayName(def.id))
+        const QString label = displayName(def.id)
             + "\n" + QString::fromStdString(def.glyph);
         QPushButton* btn = new QPushButton(label, this);
         btn->setCheckable(true);

src/ui/ShipLayoutDialog.h

@@ -28,7 +28,6 @@ public:
                      std::vector<ShipLayoutBlueprint>& allBlueprints,
                      std::set<std::string> unlockedModuleIds,
                      std::map<std::string, int> moduleLevels,
-                     bool debugDraw,
                      QWidget* parent = nullptr);
 
     std::optional<ShipLayoutConfig> result() const;
@@ -78,7 +77,6 @@ private:
     QPushButton* m_removeButton;
     QWidget* m_gridWidget;
     ShipStatsPanel* m_statsPanel;
-    bool m_debugDraw;
 
     std::optional<ShipLayoutConfig> m_result;
 };

src/ui/ShipStatsPanel.cpp

@@ -6,7 +6,6 @@
 
 #include "GameConfig.h"
 #include "ShipStatsCalculator.h"
-#include "ThreatCostCalculator.h"
 
 namespace
 {
@@ -104,11 +103,6 @@ ShipStatsPanel::ShipStatsPanel(const GameConfig* config, QWidget* parent)
     m_repairSection->setVisible(false);
     layout->addWidget(m_repairSection);
 
-    // Threat cost — debug-only, initially hidden.
-    m_threatCostLabel = makeStatLabel(this);
-    m_threatCostLabel->setVisible(false);
-    layout->addWidget(m_threatCostLabel);
-
     layout->addStretch();
 }
 
@@ -121,10 +115,6 @@ void ShipStatsPanel::refresh(const std::string& shipId,
                                                moduleLevelOverrides);
     const QString hpText = tr("HP: %1").arg(static_cast<int>(stats.hp + 0.5f));
     applyStats(stats, hpText);
-
-    const double threat = calculateShipThreatCost(m_config->threatCosts, *m_config,
-                                                  shipId, modules);
-    setThreatCost(threat);
 }
 
 void ShipStatsPanel::refreshFromLive(const ShipStats& stats, float currentHp)
@@ -190,15 +180,3 @@ void ShipStatsPanel::applyStats(const ShipStats& stats, const QString& hpText)
         m_repairSection->setVisible(false);
     }
 }
-
-void ShipStatsPanel::setThreatCost(double cost)
-{
-    m_threatCostLabel->setText(tr("Threat Cost: %1").arg(cost, 0, 'f', 1));
-    m_threatCostLabel->setVisible(m_debugDraw);
-}
-
-void ShipStatsPanel::setDebugDrawEnabled(bool enabled)
-{
-    m_debugDraw = enabled;
-    m_threatCostLabel->setVisible(m_debugDraw);
-}

src/ui/ShipStatsPanel.h

@@ -26,14 +26,10 @@ public:
 
     void refreshFromLive(const ShipStats& stats, float currentHp);
 
-    void setThreatCost(double cost);
-    void setDebugDrawEnabled(bool enabled);
-
 private:
     void applyStats(const ShipStats& stats, const QString& hpText);
 
     const GameConfig* m_config;
-    bool m_debugDraw = false;
 
     QLabel* m_hpLabel;
     QLabel* m_speedLabel;
@@ -54,6 +50,4 @@ private:
     QWidget* m_repairSection;
     QLabel*  m_repairRateLabel;
     QLabel*  m_repairRangeLabel;
-
-    QLabel* m_threatCostLabel;
 };