alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-08-07 11:09:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add nation count loading for JoinPrivateLobbyModal (Part 2) (#2942)

Browse Source 
## Description:

Use `this.getEffectiveNationCount()` everywhere inside of
`LobbyPlayerView`, instead of `this.nationCount`. So the team player
counts always update properly.

## 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:

FloPinguin
This commit is contained in:
FloPinguin
2026-01-17 15:42:45 +00:00
committed by GitHub
parent 2383e057bc
commit c4a86d643d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/components/LobbyPlayerView.ts
+8 -4
View File
@@ -46,7 +46,9 @@ export class LobbyTeamView extends LitElement {
changedProperties.has("gameMode") || changedProperties.has("gameMode") ||
changedProperties.has("clients") || changedProperties.has("clients") ||
changedProperties.has("teamCount") || changedProperties.has("teamCount") ||
changedProperties.has("nationCount") changedProperties.has("nationCount") ||
changedProperties.has("disableNations") ||
changedProperties.has("isCompactMap")
) { ) {
const teamsList = this.getTeamList(); const teamsList = this.getTeamList();
this.computeTeamPreview(teamsList); this.computeTeamPreview(teamsList);
@@ -237,7 +239,7 @@ export class LobbyTeamView extends LitElement {
private getTeamList(): Team[] { private getTeamList(): Team[] {
if (this.gameMode !== GameMode.Team) return []; if (this.gameMode !== GameMode.Team) return [];
const playerCount = this.clients.length + this.nationCount; const playerCount = this.clients.length + this.getEffectiveNationCount();
const config = this.teamCount; const config = this.teamCount;
if (config === HumansVsNations) { if (config === HumansVsNations) {
@@ -301,7 +303,7 @@ export class LobbyTeamView extends LitElement {
const assignment = assignTeamsLobbyPreview( const assignment = assignTeamsLobbyPreview(
players, players,
teams, teams,
this.nationCount, this.getEffectiveNationCount(),
); );
const buckets = new Map<Team, ClientInfo[]>(); const buckets = new Map<Team, ClientInfo[]>();
for (const t of teams) buckets.set(t, []); for (const t of teams) buckets.set(t, []);
@@ -325,7 +327,9 @@ export class LobbyTeamView extends LitElement {
// Fallback: divide players across teams; guard against 0 and empty lobbies // Fallback: divide players across teams; guard against 0 and empty lobbies
this.teamMaxSize = Math.max( this.teamMaxSize = Math.max(
1, 1,
Math.ceil((this.clients.length + this.nationCount) / teams.length), Math.ceil(
(this.clients.length + this.getEffectiveNationCount()) / teams.length,
),
); );
} }
this.teamPreview = teams.map((t) => ({ this.teamPreview = teams.map((t) => ({