From 2e2ddebec4f0f8d3e8b784aa4f97c2c3bdf8a17e Mon Sep 17 00:00:00 2001 From: hypercross Date: Thu, 23 Apr 2026 09:37:05 +0800 Subject: [PATCH] refactor(slay-the-spire-like): simplify desert trigger registration Remove the intermediate `effect.ts` file and consolidate the `addTriggers` logic directly into the desert triggers index file. --- .../data/desert/triggers/effect.ts | 13 ------------- .../data/desert/triggers/index.ts | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 src/samples/slay-the-spire-like/data/desert/triggers/effect.ts diff --git a/src/samples/slay-the-spire-like/data/desert/triggers/effect.ts b/src/samples/slay-the-spire-like/data/desert/triggers/effect.ts deleted file mode 100644 index d94e69a..0000000 --- a/src/samples/slay-the-spire-like/data/desert/triggers/effect.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { IRunContext } from "@/samples/slay-the-spire-like/system/combat/types"; -import { Triggers } from "@/samples/slay-the-spire-like/system/combat/triggers"; -import { addInstantEffectTriggers } from "./instant"; -import { addDamageTriggers } from "./damage"; -import { addTurnStartTriggers } from "./turn-start"; -import { addCardEventTriggers } from "./card-events"; - -export function addDesertTriggers(triggers: Triggers, run: IRunContext) { - addInstantEffectTriggers(triggers); - addDamageTriggers(triggers); - addTurnStartTriggers(triggers); - addCardEventTriggers(triggers, run); -} diff --git a/src/samples/slay-the-spire-like/data/desert/triggers/index.ts b/src/samples/slay-the-spire-like/data/desert/triggers/index.ts index a98c67b..1224643 100644 --- a/src/samples/slay-the-spire-like/data/desert/triggers/index.ts +++ b/src/samples/slay-the-spire-like/data/desert/triggers/index.ts @@ -1 +1,15 @@ -export { addDesertTriggers as addTriggers } from './effect'; +import { addInstantEffectTriggers } from "./instant"; +import { addDamageTriggers } from "./damage"; +import { addTurnStartTriggers } from "./turn-start"; +import { addCardEventTriggers } from "./card-events"; +import { + IRunContext, + Triggers, +} from "@/samples/slay-the-spire-like/system/combat"; + +export function addTriggers(triggers: Triggers, run: IRunContext) { + addInstantEffectTriggers(triggers); + addDamageTriggers(triggers); + addTurnStartTriggers(triggers); + addCardEventTriggers(triggers, run); +}