From ddbb53691801e934140455c86590576c186e567f Mon Sep 17 00:00:00 2001
From: Evan <evanpelle@gmail.com>
Date: Wed, 2 Apr 2025 12:57:46 -0700
Subject: [PATCH] add teams progress to spawnbar

---
 src/client/graphics/layers/SpawnTimer.ts | 45 +++++++++++++++++++-----
 src/core/game/GameView.ts                |  4 +++
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/client/graphics/layers/SpawnTimer.ts b/src/client/graphics/layers/SpawnTimer.ts
index d85b0bd4d..95ed07cd7 100644
--- a/src/client/graphics/layers/SpawnTimer.ts
+++ b/src/client/graphics/layers/SpawnTimer.ts
@@ -1,34 +1,63 @@
+import { blue, red } from "../../../core/configuration/Colors";
+import { GameMode, TeamName } from "../../../core/game/Game";
 import { GameView } from "../../../core/game/GameView";
 import { TransformHandler } from "../TransformHandler";
 import { Layer } from "./Layer";
 
 export class SpawnTimer implements Layer {
+  private ratio = 0;
+  private leftColor = "rgba(0, 128, 255, 0.7)";
+  private rightColor = "rgba(0, 0, 0, 0.5)";
+
   constructor(
     private game: GameView,
     private transformHandler: TransformHandler,
   ) {}
 
   init() {}
-  tick() {}
+
+  tick() {
+    if (this.game.inSpawnPhase()) {
+      this.ratio = this.game.ticks() / this.game.config().numSpawnPhaseTurns();
+      return;
+    }
+    if (this.game.config().gameConfig().gameMode != GameMode.Team) {
+      this.ratio = 0;
+      return;
+    }
+
+    const numBlueTiles = this.game
+      .players()
+      .filter((p) => p.teamName() == TeamName.Blue)
+      .reduce((acc, p) => acc + p.numTilesOwned(), 0);
+
+    const numRedTiles = this.game
+      .players()
+      .filter((p) => p.teamName() == TeamName.Red)
+      .reduce((acc, p) => acc + p.numTilesOwned(), 0);
+
+    this.ratio = numBlueTiles / (numBlueTiles + numRedTiles);
+    this.leftColor = blue.toRgbString();
+    this.rightColor = red.toRgbString();
+  }
+
   shouldTransform(): boolean {
     return false;
   }
 
   renderLayer(context: CanvasRenderingContext2D) {
-    if (!this.game.inSpawnPhase()) {
+    if (this.ratio == 0) {
       return;
     }
 
-    const barHeight = 15;
+    const barHeight = 10;
     const barBackgroundWidth = this.transformHandler.width();
 
-    const ratio = this.game.ticks() / this.game.config().numSpawnPhaseTurns();
-
     // Draw bar background
-    context.fillStyle = "rgba(0, 0, 0, 0.5)";
+    context.fillStyle = this.rightColor;
     context.fillRect(0, 0, barBackgroundWidth, barHeight);
 
-    context.fillStyle = "rgba(0, 128, 255, 0.7)";
-    context.fillRect(0, 0, barBackgroundWidth * ratio, barHeight);
+    context.fillStyle = this.leftColor;
+    context.fillRect(0, 0, barBackgroundWidth * this.ratio, barHeight);
   }
 }
diff --git a/src/core/game/GameView.ts b/src/core/game/GameView.ts
index c7ffc85d7..75efe5328 100644
--- a/src/core/game/GameView.ts
+++ b/src/core/game/GameView.ts
@@ -384,6 +384,10 @@ export class GameView implements GameMap {
     throw Error(`player id ${id} not found`);
   }
 
+  players(): PlayerView[] {
+    return Array.from(this._players.values());
+  }
+
   playerBySmallID(id: number): PlayerView | TerraNullius {
     if (id == 0) {
       return new TerraNulliusImpl();