Factory Units and Upgrades

resources/lang/en.json

@@ -265,6 +265,7 @@
     "hospital": "Hospital",
     "academy": "Military Academy",
     "research_lab": "Research Lab",
+    "factory": "Factory",
     "airfield": "Airfield",
     "air_field": "Airfield",
     "fighter_jet": "Fighter Jet"
@@ -353,6 +354,8 @@
     "build_academy_desc": "Set the hotkey to build an Academy.",
     "build_research_lab": "Build Research Lab",
     "build_research_lab_desc": "Set the hotkey to build a Research Lab.",
+    "build_factory": "Build Factory",
+    "build_factory_desc": "Set the hotkey to build a Factory.",
     "build_missile_silo": "Build Missile Silo",
     "build_missile_silo_desc": "Set the hotkey to build a Missile Silo.",
     "build_sam_launcher": "Build SAM Launcher",

src/client/BuildSettingsModal.ts

@@ -0,0 +1,227 @@
+import { LitElement, html } from "lit";
+import { customElement, query, state } from "lit/decorators.js";
+import { UnitType } from "../core/game/Game";
+import {
+  isUpgradeableStructure,
+  maxStructureLevel,
+  tryParseUnitType,
+} from "../core/game/Upgradeables";
+import "./components/baseComponents/Modal";
+
+interface BuildSettingsItem {
+  id: string;
+  name: string;
+  icon: string;
+}
+
+@customElement("build-settings-modal")
+export class BuildSettingsModal extends LitElement {
+  @query("o-modal") private modalEl!: HTMLElement & {
+    open: () => void;
+    close: () => void;
+    isModalOpen: boolean;
+  };
+
+  @state() private items: BuildSettingsItem[] = [];
+  @state() private levels: Record<string, number> = {};
+
+  /** Populate and open the modal. Loads persisted levels; defaults to 1 */
+  public open(
+    structureTypes: UnitType[] = [],
+    unitIconMap: Record<string, string | undefined> = {},
+  ) {
+    const upgradeables = structureTypes.filter((t) =>
+      isUpgradeableStructure(t),
+    );
+    this.items = upgradeables.map((t) => {
+      const id = String(t);
+      return {
+        id,
+        name: id,
+        icon: unitIconMap[id] || "",
+      };
+    });
+    const persisted = this._loadPersisted();
+    const lvls: Record<string, number> = {};
+    this.items.forEach((i) => {
+      const raw = persisted[i.id];
+      const parsed = typeof raw === "number" && raw >= 1 ? raw : 1;
+      lvls[i.id] = this._applyCap(i.id, parsed);
+    });
+    this.levels = lvls;
+    this.updateComplete.then(() => this.modalEl?.open());
+  }
+
+  private _loadPersisted(): Record<string, number> {
+    try {
+      const json = localStorage.getItem("buildSettings.levels") ?? "{}";
+      const data = JSON.parse(json);
+      if (data && typeof data === "object")
+        return data as Record<string, number>;
+    } catch (_) {
+      /* ignore parse errors */
+    }
+    return {};
+  }
+
+  private _persist() {
+    try {
+      localStorage.setItem("buildSettings.levels", JSON.stringify(this.levels));
+    } catch (_) {
+      /* ignore quota issues */
+    }
+  }
+
+  // Apply structure-specific level caps via shared rule
+  private _applyCap(id: string, desired: number): number {
+    const t = tryParseUnitType(id);
+    if (!t) return Math.max(1, desired);
+    return Math.min(maxStructureLevel(t), Math.max(1, desired));
+  }
+
+  private _inc(id: string) {
+    const next = this._applyCap(id, (this.levels[id] ?? 1) + 1);
+    this.levels = { ...this.levels, [id]: next };
+    this._persist();
+  }
+  private _dec(id: string) {
+    const cur = this.levels[id] ?? 1;
+    const next = Math.max(1, cur - 1);
+    this.levels = { ...this.levels, [id]: next };
+    this._persist();
+  }
+
+  render() {
+    // Light DOM: provide styles inline (avoids shadow + Tailwind conflicts).
+    return html`
+      <o-modal title="Build Settings" max-width="520px" max-height="65dvh">
+        <style>
+          build-settings-modal .bs-list {
+            display: flex;
+            flex-direction: column;
+            gap: 4px;
+          }
+          build-settings-modal .bs-row {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            gap: 12px;
+            padding: 6px 10px;
+            border: 1px solid var(--ui-panel-border);
+            border-radius: 6px;
+            background: var(--ui-primary);
+            min-height: 40px;
+          }
+          build-settings-modal .bs-row:hover {
+            background: var(--ui-secondary);
+          }
+          build-settings-modal .bs-left {
+            display: flex;
+            align-items: center;
+            gap: 10px;
+            min-width: 0;
+            flex: 1 1 auto;
+          }
+          build-settings-modal .bs-icon {
+            width: 22px;
+            height: 22px;
+            flex-shrink: 0;
+            display: block;
+            object-fit: contain;
+            filter: drop-shadow(0 0 2px rgba(0, 0, 0, 0.35));
+          }
+          build-settings-modal .bs-name {
+            font-size: 13px;
+            color: var(--ui-text-default);
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            flex: 1 1 auto;
+          }
+          build-settings-modal .bs-controls {
+            display: inline-flex;
+            align-items: center;
+            gap: 4px;
+          }
+          build-settings-modal button.bs-btn {
+            width: 24px;
+            height: 22px;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            border: 1px solid var(--ui-panel-border);
+            background: #111a2e;
+            color: var(--ui-text-default);
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 11px;
+            line-height: 1;
+          }
+          build-settings-modal button.bs-btn:hover {
+            border-color: var(--ui-secondary-hover);
+            box-shadow: 0 0 0 1px rgba(39, 71, 110, 0.35) inset;
+          }
+          build-settings-modal .bs-val {
+            min-width: 22px;
+            text-align: center;
+            font-variant-numeric: tabular-nums;
+            font-size: 12px;
+          }
+          build-settings-modal .hint {
+            font-size: 11px;
+            color: var(--ui-text-muted, #94a3b8);
+            margin-bottom: 8px;
+          }
+        </style>
+        <div class="hint">
+          Default structure levels (persistent; capped where applicable)
+        </div>
+        <div class="bs-list">
+          ${this.items.map(
+            (i) => html`
+              <div class="bs-row" data-id=${i.id}>
+                <div class="bs-left">
+                  <img
+                    class="bs-icon"
+                    src=${i.icon}
+                    alt=${i.name}
+                    width="22"
+                    height="22"
+                  />
+                  <div class="bs-name">${i.name}</div>
+                </div>
+                <div class="bs-controls">
+                  <button
+                    class="bs-btn"
+                    @click=${() => this._dec(i.id)}
+                    title="Decrease"
+                  >
+                    &#x25BC;
+                  </button>
+                  <span class="bs-val">${this.levels[i.id] ?? 1}</span>
+                  <button
+                    class="bs-btn"
+                    @click=${() => this._inc(i.id)}
+                    title="Increase"
+                  >
+                    &#x25B2;
+                  </button>
+                </div>
+              </div>
+            `,
+          )}
+        </div>
+      </o-modal>
+    `;
+  }
+
+  createRenderRoot() {
+    return this;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "build-settings-modal": BuildSettingsModal;
+  }
+}

src/client/InputHandler.ts

@@ -188,6 +188,8 @@ export class InputHandler {
       buildAirfield: "KeyI",
       buildHospital: "KeyO",
       buildAcademy: "KeyP",
+      buildResearchLab: "KeyL",
+      buildFactory: "KeyF",
       buildMissileSilo: "KeyH",
       buildSAMLauncher: "KeyJ",
       buildDefensePost: "KeyK",
@@ -378,6 +380,7 @@ export class InputHandler {
       [this.keybinds.buildHospital]: UnitType.Hospital,
       [this.keybinds.buildAcademy]: UnitType.Academy,
       [this.keybinds.buildResearchLab]: UnitType.ResearchLab,
+      [this.keybinds.buildFactory]: UnitType.Factory,
       [this.keybinds.buildMissileSilo]: UnitType.MissileSilo,
       [this.keybinds.buildSAMLauncher]: UnitType.SAMLauncher,
       [this.keybinds.buildDefensePost]: UnitType.DefensePost,

src/client/Transport.ts

@@ -12,6 +12,7 @@ import {
 } from "../core/game/Game";
 import { TileRef } from "../core/game/GameMap";
 import { PlayerView } from "../core/game/GameView";
+import { maxStructureLevel } from "../core/game/Upgradeables";
 import {
   AllPlayersStats,
   ClientHashMessage,
@@ -426,7 +427,6 @@ export class Transport {
         }
         this.socket.send(msg);
       }
-      onconnect();
     };
     this.socket.onmessage = (event: MessageEvent) => {
       try {
@@ -677,11 +677,30 @@ export class Transport {
     this._lastBuildUnit = event.unit;
     this._lastBuildAt = now;
 
+    // Compute desired starting level for upgradeable structures from local settings.
+    let targetLevel: number | undefined;
+    try {
+      const raw = localStorage.getItem("buildSettings.levels");
+      if (raw) {
+        const obj = JSON.parse(raw) as Record<string, number>;
+        const key = String(event.unit);
+        const val = obj?.[key];
+        if (typeof val === "number" && val > 1) {
+          // Enforce cap for missile silo / SAM launcher locally (server re-validates).
+          targetLevel = Math.min(maxStructureLevel(event.unit), val);
+        }
+      }
+    } catch {
+      // Ignore malformed local storage.
+      targetLevel = undefined;
+    }
+
     this.sendIntent({
       type: "build_unit",
       clientID: this.lobbyConfig.clientID,
       unit: event.unit,
       tile: event.tile,
+      targetLevel,
     });
   }
 

src/client/UserSettingModal.ts

@@ -636,6 +636,24 @@ export class UserSettingModal extends LitElement {
         @change=${this.handleKeybindChange}
       ></setting-keybind>
 
+      <setting-keybind
+        action="buildResearchLab"
+        label=${translateText("user_setting.build_research_lab")}
+        description=${translateText("user_setting.build_research_lab_desc")}
+        defaultKey="KeyL"
+        .value=${this.keybinds["buildResearchLab"] ?? ""}
+        @change=${this.handleKeybindChange}
+      ></setting-keybind>
+
+      <setting-keybind
+        action="buildFactory"
+        label=${translateText("user_setting.build_factory")}
+        description=${translateText("user_setting.build_factory_desc")}
+        defaultKey="KeyF"
+        .value=${this.keybinds["buildFactory"] ?? ""}
+        @change=${this.handleKeybindChange}
+      ></setting-keybind>
+
       <setting-keybind
         action="buildMissileSilo"
         label=${translateText("user_setting.build_missile_silo")}