src/samples/slay-the-spire-like/data/desert/triggers/damage.ts

@@ -55,6 +55,25 @@ export function addDamageTriggers(triggers: Triggers) {
     await next();
   });
 
+  // spike: damage attacker
+  triggers.onDamage.use(async (ctx, next) => {
+    await next();
+
+    if (ctx.amount - (ctx.prevented ?? 0) <= 0) return;
+
+    const entity = getCombatEntity(ctx.game.value, ctx.entityId);
+    if (!entity || !entity.isAlive) return;
+
+    const spike = entity.effects.spike?.stacks ?? 0;
+    if (spike > 0 && ctx.sourceEntityId) {
+      await triggers.onDamage.execute(ctx.game, {
+        entityId: ctx.sourceEntityId,
+        amount: spike,
+        sourceEntityId: ctx.entityId,
+      });
+    }
+  });
+
   // energyDrain: player loses energy when enemy takes damage
   triggers.onDamage.use(async (ctx, next) => {
     const entity = getCombatEntity(ctx.game.value, ctx.entityId);

src/samples/slay-the-spire-like/data/desert/triggers/instant.ts

@@ -1,8 +1,5 @@
 import { Triggers } from "@/samples/slay-the-spire-like/system/combat/triggers";
-import {
+import { addEntityEffect } from "@/samples/slay-the-spire-like/system/combat/effects";
-  addEntityEffect,
-  getCombatEntity,
-} from "@/samples/slay-the-spire-like/system/combat/effects";
 import { moveToRegion } from "@/core/region";
 import { CombatGameContext } from "@/samples/slay-the-spire-like/system/combat/types";
 import { GameCard } from "@/samples/slay-the-spire-like/system/deck";
@@ -100,16 +97,6 @@ export function addInstantEffectTriggers(triggers: Triggers) {
         amount: ctx.stacks,
         sourceEntityId: ctx.sourceEntityId,
       });
-
-      const entity = getCombatEntity(ctx.game.value, ctx.entityId);
-      const spike = entity?.effects.spike?.stacks ?? 0;
-      if (spike > 0 && ctx.sourceEntityId) {
-        await triggers.onDamage.execute(ctx.game, {
-          entityId: ctx.sourceEntityId,
-          amount: spike,
-          sourceEntityId: ctx.entityId,
-        });
-      }
     } else if (ctx.effect.id === "draw") {
       await triggers.onDraw.execute(ctx.game, { count: ctx.stacks });
     } else if (ctx.effect.id === "gainEnergy") {

tests/samples/slay-the-spire-like/combat/triggers.test.ts

@@ -352,17 +352,15 @@ describe("desert triggers", () => {
       );
       const triggers = getTriggers();
       const spikeEffect = createEffect("spike", "permanent");
-      const attackEffect = createEffect("attack", "instant");
 
       ctx._state.produce((draft) => {
         const enemy = draft.enemies[0];
         enemy.effects.spike = { data: spikeEffect, stacks: 3 };
       });
 
-      await triggers.onEffectApplied.execute(ctx, {
+      await triggers.onDamage.execute(ctx, {
-        effect: attackEffect,
         entityId: "仙人掌怪-0",
-        stacks: 5,
+        amount: 5,
         sourceEntityId: "player",
       });