From e10bcba49bb0269dcb56c3a2c86fa7caa2f7aefd Mon Sep 17 00:00:00 2001 From: Hide_D Date: Sat, 3 Jan 2026 08:08:33 +0000 Subject: [PATCH] Refactor import paths to use absolute paths from '@sammo-ts/logic' for consistency and clarity across the codebase. This includes updates to various modules related to actions, triggers, constraints, and world management, ensuring that all imports are correctly pointing to the new structure. --- packages/logic/src/actions/definition.ts | 4 +-- packages/logic/src/actions/engine.ts | 8 ++--- .../actions/instant/nation/che_불가침수락.ts | 16 +++++----- .../instant/nation/che_불가침파기수락.ts | 16 +++++----- .../logic/src/actions/turn/actionContext.ts | 8 ++--- .../src/actions/turn/actionContextHelpers.ts | 10 +++---- packages/logic/src/actions/turn/commandEnv.ts | 2 +- .../logic/src/actions/turn/commandModule.ts | 4 +-- .../src/actions/turn/general/che_거병.ts | 16 +++++----- .../src/actions/turn/general/che_건국.ts | 16 +++++----- .../src/actions/turn/general/che_기술연구.ts | 14 ++++----- .../src/actions/turn/general/che_농지개간.ts | 6 ++-- .../src/actions/turn/general/che_사기진작.ts | 14 ++++----- .../src/actions/turn/general/che_상업투자.ts | 18 +++++------ .../src/actions/turn/general/che_성벽보수.ts | 6 ++-- .../src/actions/turn/general/che_수비강화.ts | 6 ++-- .../src/actions/turn/general/che_요양.ts | 14 ++++----- .../src/actions/turn/general/che_인재탐색.ts | 22 +++++++------- .../src/actions/turn/general/che_임관.ts | 16 +++++----- .../src/actions/turn/general/che_주민선정.ts | 6 ++-- .../src/actions/turn/general/che_징병.ts | 22 +++++++------- .../src/actions/turn/general/che_출병.ts | 30 +++++++++---------- .../src/actions/turn/general/che_치안강화.ts | 6 ++-- .../src/actions/turn/general/che_화계.ts | 22 +++++++------- .../src/actions/turn/general/che_훈련.ts | 14 ++++----- .../actions/turn/general/cityDevelopment.ts | 10 +++---- .../logic/src/actions/turn/general/index.ts | 2 +- .../src/actions/turn/general/recruitment.ts | 2 +- .../logic/src/actions/turn/general/휴식.ts | 14 ++++----- .../logic/src/actions/turn/nation/che_발령.ts | 20 ++++++------- .../src/actions/turn/nation/che_불가침제의.ts | 20 ++++++------- .../actions/turn/nation/che_불가침파기제의.ts | 18 +++++------ .../src/actions/turn/nation/che_선전포고.ts | 18 +++++------ .../src/actions/turn/nation/che_의병모집.ts | 24 +++++++-------- .../logic/src/actions/turn/nation/che_포상.ts | 18 +++++------ .../logic/src/actions/turn/nation/index.ts | 2 +- .../logic/src/actions/turn/nation/휴식.ts | 12 ++++---- packages/logic/src/constraints/city.ts | 4 +-- packages/logic/src/constraints/general.ts | 2 +- packages/logic/src/constraints/helpers.ts | 2 +- packages/logic/src/constraints/nation.ts | 2 +- packages/logic/src/ports/world.ts | 2 +- packages/logic/src/ports/worldSnapshot.ts | 6 ++-- packages/logic/src/triggers/general-action.ts | 2 +- packages/logic/src/triggers/general.ts | 4 +-- .../triggers/generalTriggers/che_도시치료.ts | 6 ++-- .../src/triggers/special/domestic/che_발명.ts | 2 +- .../src/triggers/special/domestic/che_인덕.ts | 2 +- .../src/triggers/special/domestic/index.ts | 2 +- .../logic/src/triggers/special/registry.ts | 12 ++++---- packages/logic/src/triggers/special/types.ts | 6 ++-- .../src/triggers/special/war/che_의술.ts | 10 +++---- .../src/triggers/special/war/che_징병.ts | 6 ++-- .../logic/src/triggers/special/war/index.ts | 2 +- packages/logic/src/war/actions.ts | 4 +-- packages/logic/src/war/aftermath.ts | 8 ++--- packages/logic/src/war/crewType.ts | 2 +- packages/logic/src/war/engine.ts | 8 ++--- packages/logic/src/war/triggers.ts | 2 +- packages/logic/src/war/triggers/che_의술.ts | 8 ++--- packages/logic/src/war/triggers/che_필살.ts | 8 ++--- packages/logic/src/war/triggers/index.ts | 2 +- packages/logic/src/war/triggers/types.ts | 4 +-- packages/logic/src/war/types.ts | 8 ++--- packages/logic/src/war/units.ts | 8 ++--- packages/logic/src/war/utils.ts | 2 +- packages/logic/src/world/bootstrap.ts | 4 +-- packages/logic/src/world/loader.ts | 6 ++-- packages/logic/src/world/types.ts | 4 +-- packages/logic/src/world/unitSet.ts | 2 +- 70 files changed, 314 insertions(+), 314 deletions(-) diff --git a/packages/logic/src/actions/definition.ts b/packages/logic/src/actions/definition.ts index 2b617eb..4abbf89 100644 --- a/packages/logic/src/actions/definition.ts +++ b/packages/logic/src/actions/definition.ts @@ -1,9 +1,9 @@ -import type { Constraint, ConstraintContext } from '../constraints/types.js'; +import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, } from './engine.js'; -import type { GeneralTriggerState } from '../domain/entities.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; export interface GeneralActionDefinition< TriggerState extends GeneralTriggerState = GeneralTriggerState, diff --git a/packages/logic/src/actions/engine.ts b/packages/logic/src/actions/engine.ts index 102dce2..44dc008 100644 --- a/packages/logic/src/actions/engine.ts +++ b/packages/logic/src/actions/engine.ts @@ -8,15 +8,15 @@ import type { GeneralId, Nation, NationId, -} from '../domain/entities.js'; -import type { GeneralActionContext } from '../triggers/general.js'; -import { getNextTurnAt, type TurnSchedule } from '../turn/calendar.js'; +} from '@sammo-ts/logic/domain/entities.js'; +import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js'; +import { getNextTurnAt, type TurnSchedule } from '@sammo-ts/logic/turn/calendar.js'; import { LogCategory, type LogEntryDraft, LogFormat, LogScope, -} from '../logging/types.js'; +} from '@sammo-ts/logic/logging/types.js'; enablePatches(); diff --git a/packages/logic/src/actions/instant/nation/che_불가침수락.ts b/packages/logic/src/actions/instant/nation/che_불가침수락.ts index 9df899e..08c6699 100644 --- a/packages/logic/src/actions/instant/nation/che_불가침수락.ts +++ b/packages/logic/src/actions/instant/nation/che_불가침수락.ts @@ -1,5 +1,5 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; -import type { Constraint, ConstraintContext } from '../../../constraints/types.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; +import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js'; import { beChief, destGeneralInDestNation, @@ -9,15 +9,15 @@ import { notBeNeutral, occupiedCity, suppliedCity, -} from '../../../constraints/presets.js'; -import { allow, unknownOrDeny } from '../../../constraints/helpers.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import { allow, unknownOrDeny } from '@sammo-ts/logic/constraints/helpers.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import { createDiplomacyPatchEffect, createLogEffect } from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { createDiplomacyPatchEffect, createLogEffect } from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; export interface NonAggressionAcceptArgs { destNationId: number; diff --git a/packages/logic/src/actions/instant/nation/che_불가침파기수락.ts b/packages/logic/src/actions/instant/nation/che_불가침파기수락.ts index 2f6890f..2390f46 100644 --- a/packages/logic/src/actions/instant/nation/che_불가침파기수락.ts +++ b/packages/logic/src/actions/instant/nation/che_불가침파기수락.ts @@ -1,5 +1,5 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; -import type { Constraint, ConstraintContext } from '../../../constraints/types.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; +import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js'; import { allowDiplomacyBetweenStatus, beChief, @@ -7,15 +7,15 @@ import { existsDestGeneral, existsDestNation, notBeNeutral, -} from '../../../constraints/presets.js'; -import { allow, unknownOrDeny } from '../../../constraints/helpers.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import { allow, unknownOrDeny } from '@sammo-ts/logic/constraints/helpers.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import { createDiplomacyPatchEffect, createLogEffect } from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { createDiplomacyPatchEffect, createLogEffect } from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; export interface NonAggressionCancelAcceptArgs { destNationId: number; diff --git a/packages/logic/src/actions/turn/actionContext.ts b/packages/logic/src/actions/turn/actionContext.ts index e45668c..cef6791 100644 --- a/packages/logic/src/actions/turn/actionContext.ts +++ b/packages/logic/src/actions/turn/actionContext.ts @@ -1,7 +1,7 @@ -import type { City, General, Nation } from '../../domain/entities.js'; -import type { ScenarioConfig } from '../../scenario/types.js'; -import type { ScenarioMeta } from '../../world/types.js'; -import type { MapDefinition, UnitSetDefinition } from '../../world/types.js'; +import type { City, General, Nation } from '@sammo-ts/logic/domain/entities.js'; +import type { ScenarioConfig } from '@sammo-ts/logic/scenario/types.js'; +import type { ScenarioMeta } from '@sammo-ts/logic/world/types.js'; +import type { MapDefinition, UnitSetDefinition } from '@sammo-ts/logic/world/types.js'; export interface ActionRandomSource { nextFloat(): number; diff --git a/packages/logic/src/actions/turn/actionContextHelpers.ts b/packages/logic/src/actions/turn/actionContextHelpers.ts index 3a5439a..2add428 100644 --- a/packages/logic/src/actions/turn/actionContextHelpers.ts +++ b/packages/logic/src/actions/turn/actionContextHelpers.ts @@ -1,8 +1,8 @@ -import type { General } from '../../domain/entities.js'; -import type { ScenarioConfig } from '../../scenario/types.js'; -import type { ScenarioMeta } from '../../world/types.js'; -import type { WarAftermathConfig, WarEngineConfig, WarTimeContext } from '../../war/types.js'; -import type { UnitSetDefinition } from '../../world/types.js'; +import type { General } from '@sammo-ts/logic/domain/entities.js'; +import type { ScenarioConfig } from '@sammo-ts/logic/scenario/types.js'; +import type { ScenarioMeta } from '@sammo-ts/logic/world/types.js'; +import type { WarAftermathConfig, WarEngineConfig, WarTimeContext } from '@sammo-ts/logic/war/types.js'; +import type { UnitSetDefinition } from '@sammo-ts/logic/world/types.js'; import type { ActionContextWorldRef, ActionContextWorldState, diff --git a/packages/logic/src/actions/turn/commandEnv.ts b/packages/logic/src/actions/turn/commandEnv.ts index d9764d5..bceed4b 100644 --- a/packages/logic/src/actions/turn/commandEnv.ts +++ b/packages/logic/src/actions/turn/commandEnv.ts @@ -1,4 +1,4 @@ -import type { GeneralActionModule } from '../../triggers/general-action.js'; +import type { GeneralActionModule } from '@sammo-ts/logic/triggers/general-action.js'; export interface TurnCommandEnv { develCost: number; diff --git a/packages/logic/src/actions/turn/commandModule.ts b/packages/logic/src/actions/turn/commandModule.ts index 459e32d..44cef8f 100644 --- a/packages/logic/src/actions/turn/commandModule.ts +++ b/packages/logic/src/actions/turn/commandModule.ts @@ -1,5 +1,5 @@ -import type { GeneralActionDefinition } from '../definition.js'; -import type { GeneralActionResolver } from '../engine.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; +import type { GeneralActionResolver } from '@sammo-ts/logic/actions/engine.js'; import type { ActionContextBuilder } from './actionContext.js'; import type { TurnCommandEnv } from './commandEnv.js'; diff --git a/packages/logic/src/actions/turn/general/che_거병.ts b/packages/logic/src/actions/turn/general/che_거병.ts index 8247f08..0445311 100644 --- a/packages/logic/src/actions/turn/general/che_거병.ts +++ b/packages/logic/src/actions/turn/general/che_거병.ts @@ -1,14 +1,14 @@ -import type { GeneralTriggerState, TriggerValue } from '../../../domain/entities.js'; -import type { Constraint, ConstraintContext } from '../../../constraints/types.js'; -import { beNeutral } from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +import type { GeneralTriggerState, TriggerValue } from '@sammo-ts/logic/domain/entities.js'; +import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js'; +import { beNeutral } from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import { LogCategory, LogFormat } from '../../../logging/types.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat } from '@sammo-ts/logic/logging/types.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface UprisingArgs {} diff --git a/packages/logic/src/actions/turn/general/che_건국.ts b/packages/logic/src/actions/turn/general/che_건국.ts index c3f6e15..722afc4 100644 --- a/packages/logic/src/actions/turn/general/che_건국.ts +++ b/packages/logic/src/actions/turn/general/che_건국.ts @@ -1,14 +1,14 @@ -import type { GeneralTriggerState, TriggerValue } from '../../../domain/entities.js'; -import type { Constraint, ConstraintContext } from '../../../constraints/types.js'; -import { beNeutral } from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +import type { GeneralTriggerState, TriggerValue } from '@sammo-ts/logic/domain/entities.js'; +import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js'; +import { beNeutral } from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import { LogCategory, LogFormat } from '../../../logging/types.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat } from '@sammo-ts/logic/logging/types.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface FoundingArgs {} diff --git a/packages/logic/src/actions/turn/general/che_기술연구.ts b/packages/logic/src/actions/turn/general/che_기술연구.ts index 1e78867..6814cad 100644 --- a/packages/logic/src/actions/turn/general/che_기술연구.ts +++ b/packages/logic/src/actions/turn/general/che_기술연구.ts @@ -1,26 +1,26 @@ import type { GeneralTriggerState, Nation, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, StateView, -} from '../../../constraints/types.js'; +} from '@sammo-ts/logic/constraints/types.js'; import { notBeNeutral, notWanderingNation, occupiedCity, reqGeneralGold, suppliedCity, -} from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface TechResearchArgs {} diff --git a/packages/logic/src/actions/turn/general/che_농지개간.ts b/packages/logic/src/actions/turn/general/che_농지개간.ts index 56fc440..1f57ff8 100644 --- a/packages/logic/src/actions/turn/general/che_농지개간.ts +++ b/packages/logic/src/actions/turn/general/che_농지개간.ts @@ -1,7 +1,7 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; import { CityDevelopmentActionDefinition } from './cityDevelopment.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export class ActionDefinition< diff --git a/packages/logic/src/actions/turn/general/che_사기진작.ts b/packages/logic/src/actions/turn/general/che_사기진작.ts index a9b9cd9..6eb38f6 100644 --- a/packages/logic/src/actions/turn/general/che_사기진작.ts +++ b/packages/logic/src/actions/turn/general/che_사기진작.ts @@ -1,19 +1,19 @@ import type { GeneralTriggerState, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, StateView, -} from '../../../constraints/types.js'; -import { notBeNeutral, reqGeneralGold } from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/types.js'; +import { notBeNeutral, reqGeneralGold } from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface BoostMoraleArgs {} diff --git a/packages/logic/src/actions/turn/general/che_상업투자.ts b/packages/logic/src/actions/turn/general/che_상업투자.ts index 00a4fc2..d8ee1b3 100644 --- a/packages/logic/src/actions/turn/general/che_상업투자.ts +++ b/packages/logic/src/actions/turn/general/che_상업투자.ts @@ -4,13 +4,13 @@ import type { General, GeneralTriggerState, Nation, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, RequirementKey, StateView, -} from '../../../constraints/types.js'; +} from '@sammo-ts/logic/constraints/types.js'; import { notBeNeutral, notWanderingNation, @@ -19,20 +19,20 @@ import { reqGeneralGold, reqGeneralRice, suppliedCity, -} from '../../../constraints/presets.js'; -import type { GeneralActionContext } from '../../../triggers/general.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js'; import { GeneralActionPipeline, type GeneralActionModule, -} from '../../../triggers/general-action.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/triggers/general-action.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolver, GeneralActionResolveContext, -} from '../../engine.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export type DomesticCriticalPick = 'fail' | 'normal' | 'success'; diff --git a/packages/logic/src/actions/turn/general/che_성벽보수.ts b/packages/logic/src/actions/turn/general/che_성벽보수.ts index 517d5e7..8fce94a 100644 --- a/packages/logic/src/actions/turn/general/che_성벽보수.ts +++ b/packages/logic/src/actions/turn/general/che_성벽보수.ts @@ -1,7 +1,7 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; import { CityDevelopmentActionDefinition } from './cityDevelopment.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export class ActionDefinition< diff --git a/packages/logic/src/actions/turn/general/che_수비강화.ts b/packages/logic/src/actions/turn/general/che_수비강화.ts index 4794969..2ed937f 100644 --- a/packages/logic/src/actions/turn/general/che_수비강화.ts +++ b/packages/logic/src/actions/turn/general/che_수비강화.ts @@ -1,7 +1,7 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; import { CityDevelopmentActionDefinition } from './cityDevelopment.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export class ActionDefinition< diff --git a/packages/logic/src/actions/turn/general/che_요양.ts b/packages/logic/src/actions/turn/general/che_요양.ts index 06a15e8..ba6be1a 100644 --- a/packages/logic/src/actions/turn/general/che_요양.ts +++ b/packages/logic/src/actions/turn/general/che_요양.ts @@ -1,19 +1,19 @@ import type { GeneralTriggerState, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, StateView, -} from '../../../constraints/types.js'; -import { notBeNeutral, reqGeneralGold } from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/types.js'; +import { notBeNeutral, reqGeneralGold } from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface RecoveryArgs {} diff --git a/packages/logic/src/actions/turn/general/che_인재탐색.ts b/packages/logic/src/actions/turn/general/che_인재탐색.ts index 590a711..bd78e3c 100644 --- a/packages/logic/src/actions/turn/general/che_인재탐색.ts +++ b/packages/logic/src/actions/turn/general/che_인재탐색.ts @@ -5,34 +5,34 @@ import type { GeneralTriggerState, StatBlock, TriggerValue, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, -} from '../../../constraints/types.js'; +} from '@sammo-ts/logic/constraints/types.js'; import { reqGeneralGold, reqGeneralRice, -} from '../../../constraints/presets.js'; +} from '@sammo-ts/logic/constraints/presets.js'; import { GeneralActionPipeline, type GeneralActionModule, -} from '../../../triggers/general-action.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/triggers/general-action.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, GeneralActionResolver, -} from '../../engine.js'; +} from '@sammo-ts/logic/actions/engine.js'; import { createGeneralAddEffect, -} from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; import { buildRecruitmentGeneral } from './recruitment.js'; import { JosaUtil } from '@sammo-ts/common'; -import type { ActionContextBuilder } from '../actionContext.js'; -import { buildWorldSummary } from '../actionContextHelpers.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; +import type { ActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; +import { buildWorldSummary } from '@sammo-ts/logic/actions/turn/actionContextHelpers.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface TalentScoutArgs {} diff --git a/packages/logic/src/actions/turn/general/che_임관.ts b/packages/logic/src/actions/turn/general/che_임관.ts index 2f3b608..3463796 100644 --- a/packages/logic/src/actions/turn/general/che_임관.ts +++ b/packages/logic/src/actions/turn/general/che_임관.ts @@ -1,17 +1,17 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, -} from '../../../constraints/types.js'; -import { beNeutral, existsDestNation } from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/types.js'; +import { beNeutral, existsDestNation } from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import { LogCategory, LogFormat } from '../../../logging/types.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat } from '@sammo-ts/logic/logging/types.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface AppointmentArgs { diff --git a/packages/logic/src/actions/turn/general/che_주민선정.ts b/packages/logic/src/actions/turn/general/che_주민선정.ts index 127fe75..a057691 100644 --- a/packages/logic/src/actions/turn/general/che_주민선정.ts +++ b/packages/logic/src/actions/turn/general/che_주민선정.ts @@ -1,7 +1,7 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; import { CityDevelopmentActionDefinition } from './cityDevelopment.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export class ActionDefinition< diff --git a/packages/logic/src/actions/turn/general/che_징병.ts b/packages/logic/src/actions/turn/general/che_징병.ts index 65faa2b..5dd2965 100644 --- a/packages/logic/src/actions/turn/general/che_징병.ts +++ b/packages/logic/src/actions/turn/general/che_징병.ts @@ -4,13 +4,13 @@ import type { GeneralTriggerState, Nation, TriggerValue, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, RequirementKey, StateView, -} from '../../../constraints/types.js'; +} from '@sammo-ts/logic/constraints/types.js'; import { notBeNeutral, occupiedCity, @@ -19,28 +19,28 @@ import { reqGeneralCrewMargin, reqGeneralGold, reqGeneralRice, -} from '../../../constraints/presets.js'; +} from '@sammo-ts/logic/constraints/presets.js'; import { GeneralActionPipeline, type GeneralActionModule, -} from '../../../triggers/general-action.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/triggers/general-action.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, GeneralActionResolver, -} from '../../engine.js'; -import type { MapDefinition, UnitSetDefinition } from '../../../world/types.js'; -import type { ActionContextBuilder } from '../actionContext.js'; -import { resolveStartYear } from '../actionContextHelpers.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import type { MapDefinition, UnitSetDefinition } from '@sammo-ts/logic/world/types.js'; +import type { ActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; +import { resolveStartYear } from '@sammo-ts/logic/actions/turn/actionContextHelpers.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; import type { GeneralTurnCommandSpec } from './index.js'; import { type CrewTypeAvailabilityContext, findCrewTypeById, getTechCost, isCrewTypeAvailable, -} from '../../../world/unitSet.js'; +} from '@sammo-ts/logic/world/unitSet.js'; export interface RecruitArgs { crewType: number; diff --git a/packages/logic/src/actions/turn/general/che_출병.ts b/packages/logic/src/actions/turn/general/che_출병.ts index c4fb37b..bcba21f 100644 --- a/packages/logic/src/actions/turn/general/che_출병.ts +++ b/packages/logic/src/actions/turn/general/che_출병.ts @@ -3,12 +3,12 @@ import type { General, GeneralTriggerState, Nation, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, StateView, -} from '../../../constraints/types.js'; +} from '@sammo-ts/logic/constraints/types.js'; import { existsDestCity, hasRouteWithEnemy, @@ -20,44 +20,44 @@ import { reqGeneralCrew, reqGeneralRice, suppliedCity, -} from '../../../constraints/presets.js'; -import { readGeneral } from '../../../constraints/helpers.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import { readGeneral } from '@sammo-ts/logic/constraints/helpers.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionEffect, GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; +} from '@sammo-ts/logic/actions/engine.js'; import { createCityPatchEffect, createDiplomacyPatchEffect, createGeneralPatchEffect, createNationPatchEffect, -} from '../../engine.js'; +} from '@sammo-ts/logic/actions/engine.js'; import { JosaUtil, LiteHashDRBG } from '@sammo-ts/common'; -import type { TurnCommandEnv } from '../commandEnv.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; import type { GeneralTurnCommandSpec } from './index.js'; import type { WarAftermathConfig, WarEngineConfig, WarTimeContext, -} from '../../../war/types.js'; -import { resolveWarAftermath } from '../../../war/aftermath.js'; -import { resolveWarBattle } from '../../../war/engine.js'; +} from '@sammo-ts/logic/war/types.js'; +import { resolveWarAftermath } from '@sammo-ts/logic/war/aftermath.js'; +import { resolveWarBattle } from '@sammo-ts/logic/war/engine.js'; import { increaseMetaNumber, simpleSerialize, -} from '../../../war/utils.js'; +} from '@sammo-ts/logic/war/utils.js'; import type { MapDefinition, UnitSetDefinition, -} from '../../../world/types.js'; -import type { ActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/world/types.js'; +import type { ActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import { buildWarAftermathConfig, buildWarConfig, buildWarTime, -} from '../actionContextHelpers.js'; +} from '@sammo-ts/logic/actions/turn/actionContextHelpers.js'; export interface DispatchArgs { destCityId: number; diff --git a/packages/logic/src/actions/turn/general/che_치안강화.ts b/packages/logic/src/actions/turn/general/che_치안강화.ts index 5af3673..d6f75f1 100644 --- a/packages/logic/src/actions/turn/general/che_치안강화.ts +++ b/packages/logic/src/actions/turn/general/che_치안강화.ts @@ -1,7 +1,7 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; import { CityDevelopmentActionDefinition } from './cityDevelopment.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export class ActionDefinition< diff --git a/packages/logic/src/actions/turn/general/che_화계.ts b/packages/logic/src/actions/turn/general/che_화계.ts index 88445d8..8dc44ba 100644 --- a/packages/logic/src/actions/turn/general/che_화계.ts +++ b/packages/logic/src/actions/turn/general/che_화계.ts @@ -5,8 +5,8 @@ import type { GeneralTriggerState, Nation, TriggerValue, -} from '../../../domain/entities.js'; -import type { Constraint, ConstraintContext } from '../../../constraints/types.js'; +} from '@sammo-ts/logic/domain/entities.js'; +import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js'; import { disallowDiplomacyBetweenStatus, existsDestCity, @@ -17,26 +17,26 @@ import { reqGeneralGold, reqGeneralRice, suppliedCity, -} from '../../../constraints/presets.js'; -import type { GeneralActionContext } from '../../../triggers/general.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js'; import { GeneralActionPipeline, type GeneralActionModule, -} from '../../../triggers/general-action.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/triggers/general-action.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionEffect, GeneralActionOutcome, GeneralActionResolveContext, GeneralActionResolver, -} from '../../engine.js'; +} from '@sammo-ts/logic/actions/engine.js'; import { createCityPatchEffect, createGeneralPatchEffect, -} from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface FireAttackArgs { diff --git a/packages/logic/src/actions/turn/general/che_훈련.ts b/packages/logic/src/actions/turn/general/che_훈련.ts index f712438..6189897 100644 --- a/packages/logic/src/actions/turn/general/che_훈련.ts +++ b/packages/logic/src/actions/turn/general/che_훈련.ts @@ -1,19 +1,19 @@ import type { GeneralTriggerState, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, StateView, -} from '../../../constraints/types.js'; -import { notBeNeutral, reqGeneralGold } from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/types.js'; +import { notBeNeutral, reqGeneralGold } from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface TrainingArgs {} diff --git a/packages/logic/src/actions/turn/general/cityDevelopment.ts b/packages/logic/src/actions/turn/general/cityDevelopment.ts index fdbfa81..0e1421b 100644 --- a/packages/logic/src/actions/turn/general/cityDevelopment.ts +++ b/packages/logic/src/actions/turn/general/cityDevelopment.ts @@ -1,12 +1,12 @@ import type { City, GeneralTriggerState, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, StateView, -} from '../../../constraints/types.js'; +} from '@sammo-ts/logic/constraints/types.js'; import { notBeNeutral, notWanderingNation, @@ -14,12 +14,12 @@ import { remainCityCapacityByMax, reqGeneralGold, suppliedCity, -} from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; +} from '@sammo-ts/logic/actions/engine.js'; export interface CityDevelopmentArgs {} diff --git a/packages/logic/src/actions/turn/general/index.ts b/packages/logic/src/actions/turn/general/index.ts index 4260a11..168d654 100644 --- a/packages/logic/src/actions/turn/general/index.ts +++ b/packages/logic/src/actions/turn/general/index.ts @@ -1,4 +1,4 @@ -import type { TurnCommandModule, TurnCommandSpecBase } from '../commandModule.js'; +import type { TurnCommandModule, TurnCommandSpecBase } from '@sammo-ts/logic/actions/turn/commandModule.js'; export const GENERAL_TURN_COMMAND_KEYS = [ 'che_거병', diff --git a/packages/logic/src/actions/turn/general/recruitment.ts b/packages/logic/src/actions/turn/general/recruitment.ts index dc0e648..5f3fbd7 100644 --- a/packages/logic/src/actions/turn/general/recruitment.ts +++ b/packages/logic/src/actions/turn/general/recruitment.ts @@ -4,7 +4,7 @@ import type { GeneralTriggerState, StatBlock, TriggerValue, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; export interface GeneralRecruitmentInput< TriggerState extends GeneralTriggerState = GeneralTriggerState diff --git a/packages/logic/src/actions/turn/general/휴식.ts b/packages/logic/src/actions/turn/general/휴식.ts index 3a7d188..f5ed79a 100644 --- a/packages/logic/src/actions/turn/general/휴식.ts +++ b/packages/logic/src/actions/turn/general/휴식.ts @@ -1,19 +1,19 @@ import type { GeneralTriggerState, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, -} from '../../../constraints/types.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/types.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, GeneralActionResolver, -} from '../../engine.js'; -import { LogCategory, LogFormat } from '../../../logging/types.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat } from '@sammo-ts/logic/logging/types.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { GeneralTurnCommandSpec } from './index.js'; export interface RestArgs {} diff --git a/packages/logic/src/actions/turn/nation/che_발령.ts b/packages/logic/src/actions/turn/nation/che_발령.ts index 81a3eb3..09034c9 100644 --- a/packages/logic/src/actions/turn/nation/che_발령.ts +++ b/packages/logic/src/actions/turn/nation/che_발령.ts @@ -3,11 +3,11 @@ import type { General, GeneralTriggerState, TriggerValue, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, -} from '../../../constraints/types.js'; +} from '@sammo-ts/logic/constraints/types.js'; import { alwaysFail, beChief, @@ -18,20 +18,20 @@ import { occupiedDestCity, suppliedCity, suppliedDestCity, -} from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionEffect, GeneralActionOutcome, GeneralActionResolveContext, GeneralActionResolver, -} from '../../engine.js'; -import { createGeneralPatchEffect, createLogEffect } from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { createGeneralPatchEffect, createLogEffect } from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; import { JosaUtil } from '@sammo-ts/common'; -import type { ActionContextBuilder } from '../actionContext.js'; -import { resolveTurnTermMinutes } from '../actionContextHelpers.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; +import type { ActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; +import { resolveTurnTermMinutes } from '@sammo-ts/logic/actions/turn/actionContextHelpers.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; import type { NationTurnCommandSpec } from './index.js'; export interface AssignmentArgs { diff --git a/packages/logic/src/actions/turn/nation/che_불가침제의.ts b/packages/logic/src/actions/turn/nation/che_불가침제의.ts index f0802c0..8787639 100644 --- a/packages/logic/src/actions/turn/nation/che_불가침제의.ts +++ b/packages/logic/src/actions/turn/nation/che_불가침제의.ts @@ -1,22 +1,22 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; -import type { Constraint, ConstraintContext } from '../../../constraints/types.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; +import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js'; import { beChief, differentDestNation, disallowDiplomacyBetweenStatus, existsDestNation, notBeNeutral, -} from '../../../constraints/presets.js'; -import { allow, unknownOrDeny } from '../../../constraints/helpers.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import { allow, unknownOrDeny } from '@sammo-ts/logic/constraints/helpers.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import { createLogEffect } from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; -import type { ActionContextBuilder } from '../actionContext.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { createLogEffect } from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; +import type { ActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; import type { NationTurnCommandSpec } from './index.js'; export interface NonAggressionProposalArgs { diff --git a/packages/logic/src/actions/turn/nation/che_불가침파기제의.ts b/packages/logic/src/actions/turn/nation/che_불가침파기제의.ts index e66e08f..d9bfc6d 100644 --- a/packages/logic/src/actions/turn/nation/che_불가침파기제의.ts +++ b/packages/logic/src/actions/turn/nation/che_불가침파기제의.ts @@ -1,5 +1,5 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; -import type { Constraint, ConstraintContext } from '../../../constraints/types.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; +import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js'; import { allowDiplomacyBetweenStatus, beChief, @@ -7,16 +7,16 @@ import { notBeNeutral, occupiedCity, suppliedCity, -} from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import { createLogEffect } from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { createLogEffect } from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { NationTurnCommandSpec } from './index.js'; export interface NonAggressionCancelProposalArgs { diff --git a/packages/logic/src/actions/turn/nation/che_선전포고.ts b/packages/logic/src/actions/turn/nation/che_선전포고.ts index 2dc57b1..413bcc3 100644 --- a/packages/logic/src/actions/turn/nation/che_선전포고.ts +++ b/packages/logic/src/actions/turn/nation/che_선전포고.ts @@ -1,5 +1,5 @@ -import type { GeneralTriggerState } from '../../../domain/entities.js'; -import type { Constraint, ConstraintContext } from '../../../constraints/types.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; +import type { Constraint, ConstraintContext } from '@sammo-ts/logic/constraints/types.js'; import { beChief, disallowDiplomacyBetweenStatus, @@ -7,16 +7,16 @@ import { notBeNeutral, occupiedCity, suppliedCity, -} from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, -} from '../../engine.js'; -import { createDiplomacyPatchEffect, createLogEffect } from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { createDiplomacyPatchEffect, createLogEffect } from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { NationTurnCommandSpec } from './index.js'; export interface DeclareWarArgs { diff --git a/packages/logic/src/actions/turn/nation/che_의병모집.ts b/packages/logic/src/actions/turn/nation/che_의병모집.ts index b2a15b8..5ff5ac8 100644 --- a/packages/logic/src/actions/turn/nation/che_의병모집.ts +++ b/packages/logic/src/actions/turn/nation/che_의병모집.ts @@ -3,42 +3,42 @@ import type { GeneralTriggerState, StatBlock, TriggerValue, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, -} from '../../../constraints/types.js'; +} from '@sammo-ts/logic/constraints/types.js'; import { availableStrategicCommand, beChief, notBeNeutral, notOpeningPart, occupiedCity, -} from '../../../constraints/presets.js'; +} from '@sammo-ts/logic/constraints/presets.js'; import { GeneralActionPipeline, type GeneralActionModule, -} from '../../../triggers/general-action.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/triggers/general-action.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionEffect, GeneralActionOutcome, GeneralActionResolveContext, GeneralActionResolver, -} from '../../engine.js'; +} from '@sammo-ts/logic/actions/engine.js'; import { createGeneralAddEffect, -} from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; -import { buildRecruitmentGeneral } from '../general/recruitment.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; +import { buildRecruitmentGeneral } from '@sammo-ts/logic/actions/turn/general/recruitment.js'; import { JosaUtil } from '@sammo-ts/common'; -import type { ActionContextBuilder } from '../actionContext.js'; +import type { ActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import { buildAverageNationGeneralCount, buildNationSummary, resolveStartYear, -} from '../actionContextHelpers.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; +} from '@sammo-ts/logic/actions/turn/actionContextHelpers.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; import type { NationTurnCommandSpec } from './index.js'; export interface VolunteerRecruitArgs {} diff --git a/packages/logic/src/actions/turn/nation/che_포상.ts b/packages/logic/src/actions/turn/nation/che_포상.ts index 381e3dd..5010617 100644 --- a/packages/logic/src/actions/turn/nation/che_포상.ts +++ b/packages/logic/src/actions/turn/nation/che_포상.ts @@ -2,13 +2,13 @@ import type { General, GeneralTriggerState, Nation, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, RequirementKey, StateView, -} from '../../../constraints/types.js'; +} from '@sammo-ts/logic/constraints/types.js'; import { alwaysFail, beChief, @@ -19,24 +19,24 @@ import { reqNationGold, reqNationRice, suppliedCity, -} from '../../../constraints/presets.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/presets.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionEffect, GeneralActionOutcome, GeneralActionResolveContext, GeneralActionResolver, -} from '../../engine.js'; +} from '@sammo-ts/logic/actions/engine.js'; import { createGeneralPatchEffect, createLogEffect, createNationPatchEffect, -} from '../../engine.js'; -import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import { LogCategory, LogFormat, LogScope } from '@sammo-ts/logic/logging/types.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; import type { NationTurnCommandSpec } from './index.js'; import { JosaUtil } from '@sammo-ts/common'; -import type { ActionContextBuilder } from '../actionContext.js'; +import type { ActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; export interface AwardArgs { isGold: boolean; diff --git a/packages/logic/src/actions/turn/nation/index.ts b/packages/logic/src/actions/turn/nation/index.ts index 72a1a01..cbca48a 100644 --- a/packages/logic/src/actions/turn/nation/index.ts +++ b/packages/logic/src/actions/turn/nation/index.ts @@ -1,4 +1,4 @@ -import type { TurnCommandModule, TurnCommandSpecBase } from '../commandModule.js'; +import type { TurnCommandModule, TurnCommandSpecBase } from '@sammo-ts/logic/actions/turn/commandModule.js'; export const NATION_TURN_COMMAND_KEYS = [ '휴식', diff --git a/packages/logic/src/actions/turn/nation/휴식.ts b/packages/logic/src/actions/turn/nation/휴식.ts index 34e73a0..bbece22 100644 --- a/packages/logic/src/actions/turn/nation/휴식.ts +++ b/packages/logic/src/actions/turn/nation/휴식.ts @@ -1,18 +1,18 @@ import type { GeneralTriggerState, -} from '../../../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { Constraint, ConstraintContext, -} from '../../../constraints/types.js'; -import type { GeneralActionDefinition } from '../../definition.js'; +} from '@sammo-ts/logic/constraints/types.js'; +import type { GeneralActionDefinition } from '@sammo-ts/logic/actions/definition.js'; import type { GeneralActionOutcome, GeneralActionResolveContext, GeneralActionResolver, -} from '../../engine.js'; -import type { TurnCommandEnv } from '../commandEnv.js'; -import { defaultActionContextBuilder } from '../actionContext.js'; +} from '@sammo-ts/logic/actions/engine.js'; +import type { TurnCommandEnv } from '@sammo-ts/logic/actions/turn/commandEnv.js'; +import { defaultActionContextBuilder } from '@sammo-ts/logic/actions/turn/actionContext.js'; import type { NationTurnCommandSpec } from './index.js'; export interface NationRestArgs {} diff --git a/packages/logic/src/constraints/city.ts b/packages/logic/src/constraints/city.ts index 81ee711..a2e46f6 100644 --- a/packages/logic/src/constraints/city.ts +++ b/packages/logic/src/constraints/city.ts @@ -1,5 +1,5 @@ -import type { City, General } from '../domain/entities.js'; -import type { MapDefinition } from '../world/types.js'; +import type { City, General } from '@sammo-ts/logic/domain/entities.js'; +import type { MapDefinition } from '@sammo-ts/logic/world/types.js'; import { allow, parsePercent, diff --git a/packages/logic/src/constraints/general.ts b/packages/logic/src/constraints/general.ts index 39e20ea..599c134 100644 --- a/packages/logic/src/constraints/general.ts +++ b/packages/logic/src/constraints/general.ts @@ -1,4 +1,4 @@ -import type { General } from '../domain/entities.js'; +import type { General } from '@sammo-ts/logic/domain/entities.js'; import { allow, readDestGeneral, diff --git a/packages/logic/src/constraints/helpers.ts b/packages/logic/src/constraints/helpers.ts index a8f196b..135febd 100644 --- a/packages/logic/src/constraints/helpers.ts +++ b/packages/logic/src/constraints/helpers.ts @@ -1,4 +1,4 @@ -import type { City, General, Nation, TriggerValue } from '../domain/entities.js'; +import type { City, General, Nation, TriggerValue } from '@sammo-ts/logic/domain/entities.js'; import type { ConstraintContext, ConstraintResult, diff --git a/packages/logic/src/constraints/nation.ts b/packages/logic/src/constraints/nation.ts index 412ec1d..b0e0196 100644 --- a/packages/logic/src/constraints/nation.ts +++ b/packages/logic/src/constraints/nation.ts @@ -1,4 +1,4 @@ -import type { General, Nation } from '../domain/entities.js'; +import type { General, Nation } from '@sammo-ts/logic/domain/entities.js'; import { allow, readGeneral, diff --git a/packages/logic/src/ports/world.ts b/packages/logic/src/ports/world.ts index 5e2be65..6f6acf2 100644 --- a/packages/logic/src/ports/world.ts +++ b/packages/logic/src/ports/world.ts @@ -7,7 +7,7 @@ import type { GeneralId, Nation, NationId, -} from '../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; export interface GeneralRepository { getById(id: GeneralId): Promise; diff --git a/packages/logic/src/ports/worldSnapshot.ts b/packages/logic/src/ports/worldSnapshot.ts index ed97872..f016899 100644 --- a/packages/logic/src/ports/worldSnapshot.ts +++ b/packages/logic/src/ports/worldSnapshot.ts @@ -1,6 +1,6 @@ -import type { City, General, Nation, Troop } from '../domain/entities.js'; -import type { ScenarioConfig } from '../scenario/types.js'; -import type { ScenarioMeta } from '../world/types.js'; +import type { City, General, Nation, Troop } from '@sammo-ts/logic/domain/entities.js'; +import type { ScenarioConfig } from '@sammo-ts/logic/scenario/types.js'; +import type { ScenarioMeta } from '@sammo-ts/logic/world/types.js'; // DB에서 월드 상태를 로드할 때 사용하는 조회 인터페이스. export interface WorldStateSnapshotSource< diff --git a/packages/logic/src/triggers/general-action.ts b/packages/logic/src/triggers/general-action.ts index 414329c..f0839bb 100644 --- a/packages/logic/src/triggers/general-action.ts +++ b/packages/logic/src/triggers/general-action.ts @@ -1,4 +1,4 @@ -import type { GeneralTriggerState } from '../domain/entities.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; import { type GeneralActionContext, GeneralTriggerCaller } from './general.js'; export interface GeneralActionModule { diff --git a/packages/logic/src/triggers/general.ts b/packages/logic/src/triggers/general.ts index 4514f6f..f2a3369 100644 --- a/packages/logic/src/triggers/general.ts +++ b/packages/logic/src/triggers/general.ts @@ -1,6 +1,6 @@ -import type { General, GeneralTriggerState } from '../domain/entities.js'; +import type { General, GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; import type { RandomGenerator } from '@sammo-ts/common'; -import type { WorldStateRepository } from '../ports/world.js'; +import type { WorldStateRepository } from '@sammo-ts/logic/ports/world.js'; import { TriggerCaller, type Trigger } from './core.js'; export interface GeneralWorldView< diff --git a/packages/logic/src/triggers/generalTriggers/che_도시치료.ts b/packages/logic/src/triggers/generalTriggers/che_도시치료.ts index c66ee32..50f64e3 100644 --- a/packages/logic/src/triggers/generalTriggers/che_도시치료.ts +++ b/packages/logic/src/triggers/generalTriggers/che_도시치료.ts @@ -1,11 +1,11 @@ import { JosaUtil } from '@sammo-ts/common'; -import type { General, GeneralTriggerState } from '../../domain/entities.js'; -import { TriggerPriority } from '../core.js'; +import type { General, GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; +import { TriggerPriority } from '@sammo-ts/logic/triggers/core.js'; import { BaseGeneralTrigger, type GeneralTriggerContext, -} from '../general.js'; +} from '@sammo-ts/logic/triggers/general.js'; const HEAL_PROBABILITY = 0.5; const MIN_HEAL_INJURY = 10; diff --git a/packages/logic/src/triggers/special/domestic/che_발명.ts b/packages/logic/src/triggers/special/domestic/che_발명.ts index 37028c9..c2f02d8 100644 --- a/packages/logic/src/triggers/special/domestic/che_발명.ts +++ b/packages/logic/src/triggers/special/domestic/che_발명.ts @@ -1,4 +1,4 @@ -import type { SpecialActionModule } from '../types.js'; +import type { SpecialActionModule } from '@sammo-ts/logic/triggers/special/types.js'; // 내정 특기: 발명 export const specialModule: SpecialActionModule = { diff --git a/packages/logic/src/triggers/special/domestic/che_인덕.ts b/packages/logic/src/triggers/special/domestic/che_인덕.ts index 22b962a..40db71b 100644 --- a/packages/logic/src/triggers/special/domestic/che_인덕.ts +++ b/packages/logic/src/triggers/special/domestic/che_인덕.ts @@ -1,4 +1,4 @@ -import type { SpecialActionModule } from '../types.js'; +import type { SpecialActionModule } from '@sammo-ts/logic/triggers/special/types.js'; // 내정 특기: 인덕 export const specialModule: SpecialActionModule = { diff --git a/packages/logic/src/triggers/special/domestic/index.ts b/packages/logic/src/triggers/special/domestic/index.ts index 35896b7..af11c51 100644 --- a/packages/logic/src/triggers/special/domestic/index.ts +++ b/packages/logic/src/triggers/special/domestic/index.ts @@ -1,7 +1,7 @@ import type { SpecialActionModule, SpecialActionModuleExport, -} from '../types.js'; +} from '@sammo-ts/logic/triggers/special/types.js'; export const DOMESTIC_SPECIAL_KEYS = [ 'che_인덕', diff --git a/packages/logic/src/triggers/special/registry.ts b/packages/logic/src/triggers/special/registry.ts index 2321950..8a24e1d 100644 --- a/packages/logic/src/triggers/special/registry.ts +++ b/packages/logic/src/triggers/special/registry.ts @@ -1,9 +1,9 @@ -import type { GeneralTriggerState } from '../../domain/entities.js'; -import type { GeneralActionContext } from '../general.js'; -import type { GeneralActionModule } from '../general-action.js'; -import type { WarActionContext, WarActionModule } from '../../war/actions.js'; -import type { WarUnit } from '../../war/units.js'; -import type { WarTriggerCaller } from '../../war/triggers.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; +import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js'; +import type { GeneralActionModule } from '@sammo-ts/logic/triggers/general-action.js'; +import type { WarActionContext, WarActionModule } from '@sammo-ts/logic/war/actions.js'; +import type { WarUnit } from '@sammo-ts/logic/war/units.js'; +import type { WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js'; import type { SpecialActionKind, SpecialActionModule, diff --git a/packages/logic/src/triggers/special/types.ts b/packages/logic/src/triggers/special/types.ts index 9ad3a25..72bc8a2 100644 --- a/packages/logic/src/triggers/special/types.ts +++ b/packages/logic/src/triggers/special/types.ts @@ -1,6 +1,6 @@ -import type { GeneralTriggerState } from '../../domain/entities.js'; -import type { GeneralActionModule } from '../general-action.js'; -import type { WarActionModule } from '../../war/actions.js'; +import type { GeneralTriggerState } from '@sammo-ts/logic/domain/entities.js'; +import type { GeneralActionModule } from '@sammo-ts/logic/triggers/general-action.js'; +import type { WarActionModule } from '@sammo-ts/logic/war/actions.js'; export type SpecialActionKind = 'domestic' | 'war'; diff --git a/packages/logic/src/triggers/special/war/che_의술.ts b/packages/logic/src/triggers/special/war/che_의술.ts index 20076c1..f01f88a 100644 --- a/packages/logic/src/triggers/special/war/che_의술.ts +++ b/packages/logic/src/triggers/special/war/che_의술.ts @@ -1,8 +1,8 @@ -import { GeneralTriggerCaller } from '../../general.js'; -import type { WarActionContext } from '../../../war/actions.js'; -import { CheUisulCityHealTrigger } from '../../generalTriggers/che_도시치료.js'; -import { triggerModule as cheUisulTriggerModule } from '../../../war/triggers/che_의술.js'; -import type { SpecialActionModule } from '../types.js'; +import { GeneralTriggerCaller } from '@sammo-ts/logic/triggers/general.js'; +import type { WarActionContext } from '@sammo-ts/logic/war/actions.js'; +import { CheUisulCityHealTrigger } from '@sammo-ts/logic/triggers/generalTriggers/che_도시치료.js'; +import { triggerModule as cheUisulTriggerModule } from '@sammo-ts/logic/war/triggers/che_의술.js'; +import type { SpecialActionModule } from '@sammo-ts/logic/triggers/special/types.js'; // 전투 특기: 의술 export const specialModule: SpecialActionModule = { diff --git a/packages/logic/src/triggers/special/war/che_징병.ts b/packages/logic/src/triggers/special/war/che_징병.ts index 08c4df4..0a3518a 100644 --- a/packages/logic/src/triggers/special/war/che_징병.ts +++ b/packages/logic/src/triggers/special/war/che_징병.ts @@ -1,6 +1,6 @@ -import type { GeneralActionContext } from '../../general.js'; -import type { WarActionContext } from '../../../war/actions.js'; -import type { SpecialActionModule } from '../types.js'; +import type { GeneralActionContext } from '@sammo-ts/logic/triggers/general.js'; +import type { WarActionContext } from '@sammo-ts/logic/war/actions.js'; +import type { SpecialActionModule } from '@sammo-ts/logic/triggers/special/types.js'; const RECRUIT_TRAIN = 70; const CONSCRIPT_TRAIN = 84; diff --git a/packages/logic/src/triggers/special/war/index.ts b/packages/logic/src/triggers/special/war/index.ts index d0949e9..e79e9b2 100644 --- a/packages/logic/src/triggers/special/war/index.ts +++ b/packages/logic/src/triggers/special/war/index.ts @@ -1,7 +1,7 @@ import type { SpecialActionModule, SpecialActionModuleExport, -} from '../types.js'; +} from '@sammo-ts/logic/triggers/special/types.js'; export const WAR_SPECIAL_KEYS = [ 'che_의술', diff --git a/packages/logic/src/war/actions.ts b/packages/logic/src/war/actions.ts index 45b7e6b..26ef09c 100644 --- a/packages/logic/src/war/actions.ts +++ b/packages/logic/src/war/actions.ts @@ -5,8 +5,8 @@ import type { General, GeneralTriggerState, Nation, -} from '../domain/entities.js'; -import type { ActionLogger } from '../logging/actionLogger.js'; +} from '@sammo-ts/logic/domain/entities.js'; +import type { ActionLogger } from '@sammo-ts/logic/logging/actionLogger.js'; import type { WarUnit } from './units.js'; import { WarTriggerCaller } from './triggers.js'; diff --git a/packages/logic/src/war/aftermath.ts b/packages/logic/src/war/aftermath.ts index cbc51ae..a5c32b1 100644 --- a/packages/logic/src/war/aftermath.ts +++ b/packages/logic/src/war/aftermath.ts @@ -9,14 +9,14 @@ import type { General, GeneralTriggerState, Nation, -} from '../domain/entities.js'; -import { ActionLogger } from '../logging/actionLogger.js'; -import { LogFormat, type LogEntryDraft } from '../logging/types.js'; +} from '@sammo-ts/logic/domain/entities.js'; +import { ActionLogger } from '@sammo-ts/logic/logging/actionLogger.js'; +import { LogFormat, type LogEntryDraft } from '@sammo-ts/logic/logging/types.js'; import { buildCrewTypeIndex, getTechCost, getTechLevel, -} from '../world/unitSet.js'; +} from '@sammo-ts/logic/world/unitSet.js'; import type { WarUnitReport } from './types.js'; import type { ConquerCityOutcome, diff --git a/packages/logic/src/war/crewType.ts b/packages/logic/src/war/crewType.ts index f33e079..c7a76af 100644 --- a/packages/logic/src/war/crewType.ts +++ b/packages/logic/src/war/crewType.ts @@ -1,4 +1,4 @@ -import type { CrewTypeDefinition } from '../world/types.js'; +import type { CrewTypeDefinition } from '@sammo-ts/logic/world/types.js'; // 전투 계산에 필요한 병종 정보 래퍼. export class WarCrewType { diff --git a/packages/logic/src/war/engine.ts b/packages/logic/src/war/engine.ts index a60ded3..10f9159 100644 --- a/packages/logic/src/war/engine.ts +++ b/packages/logic/src/war/engine.ts @@ -8,10 +8,10 @@ import type { City, General, GeneralTriggerState, -} from '../domain/entities.js'; -import { ActionLogger } from '../logging/actionLogger.js'; -import { LogFormat } from '../logging/types.js'; -import { buildCrewTypeIndex as buildCrewTypeDefinitionIndex } from '../world/unitSet.js'; +} from '@sammo-ts/logic/domain/entities.js'; +import { ActionLogger } from '@sammo-ts/logic/logging/actionLogger.js'; +import { LogFormat } from '@sammo-ts/logic/logging/types.js'; +import { buildCrewTypeIndex as buildCrewTypeDefinitionIndex } from '@sammo-ts/logic/world/unitSet.js'; import { WarActionPipeline } from './actions.js'; import { WarCrewType } from './crewType.js'; import { diff --git a/packages/logic/src/war/triggers.ts b/packages/logic/src/war/triggers.ts index 5379730..6b604b9 100644 --- a/packages/logic/src/war/triggers.ts +++ b/packages/logic/src/war/triggers.ts @@ -1,6 +1,6 @@ import type { RandUtil } from '@sammo-ts/common'; -import { TriggerCaller, type Trigger } from '../triggers/core.js'; +import { TriggerCaller, type Trigger } from '@sammo-ts/logic/triggers/core.js'; import type { WarUnit } from './units.js'; export interface WarTriggerContext { diff --git a/packages/logic/src/war/triggers/che_의술.ts b/packages/logic/src/war/triggers/che_의술.ts index bb70798..70195a7 100644 --- a/packages/logic/src/war/triggers/che_의술.ts +++ b/packages/logic/src/war/triggers/che_의술.ts @@ -1,7 +1,7 @@ -import { LogFormat } from '../../logging/types.js'; -import { TriggerPriority } from '../../triggers/core.js'; -import { BaseWarUnitTrigger, WarTriggerCaller } from '../triggers.js'; -import { WarUnitGeneral, type WarUnit } from '../units.js'; +import { LogFormat } from '@sammo-ts/logic/logging/types.js'; +import { TriggerPriority } from '@sammo-ts/logic/triggers/core.js'; +import { BaseWarUnitTrigger, WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js'; +import { WarUnitGeneral, type WarUnit } from '@sammo-ts/logic/war/units.js'; import type { WarTriggerModule } from './types.js'; // 의술: 치료 시도 diff --git a/packages/logic/src/war/triggers/che_필살.ts b/packages/logic/src/war/triggers/che_필살.ts index 1db4391..6e2b773 100644 --- a/packages/logic/src/war/triggers/che_필살.ts +++ b/packages/logic/src/war/triggers/che_필살.ts @@ -1,7 +1,7 @@ -import { LogFormat } from '../../logging/types.js'; -import { TriggerPriority } from '../../triggers/core.js'; -import { BaseWarUnitTrigger, WarTriggerCaller } from '../triggers.js'; -import { WarUnitGeneral, type WarUnit } from '../units.js'; +import { LogFormat } from '@sammo-ts/logic/logging/types.js'; +import { TriggerPriority } from '@sammo-ts/logic/triggers/core.js'; +import { BaseWarUnitTrigger, WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js'; +import { WarUnitGeneral, type WarUnit } from '@sammo-ts/logic/war/units.js'; import type { WarTriggerModule } from './types.js'; // 기본 필살: 시도 단계 diff --git a/packages/logic/src/war/triggers/index.ts b/packages/logic/src/war/triggers/index.ts index 05acbb6..2c52fe5 100644 --- a/packages/logic/src/war/triggers/index.ts +++ b/packages/logic/src/war/triggers/index.ts @@ -1,5 +1,5 @@ import type { WarTriggerModule, WarTriggerModuleExport } from './types.js'; -import type { WarTriggerRegistry } from '../triggers.js'; +import type { WarTriggerRegistry } from '@sammo-ts/logic/war/triggers.js'; export const WAR_TRIGGER_KEYS = [ 'che_필살', diff --git a/packages/logic/src/war/triggers/types.ts b/packages/logic/src/war/triggers/types.ts index e9e8ca0..3472f4f 100644 --- a/packages/logic/src/war/triggers/types.ts +++ b/packages/logic/src/war/triggers/types.ts @@ -1,5 +1,5 @@ -import type { WarTriggerCaller } from '../triggers.js'; -import type { WarUnit } from '../units.js'; +import type { WarTriggerCaller } from '@sammo-ts/logic/war/triggers.js'; +import type { WarUnit } from '@sammo-ts/logic/war/units.js'; export interface WarTriggerModule { key: string; diff --git a/packages/logic/src/war/types.ts b/packages/logic/src/war/types.ts index a6f18ee..edbc594 100644 --- a/packages/logic/src/war/types.ts +++ b/packages/logic/src/war/types.ts @@ -5,10 +5,10 @@ import type { General, GeneralTriggerState, Nation, -} from '../domain/entities.js'; -import type { ActionLogger } from '../logging/actionLogger.js'; -import type { LogEntryDraft } from '../logging/types.js'; -import type { UnitSetDefinition } from '../world/types.js'; +} from '@sammo-ts/logic/domain/entities.js'; +import type { ActionLogger } from '@sammo-ts/logic/logging/actionLogger.js'; +import type { LogEntryDraft } from '@sammo-ts/logic/logging/types.js'; +import type { UnitSetDefinition } from '@sammo-ts/logic/world/types.js'; import type { WarActionModule } from './actions.js'; import type { WarTriggerRegistry } from './triggers.js'; diff --git a/packages/logic/src/war/units.ts b/packages/logic/src/war/units.ts index 437d38a..451b4db 100644 --- a/packages/logic/src/war/units.ts +++ b/packages/logic/src/war/units.ts @@ -7,10 +7,10 @@ import type { Nation, StatBlock, TriggerValue, -} from '../domain/entities.js'; -import type { ActionLogger } from '../logging/actionLogger.js'; -import { LogFormat } from '../logging/types.js'; -import { getTechAbility, getTechCost } from '../world/unitSet.js'; +} from '@sammo-ts/logic/domain/entities.js'; +import type { ActionLogger } from '@sammo-ts/logic/logging/actionLogger.js'; +import { LogFormat } from '@sammo-ts/logic/logging/types.js'; +import { getTechAbility, getTechCost } from '@sammo-ts/logic/world/unitSet.js'; import { WarActionPipeline, type WarActionContext } from './actions.js'; import type { WarEngineConfig } from './types.js'; import { WarCrewType } from './crewType.js'; diff --git a/packages/logic/src/war/utils.ts b/packages/logic/src/war/utils.ts index 9aed950..c732658 100644 --- a/packages/logic/src/war/utils.ts +++ b/packages/logic/src/war/utils.ts @@ -1,4 +1,4 @@ -import type { TriggerValue } from '../domain/entities.js'; +import type { TriggerValue } from '@sammo-ts/logic/domain/entities.js'; const DEX_LEVEL_THRESHOLDS = [ 0, diff --git a/packages/logic/src/world/bootstrap.ts b/packages/logic/src/world/bootstrap.ts index 7fb02f5..93c0a42 100644 --- a/packages/logic/src/world/bootstrap.ts +++ b/packages/logic/src/world/bootstrap.ts @@ -4,11 +4,11 @@ import type { GeneralTriggerState, Nation, TriggerValue, -} from '../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { ScenarioDefinition, ScenarioGeneral, -} from '../scenario/types.js'; +} from '@sammo-ts/logic/scenario/types.js'; import type { CitySeed, GeneralSeed, diff --git a/packages/logic/src/world/loader.ts b/packages/logic/src/world/loader.ts index 18199ad..f7551fc 100644 --- a/packages/logic/src/world/loader.ts +++ b/packages/logic/src/world/loader.ts @@ -1,6 +1,6 @@ -import type { City, General, Nation, Troop } from '../domain/entities.js'; -import type { ScenarioConfig, ScenarioDiplomacy } from '../scenario/types.js'; -import type { ScenarioConfigSource, WorldStateSnapshotSource } from '../ports/worldSnapshot.js'; +import type { City, General, Nation, Troop } from '@sammo-ts/logic/domain/entities.js'; +import type { ScenarioConfig, ScenarioDiplomacy } from '@sammo-ts/logic/scenario/types.js'; +import type { ScenarioConfigSource, WorldStateSnapshotSource } from '@sammo-ts/logic/ports/worldSnapshot.js'; import type { MapDefinition, ScenarioMeta, diff --git a/packages/logic/src/world/types.ts b/packages/logic/src/world/types.ts index 894bb49..c432edb 100644 --- a/packages/logic/src/world/types.ts +++ b/packages/logic/src/world/types.ts @@ -4,11 +4,11 @@ import type { Nation, StatBlock, Troop, -} from '../domain/entities.js'; +} from '@sammo-ts/logic/domain/entities.js'; import type { ScenarioConfig, ScenarioDiplomacy, -} from '../scenario/types.js'; +} from '@sammo-ts/logic/scenario/types.js'; export interface ScenarioMeta { title: string; diff --git a/packages/logic/src/world/unitSet.ts b/packages/logic/src/world/unitSet.ts index 94e8aa5..69e93bb 100644 --- a/packages/logic/src/world/unitSet.ts +++ b/packages/logic/src/world/unitSet.ts @@ -1,4 +1,4 @@ -import type { City, General, Nation } from '../domain/entities.js'; +import type { City, General, Nation } from '@sammo-ts/logic/domain/entities.js'; import type { CrewTypeDefinition, CrewTypeRequirement,