From 7398a9ee6a996fb8e70b9b8be1d7ab4263291e5f Mon Sep 17 00:00:00 2001
From: 1brucben <1benjbruce@gmail.com>
Date: Sat, 15 Nov 2025 20:12:23 +0100
Subject: [PATCH] Add Research Lab functionality and update related components

---
 resources/lang/en.json                        | 19 +++++++++++-------
 src/client/HostLobbyModal.ts                  |  2 +-
 src/client/InputHandler.ts                    |  1 +
 src/client/SinglePlayerModal.ts               |  4 +++-
 src/client/graphics/layers/BuildMenu.ts       |  2 ++
 .../graphics/layers/PlayerInfoOverlay.ts      |  5 ++++-
 src/client/graphics/layers/StructureLayer.ts  | 20 +++++++++++++++++--
 src/client/utilities/RenderUnitTypeOptions.ts |  1 +
 src/core/configuration/DefaultConfig.ts       |  1 +
 src/core/execution/ExecutionManager.ts        |  3 ++-
 src/core/execution/PlayerExecution.ts         | 14 ++++++++++++-
 .../execution/UpgradeStructureExecution.ts    |  1 +
 src/core/game/PlayerImpl.ts                   |  3 ++-
 src/core/game/UnitImpl.ts                     | 11 ++++++++++
 14 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/resources/lang/en.json b/resources/lang/en.json
index 8a44672f2..3697a4c0d 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -125,9 +125,10 @@
     "bots": "Bots: ",
     "bots_disabled": "Disabled",
     "disable_nations": "Disable Nations",
-    "instant_build": "Instant build",
-    "infinite_gold": "Infinite gold",
-    "infinite_troops": "Infinite troops",
+    "instant_build": "Instant Build",
+    "instant_research": "Instant Research",
+    "infinite_gold": "Infinite Gold",
+    "infinite_troops": "Infinite Troops",
     "disable_nukes": "Disable Nukes",
     "enables_title": "Enable Settings",
     "start": "Start Game"
@@ -168,7 +169,7 @@
     "fantasy": "Other"
   },
   "starting_gold": {
-    "label": "Starting gold",
+    "label": "Starting Gold",
     "default": "0 (default)",
     "millions": "{amount}M"
   },
@@ -206,9 +207,10 @@
     "bots": "Bots: ",
     "bots_disabled": "Disabled",
     "disable_nations": "Disable Nations",
-    "instant_build": "Instant build",
-    "infinite_gold": "Infinite gold",
-    "infinite_troops": "Infinite troops",
+    "instant_build": "Instant Build",
+    "instant_research": "Instant Research",
+    "infinite_gold": "Infinite Gold",
+    "infinite_troops": "Infinite Troops",
     "peace_timer": "Protected Start",
     "peace_timer_none": "None",
     "peace_timer_minutes": "{minutes} minutes",
@@ -262,6 +264,7 @@
     "mirv": "MIRV",
     "hospital": "Hospital",
     "academy": "Military Academy",
+    "research_lab": "Research Lab",
     "airfield": "Airfield",
     "air_field": "Airfield",
     "fighter_jet": "Fighter Jet"
@@ -348,6 +351,8 @@
     "build_hospital_desc": "Set the hotkey to build a Hospital.",
     "build_academy": "Build Academy",
     "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_missile_silo": "Build Missile Silo",
     "build_missile_silo_desc": "Set the hotkey to build a Missile Silo.",
     "build_sam_launcher": "Build SAM Launcher",
diff --git a/src/client/HostLobbyModal.ts b/src/client/HostLobbyModal.ts
index 8b96dd05b..f450f89a1 100644
--- a/src/client/HostLobbyModal.ts
+++ b/src/client/HostLobbyModal.ts
@@ -373,7 +373,7 @@ export class HostLobbyModal extends LitElement {
                     .checked=${this.instantResearchHumanOnly}
                   />
                   <div class="option-card-title">
-                    Instant Research
+                    ${translateText("host_modal.instant_research")}
                   </div>
                 </label>
 
diff --git a/src/client/InputHandler.ts b/src/client/InputHandler.ts
index 0c206d9a1..630e629e2 100644
--- a/src/client/InputHandler.ts
+++ b/src/client/InputHandler.ts
@@ -377,6 +377,7 @@ export class InputHandler {
       [this.keybinds.buildAirfield]: UnitType.Airfield,
       [this.keybinds.buildHospital]: UnitType.Hospital,
       [this.keybinds.buildAcademy]: UnitType.Academy,
+      [this.keybinds.buildResearchLab]: UnitType.ResearchLab,
       [this.keybinds.buildMissileSilo]: UnitType.MissileSilo,
       [this.keybinds.buildSAMLauncher]: UnitType.SAMLauncher,
       [this.keybinds.buildDefensePost]: UnitType.DefensePost,
diff --git a/src/client/SinglePlayerModal.ts b/src/client/SinglePlayerModal.ts
index e7bcc296a..2df303d27 100644
--- a/src/client/SinglePlayerModal.ts
+++ b/src/client/SinglePlayerModal.ts
@@ -275,7 +275,9 @@ export class SinglePlayerModal extends LitElement {
                   @change=${this.handleInstantResearchHumanOnlyChange}
                   .checked=${this.instantResearchHumanOnly}
                 />
-                <div class="option-card-title">Instant Research</div>
+                <div class="option-card-title">
+                  ${translateText("single_modal.instant_research")}
+                </div>
               </label>
 
               <label
diff --git a/src/client/graphics/layers/BuildMenu.ts b/src/client/graphics/layers/BuildMenu.ts
index db93985f2..c97e15b66 100644
--- a/src/client/graphics/layers/BuildMenu.ts
+++ b/src/client/graphics/layers/BuildMenu.ts
@@ -229,6 +229,7 @@ export class BuildMenu extends LitElement {
       buildAirfield: "KeyI",
       buildHospital: "KeyO",
       buildAcademy: "KeyP",
+      buildResearchLab: "KeyL",
       buildMissileSilo: "KeyH",
       buildSAMLauncher: "KeyJ",
       buildDefensePost: "KeyK",
@@ -246,6 +247,7 @@ export class BuildMenu extends LitElement {
       [keybinds.buildAirfield]: UnitType.Airfield,
       [keybinds.buildHospital]: UnitType.Hospital,
       [keybinds.buildAcademy]: UnitType.Academy,
+      [keybinds.buildResearchLab]: UnitType.ResearchLab,
       [keybinds.buildMissileSilo]: UnitType.MissileSilo,
       [keybinds.buildSAMLauncher]: UnitType.SAMLauncher,
       [keybinds.buildDefensePost]: UnitType.DefensePost,
diff --git a/src/client/graphics/layers/PlayerInfoOverlay.ts b/src/client/graphics/layers/PlayerInfoOverlay.ts
index 6cde14f0f..ab50fc982 100644
--- a/src/client/graphics/layers/PlayerInfoOverlay.ts
+++ b/src/client/graphics/layers/PlayerInfoOverlay.ts
@@ -214,6 +214,7 @@ export class PlayerInfoOverlay extends LitElement implements Layer {
       UnitType.City,
       UnitType.Hospital,
       UnitType.Academy,
+      UnitType.ResearchLab,
       UnitType.Port,
       UnitType.Warship,
       UnitType.MissileSilo,
@@ -227,6 +228,7 @@ export class PlayerInfoOverlay extends LitElement implements Layer {
       [UnitType.City]: "/images/CityIconWhite.svg",
       [UnitType.Hospital]: "/images/HospitalIconWhite.svg",
       [UnitType.Academy]: "/images/AcademyIconWhite.png",
+      [UnitType.ResearchLab]: "/images/researchlab.png",
       [UnitType.Port]: "/images/PortIcon.svg",
       [UnitType.Warship]: "/images/BattleshipIconWhite.svg",
       [UnitType.MissileSilo]: "/images/MissileSiloIconWhite.svg",
@@ -345,7 +347,8 @@ export class PlayerInfoOverlay extends LitElement implements Layer {
                 unitType === UnitType.City ||
                 unitType === UnitType.Port ||
                 unitType === UnitType.Hospital ||
-                unitType === UnitType.Academy
+                unitType === UnitType.Academy ||
+                unitType === UnitType.ResearchLab
                   ? player.unitsOwned(unitType)
                   : player.units(unitType).length;
 
diff --git a/src/client/graphics/layers/StructureLayer.ts b/src/client/graphics/layers/StructureLayer.ts
index 620afc0a1..d02e388f3 100644
--- a/src/client/graphics/layers/StructureLayer.ts
+++ b/src/client/graphics/layers/StructureLayer.ts
@@ -87,6 +87,7 @@ export class StructureLayer implements Layer {
   private lastAffordableForUpgradePort: boolean | null = null;
   private lastAffordableForUpgradeHospital: boolean | null = null;
   private lastAffordableForUpgradeAcademy: boolean | null = null;
+  private lastAffordableForUpgradeResearchLab: boolean | null = null;
   private lastAffordableForUpgradeSilo: boolean | null = null;
   private lastAffordableForUpgradeSAM: boolean | null = null;
   // Client-side level tracking for structures (temporary)
@@ -341,6 +342,7 @@ export class StructureLayer implements Layer {
       unit.type() !== UnitType.Port &&
       unit.type() !== UnitType.Hospital &&
       unit.type() !== UnitType.Academy &&
+      unit.type() !== UnitType.ResearchLab &&
       unit.type() !== UnitType.MissileSilo &&
       unit.type() !== UnitType.SAMLauncher
     )
@@ -357,12 +359,16 @@ export class StructureLayer implements Layer {
     const affordableAcademy = this.canAffordUpgradeForType(UnitType.Academy);
     const affordableSilo = this.canAffordUpgradeForType(UnitType.MissileSilo);
     const affordableSAM = this.canAffordUpgradeForType(UnitType.SAMLauncher);
+    const affordableResearchLab = this.canAffordUpgradeForType(
+      UnitType.ResearchLab,
+    );
     if (!this.upgradeMode) {
       if (
         this.lastAffordableForUpgradeCity !== null ||
         this.lastAffordableForUpgradePort !== null ||
         this.lastAffordableForUpgradeHospital !== null ||
         this.lastAffordableForUpgradeAcademy !== null ||
+        this.lastAffordableForUpgradeResearchLab !== null ||
         this.lastAffordableForUpgradeSilo !== null ||
         this.lastAffordableForUpgradeSAM !== null
       ) {
@@ -372,6 +378,7 @@ export class StructureLayer implements Layer {
             r.unit.type() === UnitType.Port ||
             r.unit.type() === UnitType.Hospital ||
             r.unit.type() === UnitType.Academy ||
+            r.unit.type() === UnitType.ResearchLab ||
             r.unit.type() === UnitType.MissileSilo ||
             r.unit.type() === UnitType.SAMLauncher
           ) {
@@ -382,6 +389,7 @@ export class StructureLayer implements Layer {
         this.lastAffordableForUpgradePort = null;
         this.lastAffordableForUpgradeHospital = null;
         this.lastAffordableForUpgradeAcademy = null;
+        this.lastAffordableForUpgradeResearchLab = null;
         this.lastAffordableForUpgradeSilo = null;
         this.lastAffordableForUpgradeSAM = null;
         this.shouldRedraw = true;
@@ -407,13 +415,16 @@ export class StructureLayer implements Layer {
       this.lastAffordableForUpgradeAcademy !== affordableAcademy;
     const siloChanged = this.lastAffordableForUpgradeSilo !== affordableSilo;
     const samChanged = this.lastAffordableForUpgradeSAM !== affordableSAM;
+    const labChanged =
+      this.lastAffordableForUpgradeResearchLab !== affordableResearchLab;
     if (
       cityChanged ||
       portChanged ||
       hospitalChanged ||
       academyChanged ||
       siloChanged ||
-      samChanged
+      samChanged ||
+      labChanged
     ) {
       for (const r of this.renders) {
         const t = r.unit.type();
@@ -422,6 +433,7 @@ export class StructureLayer implements Layer {
           (portChanged && t === UnitType.Port) ||
           (hospitalChanged && t === UnitType.Hospital) ||
           (academyChanged && t === UnitType.Academy) ||
+          (labChanged && t === UnitType.ResearchLab) ||
           (siloChanged && t === UnitType.MissileSilo) ||
           (samChanged && t === UnitType.SAMLauncher)
         ) {
@@ -432,6 +444,7 @@ export class StructureLayer implements Layer {
       this.lastAffordableForUpgradePort = affordablePort;
       this.lastAffordableForUpgradeHospital = affordableHospital;
       this.lastAffordableForUpgradeAcademy = affordableAcademy;
+      this.lastAffordableForUpgradeResearchLab = affordableResearchLab;
       this.lastAffordableForUpgradeSilo = affordableSilo;
       this.lastAffordableForUpgradeSAM = affordableSAM;
       this.shouldRedraw = true;
@@ -446,6 +459,7 @@ export class StructureLayer implements Layer {
         t !== UnitType.Port &&
         t !== UnitType.Hospital &&
         t !== UnitType.Academy &&
+        t !== UnitType.ResearchLab &&
         t !== UnitType.MissileSilo &&
         t !== UnitType.SAMLauncher
       ) {
@@ -602,6 +616,7 @@ export class StructureLayer implements Layer {
         structureType === UnitType.Port ||
         structureType === UnitType.Hospital ||
         structureType === UnitType.Academy ||
+        structureType === UnitType.ResearchLab ||
         structureType === UnitType.MissileSilo ||
         structureType === UnitType.SAMLauncher) &&
       this.shouldHighlight(unit)
@@ -869,13 +884,14 @@ export class StructureLayer implements Layer {
       if (clickedUnit.owner() !== this.game.myPlayer()) {
         return;
       }
-      // In upgrade mode: attempt to upgrade structure (City/Port/Hospital/Academy/MissileSilo) immediately
+      // In upgrade mode: attempt to upgrade structure (City/Port/Hospital/Academy/ResearchLab/MissileSilo/SAMLauncher) immediately
       if (
         this.upgradeMode &&
         (clickedUnit.type() === UnitType.City ||
           clickedUnit.type() === UnitType.Port ||
           clickedUnit.type() === UnitType.Hospital ||
           clickedUnit.type() === UnitType.Academy ||
+          clickedUnit.type() === UnitType.ResearchLab ||
           clickedUnit.type() === UnitType.MissileSilo ||
           clickedUnit.type() === UnitType.SAMLauncher)
       ) {
diff --git a/src/client/utilities/RenderUnitTypeOptions.ts b/src/client/utilities/RenderUnitTypeOptions.ts
index de80727d4..f6d1763b7 100644
--- a/src/client/utilities/RenderUnitTypeOptions.ts
+++ b/src/client/utilities/RenderUnitTypeOptions.ts
@@ -22,6 +22,7 @@ const unitOptions: { type: UnitType; translationKey: string }[] = [
   { type: UnitType.MIRV, translationKey: "unit_type.mirv" },
   { type: UnitType.Hospital, translationKey: "unit_type.hospital" },
   { type: UnitType.Academy, translationKey: "unit_type.academy" },
+  { type: UnitType.ResearchLab, translationKey: "unit_type.research_lab" },
 ];
 
 export function renderUnitTypeOptions({
diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts
index 002e8d663..9d8a22350 100644
--- a/src/core/configuration/DefaultConfig.ts
+++ b/src/core/configuration/DefaultConfig.ts
@@ -1333,6 +1333,7 @@ export class DefaultConfig implements Config {
       case UnitType.Port:
       case UnitType.Hospital:
       case UnitType.Academy:
+      case UnitType.ResearchLab:
         return 0.8; // Default 80%
       case UnitType.MissileSilo:
         return 0.2; // Missile silo: 20%
diff --git a/src/core/execution/ExecutionManager.ts b/src/core/execution/ExecutionManager.ts
index 15d63ea92..2bb3b7672 100644
--- a/src/core/execution/ExecutionManager.ts
+++ b/src/core/execution/ExecutionManager.ts
@@ -150,12 +150,13 @@ export class Executor {
       case "upgrade_structure": {
         const unit = player.units().find((u) => u.id() === intent.unitId);
         if (!unit || unit.owner() !== player) return new NoOpExecution();
-        // Allow upgrades for City, Port, Hospital, Academy, Missile Silo, SAM Launcher
+        // Allow upgrades for City, Port, Hospital, Academy, Research Lab, Missile Silo, SAM Launcher
         const allowed =
           intent.unitType === UnitType.City ||
           intent.unitType === UnitType.Port ||
           intent.unitType === UnitType.Hospital ||
           intent.unitType === UnitType.Academy ||
+          intent.unitType === UnitType.ResearchLab ||
           intent.unitType === UnitType.MissileSilo ||
           intent.unitType === UnitType.SAMLauncher;
         if (!allowed || unit.type() !== intent.unitType) {
diff --git a/src/core/execution/PlayerExecution.ts b/src/core/execution/PlayerExecution.ts
index fbc6ddd47..230dc5c1b 100644
--- a/src/core/execution/PlayerExecution.ts
+++ b/src/core/execution/PlayerExecution.ts
@@ -152,9 +152,21 @@ export class PlayerExecution implements Execution {
     const investment = Math.max(0, grossGold * investRate);
     const A = this.config.researchAlpha();
     const B = this.config.researchBeta();
-    const xTotal = A * Math.pow(investment, B);
+    let xTotal = A * Math.pow(investment, B);
     if (!Number.isFinite(xTotal) || xTotal <= 0) return;
 
+    // Apply Research Lab multiplier: +40% for first, +20% for second, halving thereafter
+    // Upgrades count as multiples via effectiveUnits (level-weighted)
+    const labsEff = Math.max(
+      0,
+      (this.player as any).effectiveUnits?.(UnitType.ResearchLab) ?? 0,
+    );
+    if (labsEff > 0) {
+      const boostSum = (0.4 * (1 - Math.pow(0.5, labsEff))) / (1 - 0.5); // geometric series
+      const multiplier = 1 + boostSum; // caps at 1.8 as labs -> infinity
+      xTotal *= multiplier;
+    }
+
     // Build researched set and available techs
     const nodes = getTechNodes();
     const researched = new Set<string>();
diff --git a/src/core/execution/UpgradeStructureExecution.ts b/src/core/execution/UpgradeStructureExecution.ts
index 3bcd6aeb5..e6a59a9d5 100644
--- a/src/core/execution/UpgradeStructureExecution.ts
+++ b/src/core/execution/UpgradeStructureExecution.ts
@@ -40,6 +40,7 @@ export class UpgradeStructureExecution implements Execution {
       case UnitType.Port:
       case UnitType.Hospital:
       case UnitType.Academy:
+      case UnitType.ResearchLab:
       case UnitType.MissileSilo:
       case UnitType.SAMLauncher: {
         const unitType = this.unit.type();
diff --git a/src/core/game/PlayerImpl.ts b/src/core/game/PlayerImpl.ts
index 234267a70..df0e2a72b 100644
--- a/src/core/game/PlayerImpl.ts
+++ b/src/core/game/PlayerImpl.ts
@@ -445,7 +445,8 @@ export class PlayerImpl implements Player {
           u.type() === UnitType.City ||
           u.type() === UnitType.Port ||
           u.type() === UnitType.Hospital ||
-          u.type() === UnitType.Academy
+          u.type() === UnitType.Academy ||
+          u.type() === UnitType.ResearchLab
             ? baseMax + 1000 * Math.max(0, level - 1)
             : baseMax;
         const healthRatio = u.hasHealth()
diff --git a/src/core/game/UnitImpl.ts b/src/core/game/UnitImpl.ts
index b47da16e2..06f5881d1 100644
--- a/src/core/game/UnitImpl.ts
+++ b/src/core/game/UnitImpl.ts
@@ -298,6 +298,17 @@ export class UnitImpl implements Unit {
         this.mg.addUpdate(this.toUpdate());
         return;
       }
+      case UnitType.ResearchLab: {
+        // Research Lab upgrades: increase level only (counts as multiples), no health changes
+        this._level += 1;
+        this._bonusMaxHealth += 1000;
+        const healed = Number(this._health) + 1000;
+        const capped = Math.min(healed, this.effectiveMaxHealth());
+        this._health = toInt(capped);
+        this._owner.invalidateEffectiveUnitsCache(UnitType.ResearchLab);
+        this.mg.addUpdate(this.toUpdate());
+        return;
+      }
       default:
         // Unsupported structure types: no-op for now
         return;