From 87327cb5b5117c9bf54ccaca35e9e109ee7f0d01 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sun, 28 Dec 2025 17:27:49 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20DomesticCommandLoader=20=EB=B0=8F=20Gen?= =?UTF-8?q?eralAction=20=EA=B4=80=EB=A0=A8=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/logic/src/actions/domestic/index.ts | 8 +++- packages/logic/src/actions/engine.ts | 43 +++++++++++++------- packages/logic/src/turn/calendar.ts | 43 ++++++++++++++------ 3 files changed, 66 insertions(+), 28 deletions(-) diff --git a/packages/logic/src/actions/domestic/index.ts b/packages/logic/src/actions/domestic/index.ts index c0deb84..444e534 100644 --- a/packages/logic/src/actions/domestic/index.ts +++ b/packages/logic/src/actions/domestic/index.ts @@ -1,6 +1,9 @@ import type { CommandResolver as CommandResolverType } from './che_상업투자.js'; export type DomesticCommandKey = 'che_상업투자'; +type CommandResolverCtor = typeof CommandResolverType; +type CommandResolverArgs = ConstructorParameters; +type CommandResolverInstance = InstanceType; export type DomesticCommandImporter = () => Promise<{ CommandResolver: typeof CommandResolverType; @@ -28,7 +31,10 @@ export class DomesticCommandLoader { return importer(); } - async create(key: DomesticCommandKey, ...args: unknown[]): Promise { + async create( + key: DomesticCommandKey, + ...args: CommandResolverArgs + ): Promise { const { CommandResolver } = await this.load(key); return new CommandResolver(...args); } diff --git a/packages/logic/src/actions/engine.ts b/packages/logic/src/actions/engine.ts index 01b87b7..1a92869 100644 --- a/packages/logic/src/actions/engine.ts +++ b/packages/logic/src/actions/engine.ts @@ -23,9 +23,11 @@ export interface TurnScheduleContext { schedule: TurnSchedule; } -export interface GeneralPatchEffect { +export interface GeneralPatchEffect< + TriggerState extends GeneralTriggerState = GeneralTriggerState +> { type: 'general:patch'; - patch: Partial; + patch: Partial>; } export interface CityPatchEffect { @@ -48,22 +50,28 @@ export interface NextTurnOverrideEffect { nextTurnAt: Date; } -export type GeneralActionEffect = - | GeneralPatchEffect +export type GeneralActionEffect< + TriggerState extends GeneralTriggerState = GeneralTriggerState +> = + | GeneralPatchEffect | CityPatchEffect | NationPatchEffect | LogEffect | NextTurnOverrideEffect; -export interface GeneralActionOutcome { - effects: GeneralActionEffect[]; +export interface GeneralActionOutcome< + TriggerState extends GeneralTriggerState = GeneralTriggerState +> { + effects: GeneralActionEffect[]; } export interface GeneralActionResolver< TriggerState extends GeneralTriggerState = GeneralTriggerState > { key: string; - resolve(context: GeneralActionResolveContext): GeneralActionOutcome; + resolve( + context: GeneralActionResolveContext + ): GeneralActionOutcome; } export interface GeneralActionResolution { @@ -93,10 +101,10 @@ const mergeRole = ( }, }); -const mergeTriggerState = ( - base: GeneralTriggerState, - patch: Partial -): GeneralTriggerState => ({ +const mergeTriggerState = ( + base: TriggerState, + patch: Partial +): TriggerState => ({ ...base, ...patch, flags: { ...base.flags, ...(patch.flags ?? {}) }, @@ -105,7 +113,10 @@ const mergeTriggerState = ( meta: { ...base.meta, ...(patch.meta ?? {}) }, }); -const applyGeneralPatch = (base: General, patch: Partial): General => ({ +const applyGeneralPatch = ( + base: General, + patch: Partial> +): General => ({ ...base, ...patch, stats: patch.stats ? mergeStats(base.stats, patch.stats) : base.stats, @@ -173,12 +184,16 @@ export const resolveGeneralAction = < nextTurnAtOverride ?? getNextTurnAt(scheduleContext.now, scheduleContext.schedule); - return { + const resolution: GeneralActionResolution = { general: nextGeneral, - city: nextCity, nation: nextNation, nextTurnAt, logs, effects: outcome.effects, }; + if (nextCity) { + resolution.city = nextCity; + } + + return resolution; }; diff --git a/packages/logic/src/turn/calendar.ts b/packages/logic/src/turn/calendar.ts index c639e1c..806c9cb 100644 --- a/packages/logic/src/turn/calendar.ts +++ b/packages/logic/src/turn/calendar.ts @@ -3,8 +3,10 @@ export interface TurnScheduleEntry { tickMinutes: number; } +export type TurnScheduleEntries = [TurnScheduleEntry, ...TurnScheduleEntry[]]; + export interface TurnSchedule { - entries: TurnScheduleEntry[]; + entries: TurnScheduleEntries; } const MINUTES_PER_DAY = 24 * 60; @@ -26,7 +28,7 @@ const toLocalDateAtMinute = (date: Date, minuteOfDay: number, dayOffset = 0): Da ); }; -const normalizeEntries = (entries: TurnScheduleEntry[]): TurnScheduleEntry[] => { +const normalizeEntries = (entries: TurnScheduleEntries): TurnScheduleEntries => { const normalized = entries .map((entry) => ({ startMinute: Math.max(0, Math.min(MINUTES_PER_DAY - 1, entry.startMinute)), @@ -34,27 +36,33 @@ const normalizeEntries = (entries: TurnScheduleEntry[]): TurnScheduleEntry[] => })) .sort((a, b) => a.startMinute - b.startMinute); - if (normalized.length === 0) { - throw new Error('Turn schedule needs at least one entry.'); - } - - return normalized; + return normalized as TurnScheduleEntries; }; -const findCurrentEntryIndex = (minuteOfDay: number, entries: TurnScheduleEntry[]): number => { +const findCurrentEntryIndex = ( + minuteOfDay: number, + entries: TurnScheduleEntries +): number => { for (let i = entries.length - 1; i >= 0; i -= 1) { - if (entries[i].startMinute <= minuteOfDay) { + const entry = entries[i]; + if (entry && entry.startMinute <= minuteOfDay) { return i; } } return -1; }; +const getEntryAt = ( + entries: TurnScheduleEntries, + index: number +): TurnScheduleEntry => + entries[Math.max(0, Math.min(entries.length - 1, index))] ?? entries[0]; + export const getTickMinutesAt = (date: Date, schedule: TurnSchedule): number => { const entries = normalizeEntries(schedule.entries); const minuteOfDay = toMinuteOfDay(date); const index = findCurrentEntryIndex(minuteOfDay, entries); - const entry = index >= 0 ? entries[index] : entries[entries.length - 1]; + const entry = getEntryAt(entries, index >= 0 ? index : entries.length - 1); return entry.tickMinutes; }; @@ -67,9 +75,18 @@ export const getNextTurnAt = (date: Date, schedule: TurnSchedule): Date => { const nextIndex = (currentIndex + 1) % entries.length; const nextDayOffset = startDayOffset + (nextIndex > currentIndex ? 0 : 1); - const currentEntry = entries[currentIndex]; - const segmentStart = toLocalDateAtMinute(date, currentEntry.startMinute, startDayOffset); - const segmentEnd = toLocalDateAtMinute(date, entries[nextIndex].startMinute, nextDayOffset); + const currentEntry = getEntryAt(entries, currentIndex); + const nextEntry = getEntryAt(entries, nextIndex); + const segmentStart = toLocalDateAtMinute( + date, + currentEntry.startMinute, + startDayOffset + ); + const segmentEnd = toLocalDateAtMinute( + date, + nextEntry.startMinute, + nextDayOffset + ); const elapsedMinutes = (date.getTime() - segmentStart.getTime()) / 60000; const nextStep = Math.floor(elapsedMinutes / currentEntry.tickMinutes) + 1;