From 263c4cc6935454f0ec042bf8d81a3aefaab13a14 Mon Sep 17 00:00:00 2001 From: Ryan Barlow Date: Mon, 26 Jan 2026 10:17:09 +0000 Subject: [PATCH] move into config --- src/core/configuration/DefaultConfig.ts | 20 +++++++++++++++++++- src/core/configuration/Timing.ts | 19 ------------------- src/server/GamePreviewBuilder.ts | 2 +- 3 files changed, 20 insertions(+), 21 deletions(-) delete mode 100644 src/core/configuration/Timing.ts diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts index 8a953a4f7..2654ac150 100644 --- a/src/core/configuration/DefaultConfig.ts +++ b/src/core/configuration/DefaultConfig.ts @@ -4,6 +4,7 @@ import { Difficulty, Game, GameMode, + GameType, Gold, Player, PlayerInfo, @@ -24,7 +25,24 @@ import { Config, GameEnv, NukeMagnitude, ServerConfig, Theme } from "./Config"; import { Env } from "./Env"; import { PastelTheme } from "./PastelTheme"; import { PastelThemeDark } from "./PastelThemeDark"; -import { spawnPhaseTurns } from "./Timing"; + +export const TICKS_PER_SECOND = 10; +export const SPAWN_PHASE_TICKS = { + singleplayer: 100, + multiplayer: 300, +} as const; + +export type GameTypeLike = GameType | string | undefined; + +export function spawnPhaseTurns(gameType: GameTypeLike): number { + return gameType === GameType.Singleplayer + ? SPAWN_PHASE_TICKS.singleplayer + : SPAWN_PHASE_TICKS.multiplayer; +} + +export function spawnPhaseSeconds(gameType: GameTypeLike): number { + return spawnPhaseTurns(gameType) / TICKS_PER_SECOND; +} const DEFENSE_DEBUFF_MIDPOINT = 150_000; const DEFENSE_DEBUFF_DECAY_RATE = Math.LN2 / 50000; diff --git a/src/core/configuration/Timing.ts b/src/core/configuration/Timing.ts deleted file mode 100644 index 4ade39977..000000000 --- a/src/core/configuration/Timing.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { GameType } from "../game/Game"; - -export const TICKS_PER_SECOND = 10; -export const SPAWN_PHASE_TICKS = { - singleplayer: 100, - multiplayer: 300, -} as const; - -export type GameTypeLike = GameType | string | undefined; - -export function spawnPhaseTurns(gameType: GameTypeLike): number { - return gameType === GameType.Singleplayer - ? SPAWN_PHASE_TICKS.singleplayer - : SPAWN_PHASE_TICKS.multiplayer; -} - -export function spawnPhaseSeconds(gameType: GameTypeLike): number { - return spawnPhaseTurns(gameType) / TICKS_PER_SECOND; -} diff --git a/src/server/GamePreviewBuilder.ts b/src/server/GamePreviewBuilder.ts index 0f6438939..7905045d6 100644 --- a/src/server/GamePreviewBuilder.ts +++ b/src/server/GamePreviewBuilder.ts @@ -1,6 +1,6 @@ import { z } from "zod"; import { GameInfo } from "../core/Schemas"; -import { spawnPhaseSeconds } from "../core/configuration/Timing"; +import { spawnPhaseSeconds } from "../core/configuration/DefaultConfig"; import { GameMode } from "../core/game/Game"; export const PlayerInfoSchema = z.object({