From 42490e2aef8e7c14f77e52820d84a302bb642859 Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Tue, 21 Jan 2025 14:33:20 -0800
Subject: [PATCH] use renderTroops & renderNumber for playerinfo overlay

---
 src/client/graphics/NameBoxCalculator.ts        | 5 -----
 src/client/graphics/layers/PlayerInfoOverlay.ts | 5 +++--
 src/core/game/TerrainMapLoader.ts               | 1 +
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/client/graphics/NameBoxCalculator.ts b/src/client/graphics/NameBoxCalculator.ts
index ce1de94e3..5914b41d6 100644
--- a/src/client/graphics/NameBoxCalculator.ts
+++ b/src/client/graphics/NameBoxCalculator.ts
@@ -37,11 +37,6 @@ export function placeName(game: Game, player: MutablePlayer): NameViewData {
         scalingFactor = 32
     }
 
-    console.log(`for player ${player.name()}, got scaling factor ${scalingFactor}}`)
-
-    // const rawScalingFactor = (boundingBox.max.x - boundingBox.min.x) / 1000
-    // const scalingFactor = within(Math.floor(rawScalingFactor), .1, 1)
-
     const grid = createGrid(game, player, boundingBox, scalingFactor);
     const largestRectangle = findLargestInscribedRectangle(grid);
     largestRectangle.x = largestRectangle.x * scalingFactor
diff --git a/src/client/graphics/layers/PlayerInfoOverlay.ts b/src/client/graphics/layers/PlayerInfoOverlay.ts
index 36032a8b6..cabe8ff9e 100644
--- a/src/client/graphics/layers/PlayerInfoOverlay.ts
+++ b/src/client/graphics/layers/PlayerInfoOverlay.ts
@@ -9,6 +9,7 @@ import { MouseMoveEvent } from '../../InputHandler';
 import { GameView, PlayerView } from '../../../core/GameView';
 import { TileRef } from '../../../core/game/GameMap';
 import { PauseGameEvent } from '../../Transport';
+import { renderNumber, renderTroops } from '../../Utils';
 
 function euclideanDistWorld(coord: { x: number, y: number }, tileRef: TileRef, game: GameView): number {
     const x = game.x(tileRef);
@@ -165,8 +166,8 @@ export class PlayerInfoOverlay extends LitElement implements Layer {
         return html`
         <div class="info-content">
             <div class="player-name ${isAlly ? 'ally' : ''}">${player.name()}</div>
-            <div class="type-label">Troops: ${player.troops()}</div>
-            <div class="type-label">Gold: ${player.gold()}</div>
+            <div class="type-label">Troops: ${renderTroops(player.troops())}</div>
+            <div class="type-label">Gold: ${renderNumber(player.gold())}</div>
             ${relationHtml == null ? '' : relationHtml}
         </div>
         `;
diff --git a/src/core/game/TerrainMapLoader.ts b/src/core/game/TerrainMapLoader.ts
index 6d9160b96..c49e6bbf7 100644
--- a/src/core/game/TerrainMapLoader.ts
+++ b/src/core/game/TerrainMapLoader.ts
@@ -50,6 +50,7 @@ export async function loadTerrainFromFile(fileData: string): Promise<GameMap> {
         rawData[i] = packedByte;
         if (packedByte & 0b10000000) numLand++;
     }
+
     return new GameMapImpl(width, height, rawData, numLand)
 
 }