Merge branch 'v29'

src/client/SinglePlayerModal.ts

@@ -11,7 +11,6 @@ import {
   HumansVsNations,
   UnitType,
 } from "../core/game/Game";
-import { UserSettings } from "../core/game/UserSettings";
 import { TeamCountConfig } from "../core/Schemas";
 import { generateID } from "../core/Util";
 import { hasLinkedAccount } from "./Api";
@@ -21,9 +20,8 @@ import { BaseModal } from "./components/BaseModal";
 import "./components/GameConfigSettings";
 import "./components/ToggleInputCard";
 import { modalHeader } from "./components/ui/ModalHeader";
-import { fetchCosmetics } from "./Cosmetics";
+import { getPlayerCosmetics } from "./Cosmetics";
 import { crazyGamesSDK } from "./CrazyGamesSDK";
-import { FlagInput } from "./FlagInput";
 import { JoinLobbyEvent } from "./Main";
 import { UsernameInput } from "./UsernameInput";
 import {
@@ -90,8 +88,6 @@ export class SinglePlayerModal extends BaseModal {
     ...DEFAULT_OPTIONS.disabledUnits,
   ];
 
-  private userSettings: UserSettings = new UserSettings();
-
   connectedCallback() {
     super.connectedCallback();
     document.addEventListener(
@@ -624,18 +620,6 @@ export class SinglePlayerModal extends BaseModal {
       console.warn("Username input element not found");
     }
 
-    const flagInput = document.querySelector("flag-input") as FlagInput;
-    if (!flagInput) {
-      console.warn("Flag input element not found");
-    }
-    const cosmetics = await fetchCosmetics();
-    let selectedPattern = this.userSettings.getSelectedPatternName(cosmetics);
-    selectedPattern ??= cosmetics
-      ? (this.userSettings.getDevOnlyPattern() ?? null)
-      : null;
-
-    const selectedColor = this.userSettings.getSelectedColor();
-
     await crazyGamesSDK.requestMidgameAd();
 
     this.dispatchEvent(
@@ -648,14 +632,7 @@ export class SinglePlayerModal extends BaseModal {
               {
                 clientID,
                 username: usernameInput.getCurrentUsername(),
-                cosmetics: {
-                  flag:
-                    flagInput.getCurrentFlag() === "xx"
-                      ? ""
-                      : flagInput.getCurrentFlag(),
-                  pattern: selectedPattern ?? undefined,
-                  color: selectedColor ? { color: selectedColor } : undefined,
-                },
+                cosmetics: await getPlayerCosmetics(),
               },
             ],
             config: {