();
for (const t of teams) buckets.set(t, []);
@@ -339,9 +333,7 @@ export class LobbyTeamView extends LitElement {
// Fallback: divide players across teams; guard against 0 and empty lobbies
this.teamMaxSize = Math.max(
1,
- Math.ceil(
- (this.clients.length + this.getEffectiveNationCount()) / teams.length,
- ),
+ Math.ceil((this.clients.length + this.nationCount) / teams.length),
);
}
this.teamPreview = teams.map((t) => ({
@@ -350,22 +342,6 @@ export class LobbyTeamView extends LitElement {
}));
}
- /**
- * 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);
- }
-
private displayUsername(client: ClientInfo): string {
if (!this.userSettings.anonymousNames()) {
return client.username;
diff --git a/src/client/components/map/MapPicker.ts b/src/client/components/map/MapPicker.ts
index a8e752ec6..7661cc0d5 100644
--- a/src/client/components/map/MapPicker.ts
+++ b/src/client/components/map/MapPicker.ts
@@ -93,7 +93,7 @@ export class MapPicker extends LitElement {
private renderFeaturedMaps() {
let featuredMapList = featuredMaps;
- if (!featuredMapList.includes(this.selectedMap)) {
+ if (!this.useRandomMap && !featuredMapList.includes(this.selectedMap)) {
featuredMapList = [this.selectedMap, ...featuredMaps];
}
return html`
diff --git a/src/client/utilities/GameConfigHelpers.ts b/src/client/utilities/GameConfigHelpers.ts
index a149dee88..805581acf 100644
--- a/src/client/utilities/GameConfigHelpers.ts
+++ b/src/client/utilities/GameConfigHelpers.ts
@@ -1,4 +1,31 @@
import { GameMapType, UnitType } from "../../core/game/Game";
+import { GameConfig } from "../../core/Schemas";
+
+/**
+ * Maps a slider value (0-400) to the nations config value.
+ * 0 → "disabled", value === defaultNationCount → "default", otherwise → number.
+ */
+export function sliderToNationsConfig(
+ sliderValue: number,
+ defaultNationCount: number,
+): GameConfig["nations"] {
+ if (sliderValue === 0) return "disabled";
+ if (sliderValue === defaultNationCount) return "default";
+ return sliderValue;
+}
+
+/**
+ * Maps a nations config value to a slider-friendly number.
+ * "disabled" → 0, "default" → defaultNationCount, number → number.
+ */
+export function nationsConfigToSlider(
+ nations: GameConfig["nations"],
+ defaultNationCount: number,
+): number {
+ if (nations === "disabled") return 0;
+ if (nations === "default") return defaultNationCount;
+ return nations;
+}
export function toOptionalNumber(
value: number | string | undefined,
@@ -76,6 +103,26 @@ export function getBotsForCompactMap(
return bots;
}
+export function getNationsForCompactMap(
+ nations: number,
+ defaultNationCount: number,
+ compactMapEnabled: boolean,
+): number {
+ const compactCount = Math.max(0, Math.floor(defaultNationCount * 0.25));
+ if (compactMapEnabled) {
+ // Only reduce if at the full default
+ if (nations === defaultNationCount) {
+ return compactCount;
+ }
+ return nations;
+ }
+ // Restoring from compact: if at the compact default, go back to full default
+ if (nations === compactCount) {
+ return defaultNationCount;
+ }
+ return nations;
+}
+
export function getRandomMapType(): GameMapType {
const maps = Object.values(GameMapType);
const randIdx = Math.floor(Math.random() * maps.length);
diff --git a/src/core/Schemas.ts b/src/core/Schemas.ts
index 428531562..067e83069 100644
--- a/src/core/Schemas.ts
+++ b/src/core/Schemas.ts
@@ -219,7 +219,12 @@ export const GameConfigSchema = z.object({
startingGold: z.number().int().min(0).optional(),
})
.optional(),
- disableNations: z.boolean(),
+ nations: z
+ .number()
+ .int()
+ .min(1)
+ .max(400)
+ .or(z.enum(["default", "disabled"])),
bots: z.number().int().min(0).max(400),
infiniteGold: z.boolean(),
infiniteTroops: z.boolean(),
diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts
index f47d5e793..2195371a3 100644
--- a/src/core/configuration/DefaultConfig.ts
+++ b/src/core/configuration/DefaultConfig.ts
@@ -224,7 +224,7 @@ export class DefaultConfig implements Config {
}
spawnNations(): boolean {
- return !this._gameConfig.disableNations;
+ return this._gameConfig.nations !== "disabled";
}
isUnitDisabled(unitType: UnitType): boolean {
diff --git a/src/core/game/NationCreation.ts b/src/core/game/NationCreation.ts
index b2bdc0b70..65a1135b4 100644
--- a/src/core/game/NationCreation.ts
+++ b/src/core/game/NationCreation.ts
@@ -13,9 +13,14 @@ import {
import { Nation as ManifestNation } from "./TerrainMapLoader";
/**
- * Creates the nations array for a game, handling HumansVsNations mode specially.
- * In HumansVsNations mode, the number of nations matches the number of human players to ensure fair gameplay.
- * For compact maps, only 25% of the nations are used.
+ * Creates the nations array for a game.
+ * If config.nations is a number (custom count), uses that exact count,
+ * generating additional nations with random names if needed.
+ * If config.nations is "disabled", returns no nations.
+ * If config.nations is "default":
+ * - Public HumansVsNations: matches nation count to human player count
+ * - Public compact maps: uses 25% of manifest nations
+ * - Otherwise: uses all manifest nations
*/
export function createNationsForGame(
gameStart: GameStartInfo,
@@ -23,10 +28,6 @@ export function createNationsForGame(
numHumans: number,
random: PseudoRandom,
): Nation[] {
- if (gameStart.config.disableNations) {
- return [];
- }
-
const toNation = (n: ManifestNation): Nation =>
new Nation(
new Cell(n.coordinates[0], n.coordinates[1]),
@@ -39,38 +40,59 @@ export function createNationsForGame(
gameStart.config.gameMode === GameMode.Team &&
gameStart.config.playerTeams === HumansVsNations;
- // For compact maps, use only 25% of nations (minimum 1)
- let effectiveNations = manifestNations;
- if (isCompactMap && !isHumansVsNations) {
- const targetCount = getCompactMapNationCount(manifestNations.length, true);
- const shuffled = random.shuffleArray(manifestNations);
- effectiveNations = shuffled.slice(0, targetCount);
- }
-
- // For non-HumansVsNations modes, simply use the effective nations
- if (!isHumansVsNations) {
- return effectiveNations.map(toNation);
- }
-
- // HumansVsNations mode: balance nation count to match human count
- const isSingleplayer = gameStart.config.gameType === GameType.Singleplayer;
- const targetNationCount = isSingleplayer ? 1 : numHumans;
-
- if (targetNationCount === 0) {
+ const configNations = gameStart.config.nations;
+ if (configNations === "disabled") {
return [];
}
-
- // If we have enough manifest nations, use a subset
- if (manifestNations.length >= targetNationCount) {
- // Shuffle manifest nations to add variety
- const shuffled = random.shuffleArray(manifestNations);
- return shuffled.slice(0, targetNationCount).map(toNation);
+ // If nations count is explicitly set, use that exact count
+ if (typeof configNations === "number") {
+ return createRandomNations(
+ configNations,
+ manifestNations,
+ toNation,
+ random,
+ );
}
- // If we need more nations than defined in manifest, create additional ones
- const nations: Nation[] = manifestNations.map(toNation);
+ if (gameStart.config.gameType === GameType.Public) {
+ // For HvN, balance nation count to match human count
+ if (isHumansVsNations) {
+ return createRandomNations(numHumans, manifestNations, toNation, random);
+ }
+
+ // For compact maps, use only 25% of nations (minimum 1)
+ if (isCompactMap) {
+ const targetCount = getCompactMapNationCount(
+ manifestNations.length,
+ true,
+ );
+ const shuffled = random.shuffleArray(manifestNations);
+ const slicedNations = shuffled.slice(0, targetCount);
+ return slicedNations.map(toNation);
+ }
+ }
+
+ return manifestNations.map(toNation);
+}
+
+/**
+ * Creates the requested number of nations from manifest data.
+ * If more nations are needed than available in the manifest, generates additional ones with random names.
+ */
+function createRandomNations(
+ targetCount: number,
+ manifestNations: ManifestNation[],
+ toNation: (n: ManifestNation) => Nation,
+ random: PseudoRandom,
+): Nation[] {
+ const shuffled = random.shuffleArray(manifestNations);
+ if (targetCount <= manifestNations.length) {
+ return shuffled.slice(0, targetCount).map(toNation);
+ }
+ // Need more nations than defined in manifest, create additional ones
+ const nations: Nation[] = shuffled.map(toNation);
const usedNames = new Set(nations.map((n) => n.playerInfo.name));
- const additionalCount = targetNationCount - manifestNations.length;
+ const additionalCount = targetCount - manifestNations.length;
for (let i = 0; i < additionalCount; i++) {
const name = generateUniqueNationName(random, usedNames);
usedNames.add(name);
@@ -81,7 +103,6 @@ export function createNationsForGame(
),
);
}
-
return nations;
}
diff --git a/src/server/GameManager.ts b/src/server/GameManager.ts
index c512896ee..bd7d2efc8 100644
--- a/src/server/GameManager.ts
+++ b/src/server/GameManager.ts
@@ -72,7 +72,7 @@ export class GameManager {
gameType: GameType.Private,
gameMapSize: GameMapSize.Normal,
difficulty: Difficulty.Medium,
- disableNations: false,
+ nations: "default",
infiniteGold: false,
infiniteTroops: false,
maxTimerValue: undefined,
diff --git a/src/server/GamePreviewBuilder.ts b/src/server/GamePreviewBuilder.ts
index ea9916025..93e8c0d29 100644
--- a/src/server/GamePreviewBuilder.ts
+++ b/src/server/GamePreviewBuilder.ts
@@ -240,7 +240,7 @@ export function buildPreview(
if (gc?.infiniteTroops) gameOptions.push("Infinite Troops");
if (gc?.instantBuild) gameOptions.push("Instant Build");
if (gc?.randomSpawn) gameOptions.push("Random Spawn");
- if (gc?.disableNations) gameOptions.push("Nations Disabled");
+ if (gc?.nations === "disabled") gameOptions.push("Nations Disabled");
if (gc?.donateTroops) gameOptions.push("Troop Donations Enabled");
if (gameOptions.length > 0) {
diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts
index bb55c02c5..48cf120ef 100644
--- a/src/server/GameServer.ts
+++ b/src/server/GameServer.ts
@@ -112,8 +112,8 @@ export class GameServer {
if (gameConfig.difficulty !== undefined) {
this.gameConfig.difficulty = gameConfig.difficulty;
}
- if (gameConfig.disableNations !== undefined) {
- this.gameConfig.disableNations = gameConfig.disableNations;
+ if (gameConfig.nations !== undefined) {
+ this.gameConfig.nations = gameConfig.nations;
}
if (gameConfig.bots !== undefined) {
this.gameConfig.bots = gameConfig.bots;
diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts
index 0af79ce38..0984367f8 100644
--- a/src/server/MapPlaylist.ts
+++ b/src/server/MapPlaylist.ts
@@ -199,7 +199,10 @@ export class MapPlaylist {
maxTimerValue: undefined,
instantBuild: false,
randomSpawn: isRandomSpawn,
- disableNations: mode === GameMode.Team && playerTeams !== HumansVsNations,
+ nations:
+ mode === GameMode.Team && playerTeams !== HumansVsNations
+ ? "disabled"
+ : "default",
gameMode: mode,
playerTeams,
bots: isCompact ? 100 : 400,
@@ -292,10 +295,12 @@ export class MapPlaylist {
(await this.lobbyMaxPlayers(map, mode, playerTeams, isCompact)),
);
- const disableNations =
+ const nations: GameConfig["nations"] =
(mode === GameMode.Team && playerTeams !== HumansVsNations) ||
// Nations don't have PVP immunity, so 25M starting gold wouldn't work well with them
- (startingGold !== undefined && startingGold >= 25_000_000);
+ (startingGold !== undefined && startingGold >= 25_000_000)
+ ? "disabled"
+ : "default";
return {
donateGold: mode === GameMode.Team,
@@ -318,7 +323,7 @@ export class MapPlaylist {
maxTimerValue: undefined,
instantBuild: false,
randomSpawn: isRandomSpawn,
- disableNations,
+ nations,
gameMode: mode,
playerTeams,
bots: isCompact ? 100 : 400,
@@ -353,7 +358,7 @@ export class MapPlaylist {
maxTimerValue: isCompact ? 10 : 15,
instantBuild: false,
randomSpawn: false,
- disableNations: true,
+ nations: "disabled",
gameMode: GameMode.FFA,
bots: isCompact ? 100 : 400,
spawnImmunityDuration: 30 * 10,
diff --git a/tests/GameInfoRanking.test.ts b/tests/GameInfoRanking.test.ts
index 1eeefebb9..37abb76a3 100644
--- a/tests/GameInfoRanking.test.ts
+++ b/tests/GameInfoRanking.test.ts
@@ -9,7 +9,7 @@ import {
GameMode,
GameType,
} from "../src/core/game/Game";
-import { AnalyticsRecord } from "../src/core/Schemas";
+import { AnalyticsRecord, GameConfig } from "../src/core/Schemas";
import {
GOLD_INDEX_STEAL,
GOLD_INDEX_TRADE,
@@ -19,7 +19,7 @@ import {
} from "../src/core/StatsSchemas";
describe("Ranking class", () => {
- const mockConfig = {
+ const mockConfig: GameConfig = {
gameMap: GameMapType.Montreal,
difficulty: Difficulty.Medium,
donateGold: false,
@@ -27,7 +27,7 @@ describe("Ranking class", () => {
gameType: GameType.Public,
gameMode: GameMode.FFA,
gameMapSize: GameMapSize.Normal,
- disableNations: true,
+ nations: "disabled",
bots: 0,
infiniteGold: false,
infiniteTroops: false,
diff --git a/tests/TranslationSystem.test.ts b/tests/TranslationSystem.test.ts
index 9bffa5e0a..a70e13404 100644
--- a/tests/TranslationSystem.test.ts
+++ b/tests/TranslationSystem.test.ts
@@ -234,7 +234,7 @@ function extractDataI18nKeys(content: string): Set {
function extractTranslationKeyLikeAttrs(content: string): Set {
const keys = new Set();
const keyLikeAttrRegex =
- /\b(?:translationKey|labelKey|disabledKey|titleKey|ariaLabelKey|placeholderKey)\s*=\s*["']([^"']+)["']/g;
+ /\b(?:translationKey|labelKey|defaultLabelKey|disabledKey|titleKey|ariaLabelKey|placeholderKey)\s*=\s*["']([^"']+)["']/g;
let match: RegExpExecArray | null;
while ((match = keyLikeAttrRegex.exec(content)) !== null) {
keys.add(match[1]);
diff --git a/tests/core/pathfinding/_fixtures.ts b/tests/core/pathfinding/_fixtures.ts
index 3e444744f..c372dfdae 100644
--- a/tests/core/pathfinding/_fixtures.ts
+++ b/tests/core/pathfinding/_fixtures.ts
@@ -11,6 +11,7 @@ import {
import { createGame as createGameImpl } from "../../../src/core/game/GameImpl";
import { GameMapImpl } from "../../../src/core/game/GameMap";
import { UserSettings } from "../../../src/core/game/UserSettings";
+import { GameConfig } from "../../../src/core/Schemas";
import { TestConfig } from "../../util/TestConfig";
import { TestServerConfig } from "../../util/TestServerConfig";
@@ -131,13 +132,13 @@ export function createGame(data: TestMapData): Game {
);
const serverConfig = new TestServerConfig();
- const gameConfig = {
+ const gameConfig: GameConfig = {
gameMap: GameMapType.Asia,
gameMapSize: GameMapSize.Normal,
gameMode: GameMode.FFA,
gameType: GameType.Singleplayer,
difficulty: Difficulty.Medium,
- disableNations: false,
+ nations: "default",
donateGold: false,
donateTroops: false,
bots: 0,
diff --git a/tests/pathfinding/utils.ts b/tests/pathfinding/utils.ts
index 46b7fd38f..8fb17c1d2 100644
--- a/tests/pathfinding/utils.ts
+++ b/tests/pathfinding/utils.ts
@@ -263,7 +263,7 @@ export async function setupFromPath(
gameMode: GameMode.FFA,
gameType: GameType.Singleplayer,
difficulty: Difficulty.Medium,
- disableNations: false,
+ nations: "default",
donateGold: false,
donateTroops: false,
bots: 0,
diff --git a/tests/util/Setup.ts b/tests/util/Setup.ts
index e9b2722ee..95f5182bb 100644
--- a/tests/util/Setup.ts
+++ b/tests/util/Setup.ts
@@ -61,7 +61,7 @@ export async function setup(
gameMode: GameMode.FFA,
gameType: GameType.Singleplayer,
difficulty: Difficulty.Medium,
- disableNations: false,
+ nations: "default",
donateGold: false,
donateTroops: false,
bots: 0,