mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-28 14:34:18 +00:00
cf1e67cd9c
Resolves #2837 ## Description: This PR aligns the "Owned" percentage format in TeamStats to the same data in Leaderboard, fixing the issue that currently happens when team reaches 100%, and the percentage is displayed as "1.0e+2%". Previous implementation to avoid this problem involved checking for the "100" value, but we all know how floating point arithmetic works in JS... Before: <img width="912" height="450" alt="image" src="https://github.com/user-attachments/assets/a3ce03ab-53c6-4b7b-b3fd-7073a6095252" /> After: <img width="441" height="233" alt="image" src="https://github.com/user-attachments/assets/21b07834-e3ec-44c3-bd6f-3d5a5d6c851c" /> ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: deshack_82603
252 lines
8.1 KiB
TypeScript
252 lines
8.1 KiB
TypeScript
import { LitElement, html } from "lit";
|
|
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, renderTroops, translateText } from "../../Utils";
|
|
import { Layer } from "./Layer";
|
|
|
|
interface TeamEntry {
|
|
teamName: string;
|
|
isMyTeam: boolean;
|
|
totalScoreStr: string;
|
|
totalGold: string;
|
|
totalMaxTroops: string;
|
|
totalSAMs: string;
|
|
totalLaunchers: string;
|
|
totalWarShips: string;
|
|
totalCities: string;
|
|
totalScoreSort: number;
|
|
players: PlayerView[];
|
|
}
|
|
|
|
@customElement("team-stats")
|
|
export class TeamStats extends LitElement implements Layer {
|
|
public game: GameView;
|
|
public eventBus: EventBus;
|
|
|
|
@property({ type: Boolean }) visible = false;
|
|
teams: TeamEntry[] = [];
|
|
private _shownOnInit = false;
|
|
private showUnits = false;
|
|
private _myTeam: Team | null = null;
|
|
|
|
createRenderRoot() {
|
|
return this; // use light DOM for Tailwind
|
|
}
|
|
|
|
init() {}
|
|
|
|
tick() {
|
|
if (this.game.config().gameConfig().gameMode !== GameMode.Team) return;
|
|
|
|
if (!this._shownOnInit && !this.game.inSpawnPhase()) {
|
|
this._shownOnInit = true;
|
|
this.updateTeamStats();
|
|
}
|
|
|
|
if (!this.visible) return;
|
|
|
|
if (this.game.ticks() % 10 === 0) {
|
|
this.updateTeamStats();
|
|
}
|
|
}
|
|
|
|
private updateTeamStats() {
|
|
const players = this.game.playerViews();
|
|
const grouped: Record<Team, PlayerView[]> = {};
|
|
|
|
if (this._myTeam === null) {
|
|
const myPlayer = this.game.myPlayer();
|
|
this._myTeam = myPlayer?.team() ?? null;
|
|
}
|
|
|
|
for (const player of players) {
|
|
const team = player.team();
|
|
if (team === null) continue;
|
|
grouped[team] ??= [];
|
|
grouped[team].push(player);
|
|
}
|
|
|
|
this.teams = Object.entries(grouped)
|
|
.map(([teamStr, teamPlayers]) => {
|
|
let totalGold = 0n;
|
|
let totalMaxTroops = 0;
|
|
let totalScoreSort = 0;
|
|
let totalSAMs = 0;
|
|
let totalLaunchers = 0;
|
|
let totalWarShips = 0;
|
|
let totalCities = 0;
|
|
|
|
for (const p of teamPlayers) {
|
|
if (p.isAlive()) {
|
|
totalMaxTroops += this.game.config().maxTroops(p);
|
|
totalGold += p.gold();
|
|
totalScoreSort += p.numTilesOwned();
|
|
totalLaunchers += p.totalUnitLevels(UnitType.MissileSilo);
|
|
totalSAMs += p.totalUnitLevels(UnitType.SAMLauncher);
|
|
totalWarShips += p.totalUnitLevels(UnitType.Warship);
|
|
totalCities += p.totalUnitLevels(UnitType.City);
|
|
}
|
|
}
|
|
|
|
const numTilesWithoutFallout =
|
|
this.game.numLandTiles() - this.game.numTilesWithFallout();
|
|
const totalScorePercent = totalScoreSort / numTilesWithoutFallout;
|
|
|
|
return {
|
|
teamName: teamStr,
|
|
isMyTeam: teamStr === this._myTeam,
|
|
totalScoreStr: formatPercentage(totalScorePercent),
|
|
totalScoreSort,
|
|
totalGold: renderNumber(totalGold),
|
|
totalMaxTroops: renderTroops(totalMaxTroops),
|
|
players: teamPlayers,
|
|
|
|
totalLaunchers: renderNumber(totalLaunchers),
|
|
totalSAMs: renderNumber(totalSAMs),
|
|
totalWarShips: renderNumber(totalWarShips),
|
|
totalCities: renderNumber(totalCities),
|
|
};
|
|
})
|
|
.sort((a, b) => b.totalScoreSort - a.totalScoreSort);
|
|
|
|
this.requestUpdate();
|
|
}
|
|
|
|
renderLayer(context: CanvasRenderingContext2D) {}
|
|
|
|
shouldTransform(): boolean {
|
|
return false;
|
|
}
|
|
|
|
render() {
|
|
if (!this.visible) return html``;
|
|
|
|
return html`
|
|
<div
|
|
class="max-h-[30vh] overflow-y-auto grid bg-slate-800/70 w-full text-white text-xs md:text-sm"
|
|
@contextmenu=${(e: MouseEvent) => e.preventDefault()}
|
|
>
|
|
<div
|
|
class="grid w-full grid-cols-[repeat(var(--cols),1fr)]"
|
|
style="--cols:${this.showUnits ? 5 : 4};"
|
|
>
|
|
<!-- Header -->
|
|
<div class="contents font-bold bg-slate-700/50">
|
|
<div class="p-1.5 md:p-2.5 text-center border-b border-slate-500">
|
|
${translateText("leaderboard.team")}
|
|
</div>
|
|
${this.showUnits
|
|
? html`
|
|
<div
|
|
class="p-1.5 md:p-2.5 text-center border-b border-slate-500"
|
|
>
|
|
${translateText("leaderboard.launchers")}
|
|
</div>
|
|
<div
|
|
class="p-1.5 md:p-2.5 text-center border-b border-slate-500"
|
|
>
|
|
${translateText("leaderboard.sams")}
|
|
</div>
|
|
<div
|
|
class="p-1.5 md:p-2.5 text-center border-b border-slate-500"
|
|
>
|
|
${translateText("leaderboard.warships")}
|
|
</div>
|
|
<div
|
|
class="p-1.5 md:p-2.5 text-center border-b border-slate-500"
|
|
>
|
|
${translateText("leaderboard.cities")}
|
|
</div>
|
|
`
|
|
: html`
|
|
<div
|
|
class="p-1.5 md:p-2.5 text-center border-b border-slate-500"
|
|
>
|
|
${translateText("leaderboard.owned")}
|
|
</div>
|
|
<div
|
|
class="p-1.5 md:p-2.5 text-center border-b border-slate-500"
|
|
>
|
|
${translateText("leaderboard.gold")}
|
|
</div>
|
|
<div
|
|
class="p-1.5 md:p-2.5 text-center border-b border-slate-500"
|
|
>
|
|
${translateText("leaderboard.maxtroops")}
|
|
</div>
|
|
`}
|
|
</div>
|
|
|
|
<!-- Data rows -->
|
|
${this.teams.map((team) =>
|
|
this.showUnits
|
|
? html`
|
|
<div
|
|
class="contents hover:bg-slate-600/60 text-center cursor-pointer ${team.isMyTeam
|
|
? "font-bold"
|
|
: ""}"
|
|
>
|
|
<div class="py-1.5 border-b border-slate-500">
|
|
${team.teamName}
|
|
</div>
|
|
<div class="py-1.5 border-b border-slate-500">
|
|
${team.totalLaunchers}
|
|
</div>
|
|
<div class="py-1.5 border-b border-slate-500">
|
|
${team.totalSAMs}
|
|
</div>
|
|
<div class="py-1.5 border-b border-slate-500">
|
|
${team.totalWarShips}
|
|
</div>
|
|
<div class="py-1.5 border-b border-slate-500">
|
|
${team.totalCities}
|
|
</div>
|
|
</div>
|
|
`
|
|
: html`
|
|
<div
|
|
class="contents hover:bg-slate-600/60 text-center cursor-pointer ${team.isMyTeam
|
|
? "font-bold"
|
|
: ""}"
|
|
>
|
|
<div class="py-1.5 border-b border-slate-500">
|
|
${team.teamName}
|
|
</div>
|
|
<div class="py-1.5 border-b border-slate-500">
|
|
${team.totalScoreStr}
|
|
</div>
|
|
<div class="py-1.5 border-b border-slate-500">
|
|
${team.totalGold}
|
|
</div>
|
|
<div class="py-1.5 border-b border-slate-500">
|
|
${team.totalMaxTroops}
|
|
</div>
|
|
</div>
|
|
`,
|
|
)}
|
|
</div>
|
|
<button
|
|
class="team-stats-button"
|
|
aria-pressed=${String(this.showUnits)}
|
|
@click=${() => {
|
|
this.showUnits = !this.showUnits;
|
|
this.requestUpdate();
|
|
}}
|
|
>
|
|
${this.showUnits
|
|
? translateText("leaderboard.show_control")
|
|
: translateText("leaderboard.show_units")}
|
|
</button>
|
|
</div>
|
|
`;
|
|
}
|
|
}
|
|
|
|
function formatPercentage(value: number): string {
|
|
const perc = value * 100;
|
|
if (Number.isNaN(perc)) return "0%";
|
|
return perc.toFixed(1) + "%";
|
|
}
|