src/core/game.ts

@@ -15,8 +15,8 @@ import { Mulberry32RNG, ReadonlyRNG, RNG } from "@/utils/rng";
 export interface IGameContext<TState extends Record<string, unknown> = {}> {
   get value(): TState;
   get rng(): ReadonlyRNG;
-  produce(fn: (draft: TState) => undefined): void;
+  produce(fn: (draft: TState) => void): void;
-  produceAsync(fn: (draft: TState) => undefined): Promise<void>;
+  produceAsync(fn: (draft: TState) => void): Promise<void>;
   run<T>(input: string): Promise<CommandResult<T>>;
   runParsed<T>(command: Command): Promise<CommandResult<T>>;
   prompt: <TResult, TArgs extends any[] = any[]>(
@@ -51,10 +51,10 @@ export function createGameContext<TState extends Record<string, unknown> = {}>(
     get rng() {
       return this._rng;
     },
-    produce(fn: (draft: TState) => undefined) {
+    produce(fn) {
       return state.produce(fn);
     },
-    produceAsync(fn: (draft: TState) => undefined) {
+    produceAsync(fn) {
       return state.produceAsync(fn);
     },
     run<T>(input: string) {

src/samples/slay-the-spire-like/system/combat/effects.ts

@@ -107,16 +107,12 @@ export function* getEffectTargets(
   target: CardEffectTarget | EffectTarget,
   game: CombatGameContext,
   targetId?: string,
-  sourceEntityKey: "player" | string = "player",
 ) {
   if (target === "all" || target === "team") {
     for (const enemy of getAliveEnemies(game.value)) {
       yield enemy;
     }
   } else if (target === "self") {
-    const entity = getCombatEntity(game.value, sourceEntityKey);
-    if (entity) yield entity;
-  } else if (target === "player") {
     yield game.value.player;
   } else if (target === "target") {
     if (!targetId) return;

src/samples/slay-the-spire-like/system/combat/triggers.ts

@@ -65,9 +65,9 @@ export function createTriggers(run: IRunContext) {
       for (const cardId of Object.values(regions.hand.childIds)) {
         await triggers.onCardDiscarded.execute(ctx.game, { cardId });
       }
-      await ctx.game.produceAsync((draft) => {
+      await ctx.game.produceAsync(
-        draft.player.energy = draft.player.maxEnergy;
+        (draft) => (draft.player.energy = draft.player.maxEnergy),
-      });
+      );
       await triggers.onDraw.execute(ctx.game, { count: 5 });
     }),
     onShuffle: createTrigger("onShuffle", async (ctx) => {
@@ -98,12 +98,7 @@ export function createTriggers(run: IRunContext) {
       for (const { trigger, target, effects } of card.cardData.effects) {
         if (trigger !== "onPlay") continue;
         for (const [effect, stacks] of effects)
-          for (const entity of getEffectTargets(
+          for (const entity of getEffectTargets(target, ctx.game, ctx.targetId))
-            target,
-            ctx.game,
-            ctx.targetId,
-            source,
-          ))
             await triggers.onEffectApplied.execute(ctx.game, {
               effect,
               entityKey: entity.id,
@@ -126,12 +121,7 @@ export function createTriggers(run: IRunContext) {
       for (const { trigger, target, effects } of card.cardData.effects) {
         if (trigger !== "onDiscard") continue;
         for (const [effect, stacks] of effects)
-          for (const entity of getEffectTargets(
+          for (const entity of getEffectTargets(target, ctx.game))
-            target,
-            ctx.game,
-            undefined,
-            source,
-          ))
             await triggers.onEffectApplied.execute(ctx.game, {
               effect,
               entityKey: entity.id,
@@ -152,12 +142,7 @@ export function createTriggers(run: IRunContext) {
       for (const { trigger, target, effects } of card.cardData.effects) {
         if (trigger !== "onDraw") continue;
         for (const [effect, stacks] of effects)
-          for (const entity of getEffectTargets(
+          for (const entity of getEffectTargets(target, ctx.game))
-            target,
-            ctx.game,
-            undefined,
-            source,
-          ))
             await triggers.onEffectApplied.execute(ctx.game, {
               effect,
               entityKey: entity.id,
@@ -251,12 +236,7 @@ export function createTriggers(run: IRunContext) {
 
       const source = ctx.sourceEntityKey ?? enemy.id;
       for (const [target, effect, stacks] of intent.effects) {
-        for (const entity of getEffectTargets(
+        for (const entity of getEffectTargets(target, ctx.game))
-          target,
-          ctx.game,
-          undefined,
-          source,
-        ))
           await triggers.onEffectApplied.execute(ctx.game, {
             effect,
             entityKey: entity.id,

src/utils/mutable-signal.ts

@@ -1,5 +1,5 @@
-import { Signal, SignalOptions } from "@preact/signals-core";
+import {Signal, SignalOptions} from '@preact/signals-core';
-import { create } from "mutative";
+import {create} from 'mutative';
 
 export class MutableSignal<T> extends Signal<T> {
   private _interruptions: Promise<void>[] = [];
@@ -7,7 +7,7 @@ export class MutableSignal<T> extends Signal<T> {
   public constructor(t?: T, options?: SignalOptions<T>) {
     super(t, options);
   }
-  produce(fn: (draft: T) => undefined) {
+  produce(fn: (draft: T) => void) {
     this.value = create(this.value, fn);
   }
 
@@ -30,16 +30,13 @@ export class MutableSignal<T> extends Signal<T> {
    * 异步版本的 produce。会先等待所有通过 `addInterruption` 添加的 Promise 完成，
    * 然后再更新状态。适用于需要在状态更新前播放动画的场景。
    */
-  async produceAsync(fn: (draft: T) => undefined): Promise<void> {
+  async produceAsync(fn: (draft: T) => void): Promise<void> {
     await Promise.allSettled(this._interruptions);
     this._interruptions = [];
     this.produce(fn);
   }
 }
 
-export function mutableSignal<T>(
+export function mutableSignal<T>(initial?: T, options?: SignalOptions<T>): MutableSignal<T> {
-  initial?: T,
-  options?: SignalOptions<T>,
-): MutableSignal<T> {
   return new MutableSignal<T>(initial, options);
 }

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

@@ -382,6 +382,12 @@ describe("desert triggers", () => {
         }),
       );
       const triggers = getTriggers();
+      const stormEffect = createEffect("storm", "permanent");
+
+      ctx._state.produce((draft) => {
+        const enemy = draft.enemies[0];
+        enemy.effects.storm = { data: stormEffect, stacks: 2 };
+      });
 
       await triggers.onEnemyIntent.execute(ctx, { enemyId: "风暴之灵-0" });