From 76c46b24dd59b169236e9f3ff6c22c8d5a2789b3 Mon Sep 17 00:00:00 2001 From: Restart2008 Date: Sat, 25 Oct 2025 11:30:20 -0700 Subject: [PATCH] feat(ui): add Nuke Wars mode option to single-player modal and GameMode enum; normalize nukeWars settings --- src/client/SinglePlayerModal.ts | 9 +-------- src/core/game/Game.ts | 1 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/client/SinglePlayerModal.ts b/src/client/SinglePlayerModal.ts index 37adf8c54..3a550a72b 100644 --- a/src/client/SinglePlayerModal.ts +++ b/src/client/SinglePlayerModal.ts @@ -48,14 +48,7 @@ export class SinglePlayerModal extends LitElement { @state() private teamCount: TeamCountConfig = 2; @state() private disabledUnits: UnitType[] = []; - -<<<<<<< Updated upstream -======= - private readonly nukeWarsDisabledUnits = [ - UnitType.MIRV, - ]; - ->>>>>>> Stashed changes + private readonly nukeWarsDisabledUnits = [UnitType.MIRV]; private userSettings: UserSettings = new UserSettings(); connectedCallback() { diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts index 21aa78e91..e145d4a02 100644 --- a/src/core/game/Game.ts +++ b/src/core/game/Game.ts @@ -151,6 +151,7 @@ export const isGameType = (value: unknown): value is GameType => export enum GameMode { FFA = "Free For All", Team = "Team", + NukeWars = "Nuke Wars", } export const isGameMode = (value: unknown): value is GameMode => isEnumValue(GameMode, value);