커맨드 엔진 실행에서 alternative 추가

This commit is contained in:
2026-01-08 14:39:45 +00:00
parent bc9c0fd717
commit e91fe06762
4 changed files with 196 additions and 2 deletions
+12 -1
View File
@@ -97,6 +97,10 @@ export type GeneralActionEffect<TriggerState extends GeneralTriggerState = Gener
export interface GeneralActionOutcome<TriggerState extends GeneralTriggerState = GeneralTriggerState> {
effects: GeneralActionEffect<TriggerState>[];
alternative?: {
commandKey: string;
args: unknown;
};
}
export interface GeneralActionResolver<TriggerState extends GeneralTriggerState = GeneralTriggerState, Args = unknown> {
@@ -127,6 +131,10 @@ export interface GeneralActionResolution {
cityId?: CityId;
nationId?: NationId;
};
alternative?: {
commandKey: string;
args: unknown;
};
}
export const createGeneralPatchEffect = <TriggerState extends GeneralTriggerState = GeneralTriggerState>(
@@ -205,6 +213,7 @@ export const resolveGeneralAction = <TriggerState extends GeneralTriggerState =
};
const pendingEffects: GeneralActionEffect[] = [];
let outcome: GeneralActionOutcome<TriggerState> | undefined;
const [nextWorld, worldPatches] = produceWithPatches(
{
general: context.general,
@@ -252,9 +261,10 @@ export const resolveGeneralAction = <TriggerState extends GeneralTriggerState =
}
};
const outcome = resolver.resolve(
outcome = resolver.resolve(
{
...context,
// ...
general: castDraft(draft.general),
city: castDraft(draft.city),
nation: castDraft(draft.nation),
@@ -345,6 +355,7 @@ export const resolveGeneralAction = <TriggerState extends GeneralTriggerState =
nextTurnAt,
logs,
effects: pendingEffects,
...(outcome?.alternative ? { alternative: outcome.alternative } : {}),
};
if (nextWorld.city) {
resolution.city = nextWorld.city as City;