diff --git a/resources/lang/en.json b/resources/lang/en.json index 51157c2e7..7395d4e66 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -215,7 +215,8 @@ "player": "Player", "players": "Players", "waiting": "Waiting for players...", - "start": "Start Game" + "start": "Start Game", + "host_badge": "Host" }, "team_colors": { "red": "Red", diff --git a/src/client/ClientGameRunner.ts b/src/client/ClientGameRunner.ts index 9904822c4..b0c3150d8 100644 --- a/src/client/ClientGameRunner.ts +++ b/src/client/ClientGameRunner.ts @@ -60,12 +60,11 @@ export interface LobbyConfig { } export function joinLobby( + eventBus: EventBus, lobbyConfig: LobbyConfig, onPrestart: () => void, onJoin: () => void, ): () => void { - const eventBus = new EventBus(); - console.log( `joining lobby: gameID: ${lobbyConfig.gameID}, clientID: ${lobbyConfig.clientID}`, ); diff --git a/src/client/HostLobbyModal.ts b/src/client/HostLobbyModal.ts index 0296c29dc..5362311b8 100644 --- a/src/client/HostLobbyModal.ts +++ b/src/client/HostLobbyModal.ts @@ -14,7 +14,12 @@ import { mapCategories, } from "../core/game/Game"; import { UserSettings } from "../core/game/UserSettings"; -import { GameConfig, GameInfo, TeamCountConfig } from "../core/Schemas"; +import { + ClientInfo, + GameConfig, + GameInfo, + TeamCountConfig, +} from "../core/Schemas"; import { generateID } from "../core/Util"; import "./components/baseComponents/Modal"; import "./components/Difficulties"; @@ -40,9 +45,10 @@ export class HostLobbyModal extends LitElement { @state() private instantBuild: boolean = false; @state() private lobbyId = ""; @state() private copySuccess = false; - @state() private players: string[] = []; + @state() private clients: ClientInfo[] = []; @state() private useRandomMap: boolean = false; @state() private disabledUnits: UnitType[] = [UnitType.Factory]; + @state() private lobbyCreatorClientID: string = ""; @state() private lobbyIdVisible: boolean = true; private playersInterval: NodeJS.Timeout | null = null; @@ -395,29 +401,45 @@ export class HostLobbyModal extends LitElement {
- ${this.players.length} + ${this.clients.length} ${ - this.players.length === 1 + this.clients.length === 1 ? translateText("host_modal.player") : translateText("host_modal.players") }
- ${this.players.map( - (player) => html`${player}`, + ${this.clients.map( + (client) => html` + + ${client.username} + ${client.clientID === this.lobbyCreatorClientID + ? html`(${translateText("host_modal.host_badge")})` + : html` + + `} + + `, )} -