alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-06-21 15:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2933 from FloPinguin/fix-nation-loading

Browse Source 
Fix for v29: Add nation count loading for JoinPrivateLobbyModal; change HvN difficulty
This commit is contained in:
FloPinguin
2026-01-17 15:35:26 +01:00
committed by GitHub
parent c6021ab38e
commit dba04027df
5 changed files with 115 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/HostLobbyModal.ts
+21 -48
View File
@@ -14,7 +14,6 @@ import {
UnitType,
mapCategories,
} from "../core/game/Game";
import { getCompactMapNationCount } from "../core/game/NationCreation";
import { UserSettings } from "../core/game/UserSettings";
import {
ClientInfo,
@@ -28,7 +27,7 @@ import "./components/baseComponents/Modal";
import { BaseModal } from "./components/BaseModal";
import "./components/Difficulties";
import "./components/FluentSlider";
import "./components/LobbyTeamView";
import "./components/LobbyPlayerView";
import "./components/Maps";
import { modalHeader } from "./components/ui/ModalHeader";
import { crazyGamesSDK } from "./CrazyGamesSDK";
@@ -934,33 +933,16 @@ export class HostLobbyModal extends BaseModal {
</div>
<!-- Player List -->
<div class="border-t border-white/10 pt-6">
<div class="flex justify-between items-center mb-4">
<div
class="text-xs font-bold text-white/40 uppercase tracking-widest"
>
${this.clients.length}
${this.clients.length === 1
? translateText("host_modal.player")
: translateText("host_modal.players")}
<span style="margin: 0 8px;">•</span>
${this.getEffectiveNationCount()}
${this.getEffectiveNationCount() === 1
? translateText("host_modal.nation_player")
: translateText("host_modal.nation_players")}
</div>
</div>
<lobby-team-view
class="block rounded-lg border border-white/10 bg-white/5 p-2"
.gameMode=${this.gameMode}
.clients=${this.clients}
.lobbyCreatorClientID=${this.lobbyCreatorClientID}
.teamCount=${this.teamCount}
.nationCount=${this.getEffectiveNationCount()}
.onKickPlayer=${(clientID: string) => this.kickPlayer(clientID)}
></lobby-team-view>
</div>
<lobby-player-view
.gameMode=${this.gameMode}
.clients=${this.clients}
.lobbyCreatorClientID=${this.lobbyCreatorClientID}
.teamCount=${this.teamCount}
.nationCount=${this.nationCount}
.disableNations=${this.disableNations}
.isCompactMap=${this.compactMap}
.onKickPlayer=${(clientID: string) => this.kickPlayer(clientID)}
></lobby-player-view>
</div>
</div>
@@ -1438,31 +1420,22 @@ export class HostLobbyModal extends BaseModal {
}
private async loadNationCount() {
const currentMap = this.selectedMap;
try {
const mapData = this.mapLoader.getMapData(this.selectedMap);
const mapData = this.mapLoader.getMapData(currentMap);
const manifest = await mapData.manifest();
this.nationCount = manifest.nations.length;
// Only update if the map hasn't changed
if (this.selectedMap === currentMap) {
this.nationCount = manifest.nations.length;
}
} catch (error) {
console.warn("Failed to load nation count", error);
this.nationCount = 0;
// Only update if the map hasn't changed
if (this.selectedMap === currentMap) {
this.nationCount = 0;
}
}
}
/**
* Returns the effective nation count for display purposes.
* In HumansVsNations mode, this equals the number of human players.
* For compact maps, only 25% of nations are used.
* Otherwise, it uses the manifest nation count (or 0 if nations are disabled).
*/
private getEffectiveNationCount(): number {
if (this.disableNations) {
return 0;
}
if (this.gameMode === GameMode.Team && this.teamCount === HumansVsNations) {
return this.clients.length;
}
return getCompactMapNationCount(this.nationCount, this.compactMap);
}
}
async function createLobby(creatorClientID: string): Promise<GameInfo> {
src/client/JoinPrivateLobbyModal.ts
+44 -22
View File
@@ -10,13 +10,14 @@ import {
} from "../core/Schemas";
import { generateID } from "../core/Util";
import { getServerConfigFromClient } from "../core/configuration/ConfigLoader";
import { GameMode } from "../core/game/Game";
import { GameMapSize, GameMode } from "../core/game/Game";
import { UserSettings } from "../core/game/UserSettings";
import { getApiBase } from "./Api";
import { JoinLobbyEvent } from "./Main";
import { terrainMapFileLoader } from "./TerrainMapFileLoader";
import { BaseModal } from "./components/BaseModal";
import "./components/Difficulties";
import "./components/LobbyTeamView";
import "./components/LobbyPlayerView";
import { modalHeader } from "./components/ui/ModalHeader";
@customElement("join-private-lobby-modal")
export class JoinPrivateLobbyModal extends BaseModal {
@@ -29,9 +30,11 @@ export class JoinPrivateLobbyModal extends BaseModal {
@state() private lobbyIdVisible: boolean = true;
@state() private copySuccess: boolean = false;
@state() private currentLobbyId: string = "";
@state() private nationCount: number = 0;
private playersInterval: NodeJS.Timeout | null = null;
private userSettings: UserSettings = new UserSettings();
private mapLoader = terrainMapFileLoader;
private leaveLobbyOnClose = true;
@@ -180,26 +183,17 @@ export class JoinPrivateLobbyModal extends BaseModal {
${this.renderGameConfig()}
${this.hasJoined && this.players.length > 0
? html`
<div class="mt-6 border-t border-white/10 pt-6">
<div class="flex justify-between items-center mb-4">
<div
class="text-xs font-bold text-white/40 uppercase tracking-widest"
>
${this.players.length}
${this.players.length === 1
? translateText("private_lobby.player")
: translateText("private_lobby.players")}
</div>
</div>
<lobby-team-view
class="block rounded-lg border border-white/10 bg-white/5 p-2"
.gameMode=${this.gameConfig?.gameMode ?? GameMode.FFA}
.clients=${this.players}
.lobbyCreatorClientID=${this.lobbyCreatorClientID}
.teamCount=${this.gameConfig?.playerTeams ?? 2}
></lobby-team-view>
</div>
<lobby-player-view
class="mt-6"
.gameMode=${this.gameConfig?.gameMode ?? GameMode.FFA}
.clients=${this.players}
.lobbyCreatorClientID=${this.lobbyCreatorClientID}
.teamCount=${this.gameConfig?.playerTeams ?? 2}
.nationCount=${this.nationCount}
.disableNations=${this.gameConfig?.disableNations ?? false}
.isCompactMap=${this.gameConfig?.gameMapSize ===
GameMapSize.Compact}
></lobby-player-view>
`
: ""}
</div>
@@ -387,6 +381,7 @@ export class JoinPrivateLobbyModal extends BaseModal {
this.hasJoined = false;
this.message = "";
this.currentLobbyId = "";
this.nationCount = 0;
this.leaveLobbyOnClose = true;
}
@@ -612,11 +607,38 @@ export class JoinPrivateLobbyModal extends BaseModal {
this.lobbyCreatorClientID = data.clients?.[0]?.clientID ?? null;
this.players = data.clients ?? [];
if (data.gameConfig) {
const mapChanged =
this.gameConfig?.gameMap !== data.gameConfig.gameMap;
this.gameConfig = data.gameConfig;
if (mapChanged) {
this.loadNationCount();
}
}
})
.catch((error) => {
console.error("Error polling players:", error);
});
}
private async loadNationCount() {
if (!this.gameConfig) {
this.nationCount = 0;
return;
}
const currentMap = this.gameConfig.gameMap;
try {
const mapData = this.mapLoader.getMapData(currentMap);
const manifest = await mapData.manifest();
// Only update if the map hasn't changed
if (this.gameConfig?.gameMap === currentMap) {
this.nationCount = manifest.nations.length;
}
} catch (error) {
console.warn("Failed to load nation count", error);
// Only update if the map hasn't changed
if (this.gameConfig?.gameMap === currentMap) {
this.nationCount = 0;
}
}
}
}
src/client/components/LobbyTeamView.ts → src/client/components/LobbyPlayerView.ts
+49 -8
View File
@@ -13,6 +13,7 @@ import {
Team,
Trios,
} from "../../core/game/Game";
import { getCompactMapNationCount } from "../../core/game/NationCreation";
import { assignTeamsLobbyPreview } from "../../core/game/TeamAssignment";
import { ClientInfo, TeamCountConfig } from "../../core/Schemas";
import { translateText } from "../Utils";
@@ -22,7 +23,7 @@ export interface TeamPreviewData {
players: ClientInfo[];
}
@customElement("lobby-team-view")
@customElement("lobby-player-view")
export class LobbyTeamView extends LitElement {
@property({ type: String }) gameMode: GameMode = GameMode.FFA;
@property({ type: Array }) clients: ClientInfo[] = [];
@@ -32,6 +33,8 @@ export class LobbyTeamView extends LitElement {
@property({ attribute: "team-count" }) teamCount: TeamCountConfig = 2;
@property({ type: Function }) onKickPlayer?: (clientID: string) => void;
@property({ type: Number }) nationCount: number = 0;
@property({ type: Boolean }) disableNations: boolean = false;
@property({ type: Boolean }) isCompactMap: boolean = false;
private theme: PastelTheme = new PastelTheme();
@state() private showTeamColors: boolean = false;
@@ -52,11 +55,32 @@ export class LobbyTeamView extends LitElement {
}
render() {
return html`<div class="players-list">
${this.gameMode === GameMode.Team
? this.renderTeamMode()
: this.renderFreeForAll()}
</div>`;
return html`
<div class="border-t border-white/10 pt-6">
<div class="flex justify-between items-center mb-4">
<div
class="text-xs font-bold text-white/40 uppercase tracking-widest"
>
${this.clients.length}
${this.clients.length === 1
? translateText("host_modal.player")
: translateText("host_modal.players")}
<span style="margin: 0 8px;">•</span>
${this.getEffectiveNationCount()}
${this.getEffectiveNationCount() === 1
? translateText("host_modal.nation_player")
: translateText("host_modal.nation_players")}
</div>
</div>
<div
class="players-list block rounded-lg border border-white/10 bg-white/5 p-2"
>
${this.gameMode === GameMode.Team
? this.renderTeamMode()
: this.renderFreeForAll()}
</div>
</div>
`;
}
createRenderRoot() {
@@ -148,14 +172,15 @@ export class LobbyTeamView extends LitElement {
}
private renderTeamCard(preview: TeamPreviewData, isEmpty: boolean = false) {
const effectiveNationCount = this.getEffectiveNationCount();
const displayCount =
preview.team === ColoredTeams.Nations
? this.nationCount
? effectiveNationCount
: preview.players.length;
const maxTeamSize =
preview.team === ColoredTeams.Nations
? this.nationCount
? effectiveNationCount
: this.teamMaxSize;
return html`
@@ -308,4 +333,20 @@ export class LobbyTeamView extends LitElement {
players: buckets.get(t) ?? [],
}));
}
/**
* Returns the effective nation count for display purposes.
* In HumansVsNations mode, this equals the number of human players.
* For compact maps, only 25% of nations are used.
* Otherwise, it uses the manifest nation count (or 0 if nations are disabled).
*/
private getEffectiveNationCount(): number {
if (this.disableNations) {
return 0;
}
if (this.gameMode === GameMode.Team && this.teamCount === HumansVsNations) {
return this.clients.length;
}
return getCompactMapNationCount(this.nationCount, this.isCompactMap);
}
}
src/client/styles.css
-1
View File
@@ -546,7 +546,6 @@ label.option-card:hover {
flex-wrap: wrap;
gap: 8px;
justify-content: center;
padding: 0 16px;
}
/* News Button Notification */
src/server/MapPlaylist.ts
+1 -3
View File
@@ -127,9 +127,7 @@ export class MapPlaylist {
publicGameModifiers: { isCompact, isRandomSpawn, startingGold },
startingGold,
difficulty:
playerTeams === HumansVsNations
? Difficulty.Impossible
: Difficulty.Easy,
playerTeams === HumansVsNations ? Difficulty.Hard : Difficulty.Easy,
infiniteGold: false,
infiniteTroops: false,
maxTimerValue: undefined,