diff --git a/src/client/graphics/layers/TeamStats.ts b/src/client/graphics/layers/TeamStats.ts index 120b4b60c..58feb7f39 100644 --- a/src/client/graphics/layers/TeamStats.ts +++ b/src/client/graphics/layers/TeamStats.ts @@ -3,7 +3,7 @@ import { customElement, property } from "lit/decorators.js"; import { EventBus } from "../../../core/EventBus"; import { GameMode, Team, UnitType } from "../../../core/game/Game"; import { GameView, PlayerView } from "../../../core/game/GameView"; -import { renderNumber, translateText } from "../../Utils"; +import { renderNumber, renderTroops, translateText } from "../../Utils"; import { Layer } from "./Layer"; interface TeamEntry { @@ -11,7 +11,7 @@ interface TeamEntry { isMyTeam: boolean; totalScoreStr: string; totalGold: string; - totalTroops: string; + totalMaxTroops: string; totalSAMs: string; totalLaunchers: string; totalWarShips: string; @@ -71,7 +71,7 @@ export class TeamStats extends LitElement implements Layer { this.teams = Object.entries(grouped) .map(([teamStr, teamPlayers]) => { let totalGold = 0n; - let totalTroops = 0; + let totalMaxTroops = 0; let totalScoreSort = 0; let totalSAMs = 0; let totalLaunchers = 0; @@ -80,7 +80,7 @@ export class TeamStats extends LitElement implements Layer { for (const p of teamPlayers) { if (p.isAlive()) { - totalTroops += p.troops(); + totalMaxTroops += this.game.config().maxTroops(p); totalGold += p.gold(); totalScoreSort += p.numTilesOwned(); totalLaunchers += p.totalUnitLevels(UnitType.MissileSilo); @@ -100,7 +100,7 @@ export class TeamStats extends LitElement implements Layer { totalScoreStr: formatPercentage(totalScorePercent), totalScoreSort, totalGold: renderNumber(totalGold), - totalTroops: renderNumber(totalTroops / 10), + totalMaxTroops: renderTroops(totalMaxTroops), players: teamPlayers, totalLaunchers: renderNumber(totalLaunchers), @@ -134,47 +134,47 @@ export class TeamStats extends LitElement implements Layer { >
-
+
${translateText("leaderboard.team")}
${this.showUnits ? html`
${translateText("leaderboard.launchers")}
${translateText("leaderboard.sams")}
${translateText("leaderboard.warships")}
${translateText("leaderboard.cities")}
` : html`
${translateText("leaderboard.owned")}
${translateText("leaderboard.gold")}
- ${translateText("leaderboard.troops")} + ${translateText("leaderboard.maxtroops")}
`}
@@ -221,7 +221,7 @@ export class TeamStats extends LitElement implements Layer { ${team.totalGold}
- ${team.totalTroops} + ${team.totalMaxTroops}
`,