From b3498976fb9707e6a653cb7dfb36dccfa586266a Mon Sep 17 00:00:00 2001 From: Evan Date: Sun, 9 Feb 2025 13:15:06 -0800 Subject: [PATCH] show game map name in public lobby --- src/client/PublicLobby.ts | 11 ++++++++--- src/core/Schemas.ts | 1 + src/server/GameServer.ts | 2 +- src/server/Server.ts | 1 + 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/client/PublicLobby.ts b/src/client/PublicLobby.ts index 3185b7a7c..57fe25289 100644 --- a/src/client/PublicLobby.ts +++ b/src/client/PublicLobby.ts @@ -20,7 +20,7 @@ export class PublicLobby extends LitElement { this.fetchAndUpdateLobbies(); this.lobbiesInterval = window.setInterval( () => this.fetchAndUpdateLobbies(), - 1000, + 1000 ); } @@ -74,6 +74,11 @@ export class PublicLobby extends LitElement { >
Next Game
+
+
+ ${lobby.gameConfig.gameMap} +
+
${lobby.numClients} @@ -106,7 +111,7 @@ export class PublicLobby extends LitElement { }, bubbles: true, composed: true, - }), + }) ); } else { this.dispatchEvent( @@ -114,7 +119,7 @@ export class PublicLobby extends LitElement { detail: { lobby: this.currLobby }, bubbles: true, composed: true, - }), + }) ); this.currLobby = null; } diff --git a/src/core/Schemas.ts b/src/core/Schemas.ts index c5ad90aca..1c402ccf9 100644 --- a/src/core/Schemas.ts +++ b/src/core/Schemas.ts @@ -85,6 +85,7 @@ export interface Lobby { id: string; msUntilStart?: number; numClients?: number; + gameConfig?: GameConfig; } const GameConfigSchema = z.object({ diff --git a/src/server/GameServer.ts b/src/server/GameServer.ts index 03af445ee..df12a0013 100644 --- a/src/server/GameServer.ts +++ b/src/server/GameServer.ts @@ -47,7 +47,7 @@ export class GameServer { public readonly createdAt: number, public readonly isPublic: boolean, private config: ServerConfig, - private gameConfig: GameConfig, + public gameConfig: GameConfig, ) {} public updateGameConfig(gameConfig: GameConfig): void { diff --git a/src/server/Server.ts b/src/server/Server.ts index 583a5b60e..baa8030fc 100644 --- a/src/server/Server.ts +++ b/src/server/Server.ts @@ -195,6 +195,7 @@ function updateLobbies() { id: g.id, msUntilStart: g.startTime() - Date.now(), numClients: g.numClients(), + gameConfig: g.gameConfig, })) .sort((a, b) => a.msUntilStart - b.msUntilStart), });