fix

Author: Aotumuri

src/client/HostLobbyModal.ts

@@ -20,16 +20,14 @@ import {
   ClientInfo,
   GameConfig,
   GameInfo,
+  LobbyPreset,
+  LobbyPresetConfig,
   TeamCountConfig,
 } from "../core/Schemas";
 import { generateID } from "../core/Util";
 import "./components/baseComponents/Modal";
 import "./components/Difficulties";
-import {
-  LobbyPreset,
-  LobbyPresetConfig,
-  LobbyPresetStore,
-} from "./components/lobbyConfig/PresetControls";
+import { LobbyPresetStore } from "./components/lobbyConfig/PresetControls";
 import "./components/LobbyTeamView";
 import "./components/Maps";
 import { JoinLobbyEvent } from "./Main";

src/client/SinglePlayerModal.ts

@@ -16,16 +16,16 @@ import {
   mapCategories,
 } from "../core/game/Game";
 import { UserSettings } from "../core/game/UserSettings";
-import { TeamCountConfig } from "../core/Schemas";
+import {
+  LobbyPreset,
+  LobbyPresetConfig,
+  TeamCountConfig,
+} from "../core/Schemas";
 import { generateID } from "../core/Util";
 import "./components/baseComponents/Button";
 import "./components/baseComponents/Modal";
 import "./components/Difficulties";
-import {
-  LobbyPreset,
-  LobbyPresetConfig,
-  LobbyPresetStore,
-} from "./components/lobbyConfig/PresetControls";
+import { LobbyPresetStore } from "./components/lobbyConfig/PresetControls";
 import "./components/Maps";
 import { fetchCosmetics } from "./Cosmetics";
 import { FlagInput } from "./FlagInput";

src/client/components/lobbyConfig/PresetControls.ts

@@ -3,19 +3,13 @@ import { customElement, property } from "lit/decorators.js";
 import { Difficulty, GameMapType, GameMode } from "../../../core/game/Game";
 import { UserSettings } from "../../../core/game/UserSettings";
 import {
+  LobbyPreset,
   LobbyPresetConfig,
   LobbyPresetConfigSchema,
   TeamCountConfig,
 } from "../../../core/Schemas";
 import { translateText } from "../../Utils";
 import "../baseComponents/Button";
-export { LobbyPresetConfigSchema } from "../../../core/Schemas";
-export type { LobbyPresetConfig } from "../../../core/Schemas";
-
-export type LobbyPreset = {
-  name: string;
-  config: LobbyPresetConfig;
-};
 
 export class LobbyPresetStore {
   constructor(private userSettings = new UserSettings()) {}

src/core/Schemas.ts

@@ -180,6 +180,12 @@ export const LobbyPresetConfigSchema = GameConfigSchema.extend({
 }).partial();
 export type LobbyPresetConfig = z.infer<typeof LobbyPresetConfigSchema>;
 
+export const LobbyPresetSchema = z.object({
+  name: z.string().default("Preset"),
+  config: LobbyPresetConfigSchema.default({}),
+});
+export type LobbyPreset = z.infer<typeof LobbyPresetSchema>;
+
 export const TeamSchema = z.string();
 
 const SafeString = z

src/core/game/UserSettings.ts

@@ -1,4 +1,4 @@
-import { LobbyPreset } from "../../client/components/lobbyConfig/PresetControls";
+import { LobbyPreset } from "../../core/Schemas";
 import { Cosmetics } from "../CosmeticSchemas";
 import { PlayerPattern } from "../Schemas";