From 65115eb4eee839bd61102825f8656dfbd02487ef Mon Sep 17 00:00:00 2001
From: 1brucben <1benjbruce@gmail.com>
Date: Thu, 5 Jun 2025 18:02:38 +0200
Subject: [PATCH] add hospital visual

---
 src/client/NewsModal.ts                    |  6 ++++--
 src/client/graphics/layers/ControlPanel.ts | 13 ++++++++++---
 src/client/graphics/layers/TopBar.ts       |  6 +++++-
 src/core/configuration/DefaultConfig.ts    |  9 +--------
 src/core/execution/AttackExecution.ts      | 15 +++++++++++++++
 src/core/execution/PlayerExecution.ts      |  5 ++++-
 src/core/game/Game.ts                      |  3 +++
 src/core/game/GameUpdates.ts               |  1 +
 src/core/game/GameView.ts                  |  3 +++
 src/core/game/PlayerImpl.ts                | 13 +++++++++++++
 10 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/src/client/NewsModal.ts b/src/client/NewsModal.ts
index ff9b7aabc..81db0b235 100644
--- a/src/client/NewsModal.ts
+++ b/src/client/NewsModal.ts
@@ -52,8 +52,10 @@ export class NewsModal extends LitElement {
               <div class="news-content">
                 <p>
                   This test version introduces a new building:
-                  <strong>Hospitals</strong>. Each hospital reduces your troop
-                  losses in both offensive and defensive combat.
+                  <strong>Hospitals</strong>. Each hospital restores some of
+                  your troop losses from both offensive and defensive combat.
+                  The restored troops are displayed next to your population
+                  growth count in your control panel.
                 </p>
                 <p>
                   The first hospital provides a
diff --git a/src/client/graphics/layers/ControlPanel.ts b/src/client/graphics/layers/ControlPanel.ts
index 836d9390c..e3d3f5bfb 100644
--- a/src/client/graphics/layers/ControlPanel.ts
+++ b/src/client/graphics/layers/ControlPanel.ts
@@ -34,6 +34,9 @@ export class ControlPanel extends LitElement implements Layer {
   @state()
   private popRate: number;
 
+  @state()
+  private _hospitalReturns: number = 0;
+
   @state()
   private _troops: number;
 
@@ -121,6 +124,7 @@ export class ControlPanel extends LitElement implements Layer {
 
     this._population = player.population();
     this._maxPopulation = this.game.config().maxPopulation(player);
+    this._hospitalReturns = player.hospitalReturns() * 10;
     this._gold = player.gold();
     this._troops = player.troops();
     this._workers = player.workers();
@@ -221,9 +225,12 @@ export class ControlPanel extends LitElement implements Layer {
                   ? "text-green-500"
                   : "text-yellow-500"}"
                 translate="no"
-                >(+${renderTroops(this.popRate)})</span
-              ></span
-            >
+              >
+                (+${renderTroops(
+                  this.popRate,
+                )}${`/ +${renderTroops(this._hospitalReturns)}`})
+              </span>
+            </span>
           </div>
           <div class="flex justify-between">
             <span class="font-bold"
diff --git a/src/client/graphics/layers/TopBar.ts b/src/client/graphics/layers/TopBar.ts
index 991fda739..3ce6e6083 100644
--- a/src/client/graphics/layers/TopBar.ts
+++ b/src/client/graphics/layers/TopBar.ts
@@ -10,6 +10,7 @@ export class TopBar extends LitElement implements Layer {
   public game: GameView;
   private isVisible = false;
   private _population = 0;
+  private _hospitalReturns = 0;
   private _lastPopulationIncreaseRate = 0;
   private _popRateIsIncreasing = false;
 
@@ -36,6 +37,7 @@ export class TopBar extends LitElement implements Layer {
         popIncreaseRate >= this._lastPopulationIncreaseRate;
       this._lastPopulationIncreaseRate = popIncreaseRate;
     }
+    this._hospitalReturns = player.hospitalReturns?.() ?? 0;
   }
 
   render() {
@@ -72,8 +74,10 @@ export class TopBar extends LitElement implements Layer {
             class="${this._popRateIsIncreasing
               ? "text-green-500"
               : "text-yellow-500"}"
-            >(+${renderTroops(popRate)})</span
           >
+            (+${renderTroops(popRate)} /
+            +${renderTroops(this._hospitalReturns)})
+          </span>
         </div>
         <!-- Gold section (takes 1 column on desktop) -->
         <div
diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts
index b91f65c4b..154d28779 100644
--- a/src/core/configuration/DefaultConfig.ts
+++ b/src/core/configuration/DefaultConfig.ts
@@ -569,12 +569,6 @@ export class DefaultConfig implements Config {
       const traitorDebuff = defender.isTraitor()
         ? this.traitorDefenseDebuff()
         : 1;
-      const attackerHospitalBonus =
-        0.6 + 0.4 * Math.pow(0.75, attacker.units(UnitType.Hospital).length);
-
-      const defenderHospitalBonus =
-        0.6 + 0.4 * Math.pow(0.75, defender.units(UnitType.Hospital).length);
-      console.log(attackerHospitalBonus, defenderHospitalBonus);
       const baseTroopLoss = 10;
       const attackLossModifier = 1.35;
       const baseTileCost = 45;
@@ -582,10 +576,9 @@ export class DefaultConfig implements Config {
       return {
         attackerTroopLoss:
           mag *
-          attackerHospitalBonus *
           (baseTroopLoss +
             attackLossModifier * defenderDensity * traitorDebuff),
-        defenderTroopLoss: defenderDensity * defenderHospitalBonus,
+        defenderTroopLoss: defenderDensity,
         tilesPerTickUsed:
           baseTileCost *
           within(defenderDensity, 3, 50) ** 0.2 *
diff --git a/src/core/execution/AttackExecution.ts b/src/core/execution/AttackExecution.ts
index daf17d759..7e671c28f 100644
--- a/src/core/execution/AttackExecution.ts
+++ b/src/core/execution/AttackExecution.ts
@@ -9,6 +9,7 @@ import {
   PlayerType,
   TerrainType,
   TerraNullius,
+  UnitType,
 } from "../game/Game";
 import { TileRef } from "../game/GameMap";
 import { PseudoRandom } from "../PseudoRandom";
@@ -294,6 +295,20 @@ export class AttackExecution implements Execution {
       if (targetPlayer) {
         targetPlayer.removeTroops(defenderTroopLoss);
       }
+      const attackerMultiplier =
+        0.6 + 0.4 * Math.pow(0.75, this._owner.units(UnitType.Hospital).length);
+      const defenderMultiplier = targetPlayer
+        ? 0.6 +
+          0.4 * Math.pow(0.75, this._owner.units(UnitType.Hospital).length)
+        : 1;
+
+      const attackerReturns = attackerTroopLoss * (1 - attackerMultiplier);
+      const defenderReturns = defenderTroopLoss * (1 - defenderMultiplier);
+
+      this._owner.addHospitalReturns(attackerReturns);
+      if (targetPlayer) {
+        targetPlayer.addHospitalReturns(defenderReturns);
+      }
       this._owner.conquer(tileToConquer);
       this.handleDeadDefender();
     }
diff --git a/src/core/execution/PlayerExecution.ts b/src/core/execution/PlayerExecution.ts
index 276be4890..99cce8f9d 100644
--- a/src/core/execution/PlayerExecution.ts
+++ b/src/core/execution/PlayerExecution.ts
@@ -74,7 +74,10 @@ export class PlayerExecution implements Execution {
       return;
     }
 
-    const popInc = this.config.populationIncreaseRate(this.player);
+    const popInc =
+      this.config.populationIncreaseRate(this.player) +
+      this.player.hospitalReturns();
+    this.player.resetHospitalReturns();
     this.player.addWorkers(popInc * (1 - this.player.targetTroopRatio()));
     this.player.addTroops(popInc * this.player.targetTroopRatio());
     const goldFromWorkers = this.config.goldAdditionRate(this.player);
diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts
index c9e85e5f7..ae0e0b48b 100644
--- a/src/core/game/Game.ts
+++ b/src/core/game/Game.ts
@@ -461,6 +461,9 @@ export interface Player {
   setTroops(troops: number): void;
   addTroops(troops: number): void;
   removeTroops(troops: number): number;
+  hospitalReturns(): number;
+  addHospitalReturns(amount: number): void;
+  resetHospitalReturns(): void;
 
   // Units
   units(...types: UnitType[]): Unit[];
diff --git a/src/core/game/GameUpdates.ts b/src/core/game/GameUpdates.ts
index 679688036..e4397108f 100644
--- a/src/core/game/GameUpdates.ts
+++ b/src/core/game/GameUpdates.ts
@@ -107,6 +107,7 @@ export interface PlayerUpdate {
   gold: Gold;
   population: number;
   totalPopulation: number;
+  hospitalReturns: number;
   workers: number;
   troops: number;
   targetTroopRatio: number;
diff --git a/src/core/game/GameView.ts b/src/core/game/GameView.ts
index b32170dc7..140349c1f 100644
--- a/src/core/game/GameView.ts
+++ b/src/core/game/GameView.ts
@@ -292,6 +292,9 @@ export class PlayerView {
   hasSpawned(): boolean {
     return this.data.hasSpawned;
   }
+  hospitalReturns(): number {
+    return this.data.hospitalReturns ?? 0;
+  }
 }
 
 export class GameView implements GameMap {
diff --git a/src/core/game/PlayerImpl.ts b/src/core/game/PlayerImpl.ts
index 2812b71ab..5288714f9 100644
--- a/src/core/game/PlayerImpl.ts
+++ b/src/core/game/PlayerImpl.ts
@@ -82,6 +82,7 @@ export class PlayerImpl implements Player {
   private _flag: string | undefined;
   private _name: string;
   private _displayName: string;
+  private _hospitalReturns: number = 0;
 
   public pastOutgoingAllianceRequests: AllianceRequest[] = [];
 
@@ -139,6 +140,7 @@ export class PlayerImpl implements Player {
       gold: this._gold,
       population: this.population(),
       totalPopulation: this.totalPopulation(),
+      hospitalReturns: this.hospitalReturns(),
       workers: this.workers(),
       troops: this.troops(),
       targetTroopRatio: this.targetTroopRatio(),
@@ -720,6 +722,17 @@ export class PlayerImpl implements Player {
     return Number(toRemove);
   }
 
+  hospitalReturns(): number {
+    return this._hospitalReturns;
+  }
+  addHospitalReturns(count: number): void {
+    this._hospitalReturns += count;
+  }
+
+  resetHospitalReturns(): void {
+    this._hospitalReturns = 0;
+  }
+
   captureUnit(unit: Unit): void {
     if (unit.owner() === this) {
       throw new Error(`Cannot capture unit, ${this} already owns ${unit}`);