Skip to content

Add lobby info display to the join private lobby modal #2211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Add lobby info display to the join private lobby modal #2211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f4b5da
add lobby info to join private lobby
DanielF737 Oct 15, 2025
781edcd
fix translation of template string
DanielF737 Oct 15, 2025
904662d
fix issues with checkbox state double handling
DanielF737 Oct 16, 2025
4e07166
dont override the native id
DanielF737 Oct 16, 2025
947311c
fix merge
DanielF737 Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion resources/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,33 @@
"not_found": "Lobby not found. Please check the ID and try again.",
"error": "An error occurred. Please try again or contact support.",
"joined_waiting": "Joined successfully! Waiting for game to start...",
"version_mismatch": "This game was created with a different version. Cannot join."
"version_mismatch": "This game was created with a different version. Cannot join.",
"game_settings": "Game Settings",
"map": "Map",
"map_size": "Map Size",
"difficulty": "Difficulty: ",
"bots": "Bots",
"game_mode": "Game Mode",
"teams": "Teams",
"modifiers": "Game Modifiers",
"disabled_units": "Disabled Units",
"npcs_disabled": "NPCs Disabled",
"infinite_gold": "Infinite Gold",
"infinite_troops": "Infinite Troops",
"instant_build": "Instant Build",
"donate_gold": "Gold Donations",
"donate_troops": "Troop Donations",
"enabled": "Enabled",
"disabled": "Disabled",
"normal": "Normal",
"compact": "Compact",
"easy": "Easy",
"medium": "Medium",
"hard": "Hard",
"ffa": "Free For All",
"team_mode": "Team",
"none": "None",
"enabled_settings": "Enabled Settings"
},
"public_lobby": {
"join": "Join next Game",
Expand Down
216 changes: 64 additions & 152 deletions src/client/HostLobbyModal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
GameMapSize,
GameMapType,
GameMode,
GameType,
Quads,
Trios,
UnitType,
Expand All @@ -24,9 +25,9 @@ import {
import { generateID } from "../core/Util";
import "./components/baseComponents/Modal";
import "./components/Difficulties";
import "./components/GameOptionsDisplay";
import "./components/Maps";
import { JoinLobbyEvent } from "./Main";
import { renderUnitTypeOptions } from "./utilities/RenderUnitTypeOptions";

@customElement("host-lobby-modal")
export class HostLobbyModal extends LitElement {
Expand Down Expand Up @@ -311,155 +312,14 @@ export class HostLobbyModal extends LitElement {
${translateText("host_modal.options_title")}
</div>
<div class="option-cards">
<label for="bots-count" class="option-card">
<input
type="range"
id="bots-count"
min="0"
max="400"
step="1"
@input=${this.handleBotsChange}
@change=${this.handleBotsChange}
.value="${String(this.bots)}"
/>
<div class="option-card-title">
<span>${translateText("host_modal.bots")}</span>${
this.bots === 0
? translateText("host_modal.bots_disabled")
: this.bots
}
</div>
</label>

<label
for="disable-npcs"
class="option-card ${this.disableNPCs ? "selected" : ""}"
>
<div class="checkbox-icon"></div>
<input
type="checkbox"
id="disable-npcs"
@change=${this.handleDisableNPCsChange}
.checked=${this.disableNPCs}
/>
<div class="option-card-title">
${translateText("host_modal.disable_nations")}
</div>
</label>

<label
for="instant-build"
class="option-card ${this.instantBuild ? "selected" : ""}"
>
<div class="checkbox-icon"></div>
<input
type="checkbox"
id="instant-build"
@change=${this.handleInstantBuildChange}
.checked=${this.instantBuild}
/>
<div class="option-card-title">
${translateText("host_modal.instant_build")}
</div>
</label>

<label
for="donate-gold"
class="option-card ${this.donateGold ? "selected" : ""}"
>
<div class="checkbox-icon"></div>
<input
type="checkbox"
id="donate-gold"
@change=${this.handleDonateGoldChange}
.checked=${this.donateGold}
/>
<div class="option-card-title">
${translateText("host_modal.donate_gold")}
</div>
</label>

<label
for="donate-troops"
class="option-card ${this.donateTroops ? "selected" : ""}"
>
<div class="checkbox-icon"></div>
<input
type="checkbox"
id="donate-troops"
@change=${this.handleDonateTroopsChange}
.checked=${this.donateTroops}
/>
<div class="option-card-title">
${translateText("host_modal.donate_troops")}
</div>
</label>

<label
for="infinite-gold"
class="option-card ${this.infiniteGold ? "selected" : ""}"
>
<div class="checkbox-icon"></div>
<input
type="checkbox"
id="infinite-gold"
@change=${this.handleInfiniteGoldChange}
.checked=${this.infiniteGold}
/>
<div class="option-card-title">
${translateText("host_modal.infinite_gold")}
</div>
</label>

<label
for="infinite-troops"
class="option-card ${this.infiniteTroops ? "selected" : ""}"
>
<div class="checkbox-icon"></div>
<input
type="checkbox"
id="infinite-troops"
@change=${this.handleInfiniteTroopsChange}
.checked=${this.infiniteTroops}
/>
<div class="option-card-title">
${translateText("host_modal.infinite_troops")}
</div>
</label>
<label
for="host-modal-compact-map"
class="option-card ${this.compactMap ? "selected" : ""}"
>
<div class="checkbox-icon"></div>
<input
type="checkbox"
id="host-modal-compact-map"
@change=${this.handleCompactMapChange}
.checked=${this.compactMap}
/>
<div class="option-card-title">
${translateText("host_modal.compact_map")}
</div>
</label>

<hr style="width: 100%; border-top: 1px solid #444; margin: 16px 0;" />

<!-- Individual disables for structures/weapons -->
<div
style="margin: 8px 0 12px 0; font-weight: bold; color: #ccc; text-align: center;"
>
${translateText("host_modal.enables_title")}
</div>
<div
style="display: flex; flex-wrap: wrap; justify-content: center; gap: 12px;"
>
${renderUnitTypeOptions({
disabledUnits: this.disabledUnits,
toggleUnit: this.toggleUnit.bind(this),
})}
</div>
</div>
</div>
<game-options-display
.gameConfig=${this.getCurrentGameConfig()}
.editable=${true}
.bots=${this.bots}
.onBotsChange=${this.handleBotsChange.bind(this)}
.onOptionChange=${this.handleOptionChange.bind(this)}
.onUnitToggle=${this.toggleUnit.bind(this)}
></game-options-display>
</div>
</div>

Expand Down Expand Up @@ -579,8 +439,7 @@ export class HostLobbyModal extends LitElement {
}

// Modified to include debouncing
private handleBotsChange(e: Event) {
const value = parseInt((e.target as HTMLInputElement).value);
private handleBotsChange(value: number) {
if (isNaN(value) || value < 0 || value > 400) {
return;
}
Expand Down Expand Up @@ -636,6 +495,59 @@ export class HostLobbyModal extends LitElement {
this.putGameConfig();
}

/**
* Gets the current game configuration for the options display component
*/
private getCurrentGameConfig(): GameConfig {
return {
gameMap: this.selectedMap,
gameMapSize: this.compactMap ? GameMapSize.Compact : GameMapSize.Normal,
difficulty: this.selectedDifficulty,
disableNPCs: this.disableNPCs,
bots: this.bots,
infiniteGold: this.infiniteGold,
donateGold: this.donateGold,
infiniteTroops: this.infiniteTroops,
donateTroops: this.donateTroops,
instantBuild: this.instantBuild,
gameMode: this.gameMode,
gameType:
this.gameMode === GameMode.FFA ? GameType.Private : GameType.Private,
disabledUnits: this.disabledUnits,
playerTeams: this.teamCount,
} as GameConfig;
}

/**
* Unified handler for option changes from the shared component
*/
private handleOptionChange(key: string, value: boolean) {
switch (key) {
case "disableNPCs":
this.disableNPCs = value;
break;
case "instantBuild":
this.instantBuild = value;
break;
case "donateGold":
this.donateGold = value;
break;
case "donateTroops":
this.donateTroops = value;
break;
case "infiniteGold":
this.infiniteGold = value;
break;
case "infiniteTroops":
this.infiniteTroops = value;
break;
case "compactMap":
this.compactMap = value;
break;
}
this.putGameConfig();
}

private async handleGameModeSelection(value: GameMode) {
this.gameMode = value;
this.putGameConfig();
Expand Down
Loading