diff --git a/packages/logic/src/actions/turn/general/index.ts b/packages/logic/src/actions/turn/general/index.ts index 838b5d5..74fb48b 100644 --- a/packages/logic/src/actions/turn/general/index.ts +++ b/packages/logic/src/actions/turn/general/index.ts @@ -16,7 +16,6 @@ import type * as DefenceUpgradeModule from './che_수비강화.js'; import type * as WallRepairModule from './che_성벽보수.js'; import type * as FireAttackModule from './che_화계.js'; import type * as TalentScoutModule from './che_인재탐색.js'; -import type * as VolunteerRecruitModule from './che_의병모집.js'; import type * as RecruitModule from './che_징병.js'; import type * as RestModule from './휴식.js'; @@ -37,7 +36,6 @@ export type GeneralTurnCommandModule = | typeof WallRepairModule | typeof FireAttackModule | typeof TalentScoutModule - | typeof VolunteerRecruitModule | typeof RecruitModule | typeof RestModule; @@ -60,7 +58,6 @@ const defaultImporters = { che_성벽보수: async () => import('./che_성벽보수.js'), che_화계: async () => import('./che_화계.js'), che_인재탐색: async () => import('./che_인재탐색.js'), - che_의병모집: async () => import('./che_의병모집.js'), che_징병: async () => import('./che_징병.js'), 휴식: async () => import('./휴식.js'), } as const satisfies Record; @@ -178,11 +175,6 @@ export { ActionResolver as TalentScoutActionResolver, CommandResolver as TalentScoutCommandResolver, } from './che_인재탐색.js'; -export { - ActionDefinition as VolunteerRecruitActionDefinition, - ActionResolver as VolunteerRecruitActionResolver, - CommandResolver as VolunteerRecruitCommandResolver, -} from './che_의병모집.js'; export { ActionDefinition as RecruitActionDefinition, ActionResolver as RecruitActionResolver, diff --git a/packages/logic/src/actions/turn/general/che_의병모집.ts b/packages/logic/src/actions/turn/nation/che_의병모집.ts similarity index 98% rename from packages/logic/src/actions/turn/general/che_의병모집.ts rename to packages/logic/src/actions/turn/nation/che_의병모집.ts index b324ff5..0f0c432 100644 --- a/packages/logic/src/actions/turn/general/che_의병모집.ts +++ b/packages/logic/src/actions/turn/nation/che_의병모집.ts @@ -29,10 +29,10 @@ import { createGeneralAddEffect, } from '../../engine.js'; import { LogCategory, LogFormat, LogScope } from '../../../logging/types.js'; -import { buildRecruitmentGeneral } from './recruitment.js'; +import { buildRecruitmentGeneral } from '../general/recruitment.js'; import { JosaUtil } from '@sammo-ts/common'; import type { TurnCommandEnv } from '../commandEnv.js'; -import type { GeneralTurnCommandSpec } from './index.js'; +import type { NationTurnCommandSpec } from './index.js'; export interface VolunteerRecruitArgs {} @@ -417,7 +417,7 @@ export class ActionDefinition< } } -export const commandSpec: GeneralTurnCommandSpec = { +export const commandSpec: NationTurnCommandSpec = { key: 'che_의병모집', category: '전략', reqArg: false, diff --git a/packages/logic/src/actions/turn/nation/index.ts b/packages/logic/src/actions/turn/nation/index.ts index 703d949..5354e2f 100644 --- a/packages/logic/src/actions/turn/nation/index.ts +++ b/packages/logic/src/actions/turn/nation/index.ts @@ -5,6 +5,7 @@ import type * as AwardModule from './che_포상.js'; import type * as AssignmentModule from './che_발령.js'; import type * as DeclarationModule from './che_선전포고.js'; import type * as NonAggressionProposalModule from './che_불가침제의.js'; +import type * as VolunteerRecruitModule from './che_의병모집.js'; @@ -13,7 +14,8 @@ export type NationTurnCommandModule = | typeof AwardModule | typeof AssignmentModule | typeof DeclarationModule - | typeof NonAggressionProposalModule; + | typeof NonAggressionProposalModule + | typeof VolunteerRecruitModule; export type NationTurnCommandImporter = () => Promise; @@ -23,6 +25,7 @@ const defaultImporters = { che_발령: async () => import('./che_발령.js'), che_선전포고: async () => import('./che_선전포고.js'), che_불가침제의: async () => import('./che_불가침제의.js'), + che_의병모집: async () => import('./che_의병모집.js'), } as const satisfies Record; export type NationTurnCommandKey = keyof typeof defaultImporters; @@ -101,3 +104,8 @@ export { export { ActionDefinition as NonAggressionProposalActionDefinition, } from './che_불가침제의.js'; +export { + ActionDefinition as VolunteerRecruitActionDefinition, + ActionResolver as VolunteerRecruitActionResolver, + CommandResolver as VolunteerRecruitCommandResolver, +} from './che_의병모집.js'; diff --git a/resources/turn-commands/default.json b/resources/turn-commands/default.json index 9ff164c..fe35262 100644 --- a/resources/turn-commands/default.json +++ b/resources/turn-commands/default.json @@ -16,7 +16,6 @@ "che_성벽보수", "che_화계", "che_인재탐색", - "che_의병모집", "che_징병", "휴식" ], @@ -25,6 +24,7 @@ "che_포상", "che_발령", "che_선전포고", - "che_불가침제의" + "che_불가침제의", + "che_의병모집" ] }