Changed PublicGameModifier enum to interface

Author: FloPinguin

src/client/PublicLobby.ts

@@ -6,7 +6,7 @@ import {
   GameMapType,
   GameMode,
   HumansVsNations,
-  PublicGameModifier,
+  PublicGameModifiers,
   Quads,
   Trios,
 } from "../core/game/Game";
@@ -305,19 +305,19 @@ export class PublicLobby extends LitElement {
   }
 
   private getModifierLabels(
-    publicGameModifiers: PublicGameModifier[] | undefined,
+    publicGameModifiers: PublicGameModifiers | undefined,
   ): string[] {
-    if (!publicGameModifiers || publicGameModifiers.length === 0) {
+    if (!publicGameModifiers) {
       return [];
     }
-    return publicGameModifiers.map((modifier) => {
-      // Convert PascalCase to snake_case for localization key
-      const key = modifier
-        .replace(/([A-Z])/g, "_$1")
-        .toLowerCase()
-        .slice(1);
-      return translateText(`public_game_modifier.${key}`);
-    });
+    const labels: string[] = [];
+    if (publicGameModifiers.isRandomSpawn) {
+      labels.push(translateText("public_game_modifier.random_spawn"));
+    }
+    if (publicGameModifiers.isCompact) {
+      labels.push(translateText("public_game_modifier.compact_map"));
+    }
+    return labels;
   }
 
   private lobbyClicked(lobby: GameInfo) {

src/core/Schemas.ts

@@ -15,7 +15,6 @@ import {
   GameMode,
   GameType,
   HumansVsNations,
-  PublicGameModifier,
   Quads,
   Trios,
   UnitType,
@@ -172,7 +171,12 @@ export const GameConfigSchema = z.object({
   gameType: z.enum(GameType),
   gameMode: z.enum(GameMode),
   gameMapSize: z.enum(GameMapSize),
-  publicGameModifiers: z.enum(PublicGameModifier).array().optional(),
+  publicGameModifiers: z
+    .object({
+      isCompact: z.boolean(),
+      isRandomSpawn: z.boolean(),
+    })
+    .optional(),
   disableNations: z.boolean(),
   bots: z.number().int().min(0).max(400),
   infiniteGold: z.boolean(),

src/core/configuration/Config.ts

@@ -7,7 +7,7 @@ import {
   Gold,
   Player,
   PlayerInfo,
-  PublicGameModifier,
+  PublicGameModifiers,
   Team,
   TerraNullius,
   Tick,
@@ -59,7 +59,7 @@ export interface ServerConfig {
   stripePublishableKey(): string;
   allowedFlares(): string[] | undefined;
   enableMatchmaking(): boolean;
-  getRandomPublicGameModifiers(): PublicGameModifier[];
+  getRandomPublicGameModifiers(): PublicGameModifiers;
   supportsCompactMapForTeams(map: GameMapType): boolean;
 }
 

src/core/configuration/DefaultConfig.ts

@@ -12,7 +12,7 @@ import {
   Player,
   PlayerInfo,
   PlayerType,
-  PublicGameModifier,
+  PublicGameModifiers,
   Quads,
   TerrainType,
   TerraNullius,
@@ -224,17 +224,11 @@ export abstract class DefaultServerConfig implements ServerConfig {
     return false;
   }
 
-  getRandomPublicGameModifiers(): PublicGameModifier[] {
-    const modifiers: PublicGameModifier[] = [];
-    if (Math.random() < 0.1) {
-      // 10% chance
-      modifiers.push(PublicGameModifier.RandomSpawn);
-    }
-    if (Math.random() < 0.05) {
-      // 5% chance
-      modifiers.push(PublicGameModifier.CompactMap);
-    }
-    return modifiers;
+  getRandomPublicGameModifiers(): PublicGameModifiers {
+    return {
+      isRandomSpawn: Math.random() < 0.1, // 10% chance
+      isCompact: Math.random() < 0.05, // 5% chance
+    };
   }
 
   supportsCompactMapForTeams(map: GameMapType): boolean {

src/core/game/Game.ts

@@ -186,9 +186,9 @@ export enum GameMapSize {
   Normal = "Normal",
 }
 
-export enum PublicGameModifier {
-  RandomSpawn = "RandomSpawn",
-  CompactMap = "CompactMap",
+export interface PublicGameModifiers {
+  isCompact: boolean;
+  isRandomSpawn: boolean;
 }
 
 export interface UnitInfo {

src/server/MapPlaylist.ts

@@ -8,7 +8,6 @@ import {
   GameMode,
   GameType,
   HumansVsNations,
-  PublicGameModifier,
   Quads,
   Trios,
 } from "../core/game/Game";
@@ -93,41 +92,31 @@ export class MapPlaylist {
     const playerTeams =
       mode === GameMode.Team ? this.getTeamCount() : undefined;
 
-    let publicGameModifiers = config.getRandomPublicGameModifiers();
+    let { isCompact, isRandomSpawn } = config.getRandomPublicGameModifiers();
 
     // Duos, Trios, and Quads should not get random spawn (as it defeats the purpose)
-    const disallowRandomSpawn =
-      playerTeams === Duos || playerTeams === Trios || playerTeams === Quads;
-    if (disallowRandomSpawn) {
-      publicGameModifiers = publicGameModifiers.filter(
-        (m) => m !== PublicGameModifier.RandomSpawn,
-      );
+    if (
+      playerTeams === Duos ||
+      playerTeams === Trios ||
+      playerTeams === Quads
+    ) {
+      isRandomSpawn = false;
     }
 
     // Small maps (3rd player count < 50) don't get compact map in team games
     if (mode === GameMode.Team && !config.supportsCompactMapForTeams(map)) {
-      publicGameModifiers = publicGameModifiers.filter(
-        (m) => m !== PublicGameModifier.CompactMap,
-      );
+      isCompact = false;
     }
 
-    const isCompactMap = publicGameModifiers.includes(
-      PublicGameModifier.CompactMap,
-    );
-    const isRandomSpawn = publicGameModifiers.includes(
-      PublicGameModifier.RandomSpawn,
-    );
-
     // Create the default public game config (from your GameManager)
     return {
       donateGold: mode === GameMode.Team,
       donateTroops: mode === GameMode.Team,
       gameMap: map,
-      maxPlayers: config.lobbyMaxPlayers(map, mode, playerTeams, isCompactMap),
+      maxPlayers: config.lobbyMaxPlayers(map, mode, playerTeams, isCompact),
       gameType: GameType.Public,
-      gameMapSize: isCompactMap ? GameMapSize.Compact : GameMapSize.Normal,
-      publicGameModifiers:
-        publicGameModifiers.length > 0 ? publicGameModifiers : undefined,
+      gameMapSize: isCompact ? GameMapSize.Compact : GameMapSize.Normal,
+      publicGameModifiers: { isCompact, isRandomSpawn },
       difficulty:
         playerTeams === HumansVsNations ? Difficulty.Hard : Difficulty.Easy,
       infiniteGold: false,
@@ -138,7 +127,7 @@ export class MapPlaylist {
       disableNations: mode === GameMode.Team && playerTeams !== HumansVsNations,
       gameMode: mode,
       playerTeams,
-      bots: isCompactMap ? 100 : 400,
+      bots: isCompact ? 100 : 400,
       spawnImmunityDuration: 5 * 10,
       disabledUnits: [],
     } satisfies GameConfig;

tests/util/TestServerConfig.ts

@@ -1,6 +1,6 @@
 import { JWK } from "jose";
 import { GameEnv, ServerConfig } from "../../src/core/configuration/Config";
-import { GameMapType, PublicGameModifier } from "../../src/core/game/Game";
+import { GameMapType, PublicGameModifiers } from "../../src/core/game/Game";
 import { GameID } from "../../src/core/Schemas";
 
 export class TestServerConfig implements ServerConfig {
@@ -82,8 +82,8 @@ export class TestServerConfig implements ServerConfig {
   gitCommit(): string {
     throw new Error("Method not implemented.");
   }
-  getRandomPublicGameModifiers(): PublicGameModifier[] {
-    throw new Error("Method not implemented.");
+  getRandomPublicGameModifiers(): PublicGameModifiers {
+    return { isCompact: false, isRandomSpawn: false };
   }
   supportsCompactMapForTeams(map: GameMapType): boolean {
     throw new Error("Method not implemented.");