@bct-app/game-engine 0.1.13 → 0.1.15

package/dist/index.d.mts

@@ -1,9 +1,5 @@
 import { TPlayer, TOperation, TAbility, TPopulatedCharacter, TTimeline, TTriggerPhase, TEffect, TTargetRef, TPlayerReminder, TReminder } from '@bct-app/game-model';
 
-type TLifetimeStatusResolver = (input: {
-    player: TPlayer;
-    status: 'POISONED' | 'DRUNK' | 'HEALTHY';
-}) => boolean;
 type TLifetimeCustomResolver = (input: {
     key: string;
     payload?: unknown;
@@ -19,10 +15,9 @@ type TApplyOperationToPlayersArgs = {
     characters: TPopulatedCharacter[];
     timelines: TTimeline[];
     timelineIndexAtNow?: number;
-    statusResolver?: TLifetimeStatusResolver;
     customResolver?: TLifetimeCustomResolver;
 };
-declare const applyOperationToPlayers: ({ players, operations, allAbilities, characters, timelines, timelineIndexAtNow, statusResolver, customResolver, }: TApplyOperationToPlayersArgs) => TPlayer[];
+declare const applyOperationToPlayers: ({ players, operations, allAbilities, characters, timelines, timelineIndexAtNow, customResolver, }: TApplyOperationToPlayersArgs) => TPlayer[];
 
 type TCanInvokeAbilityCustomResolver = (atom: {
     resolverId: string;

package/dist/index.d.ts

@@ -1,9 +1,5 @@
 import { TPlayer, TOperation, TAbility, TPopulatedCharacter, TTimeline, TTriggerPhase, TEffect, TTargetRef, TPlayerReminder, TReminder } from '@bct-app/game-model';
 
-type TLifetimeStatusResolver = (input: {
-    player: TPlayer;
-    status: 'POISONED' | 'DRUNK' | 'HEALTHY';
-}) => boolean;
 type TLifetimeCustomResolver = (input: {
     key: string;
     payload?: unknown;
@@ -19,10 +15,9 @@ type TApplyOperationToPlayersArgs = {
     characters: TPopulatedCharacter[];
     timelines: TTimeline[];
     timelineIndexAtNow?: number;
-    statusResolver?: TLifetimeStatusResolver;
     customResolver?: TLifetimeCustomResolver;
 };
-declare const applyOperationToPlayers: ({ players, operations, allAbilities, characters, timelines, timelineIndexAtNow, statusResolver, customResolver, }: TApplyOperationToPlayersArgs) => TPlayer[];
+declare const applyOperationToPlayers: ({ players, operations, allAbilities, characters, timelines, timelineIndexAtNow, customResolver, }: TApplyOperationToPlayersArgs) => TPlayer[];
 
 type TCanInvokeAbilityCustomResolver = (atom: {
     resolverId: string;

package/dist/index.js

@@ -843,10 +843,6 @@ var evalPlayerStateOnPlayer = (player, atom, ctx) => {
   if (field === "IS_DEAD") {
     return compareBool(Boolean(player.isDead), op, value);
   }
-  if (field === "IS_POISONED" || field === "IS_DRUNK" || field === "IS_HEALTHY") {
-    const resolved = ctx.statusResolver ? ctx.statusResolver({ player, status: field === "IS_POISONED" ? "POISONED" : field === "IS_DRUNK" ? "DRUNK" : "HEALTHY" }) : false;
-    return compareBool(resolved, op, value);
-  }
   if (field === "CHARACTER_ID") {
     return compareString(player.characterId, op, value);
   }
@@ -1025,7 +1021,6 @@ var evaluateLifetime = ({
   snapshotSeatMap,
   characterMap,
   payloads,
-  statusResolver,
   customResolver
 }) => {
   const lifetime = getLifetime(effect, payloads);
@@ -1040,7 +1035,6 @@ var evaluateLifetime = ({
     snapshotSeatMap,
     characterMap,
     payloads,
-    statusResolver,
     customResolver
   };
   const expr = lifetime.expr;
@@ -1050,6 +1044,34 @@ var evaluateLifetime = ({
   }
   return targets.filter((target) => evalExpr(expr, { ...baseCtx, target }));
 };
+var evaluatePrecondition = ({
+  expr,
+  operationTimelineIdx,
+  nowTimelineIndex,
+  timelines,
+  effector,
+  targets,
+  snapshotSeatMap,
+  characterMap,
+  payloads,
+  customResolver
+}) => {
+  const baseCtx = {
+    operationTimelineIdx,
+    nowTimelineIndex,
+    timelines,
+    effector,
+    snapshotSeatMap,
+    characterMap,
+    payloads,
+    customResolver
+  };
+  const dependsOnTarget = expressionReferencesTarget(expr);
+  if (!dependsOnTarget) {
+    return evalExpr(expr, { ...baseCtx, target: void 0 }) ? targets : [];
+  }
+  return targets.filter((target) => evalExpr(expr, { ...baseCtx, target }));
+};
 
 // src/apply-operation.ts
 var isDeferredOperation = (operation, abilityMap) => {
@@ -1070,7 +1092,6 @@ var applyOperationToPlayers = ({
   characters,
   timelines,
   timelineIndexAtNow,
-  statusResolver,
   customResolver
 }) => {
   if (operations.length === 0) {
@@ -1089,6 +1110,7 @@ var applyOperationToPlayers = ({
     }
     operationsByTimeline.get(timelineIndex)?.push(operation);
   });
+  const preconditionCache = /* @__PURE__ */ new Map();
   const runReplay = (lifetimeSnapshotSeatMap) => {
     const playersWithStatus = copyPlayers(players);
     const applyOpsSequence = (ops) => {
@@ -1110,7 +1132,7 @@ var applyOperationToPlayers = ({
           }
           return snapshotSeatMap;
         };
-        ability.effects.forEach((effect) => {
+        ability.effects.forEach((effect, effectIdx) => {
           const resolvedTargets = resolveEffectTargets({
             effect,
             operation,
@@ -1122,17 +1144,45 @@ var applyOperationToPlayers = ({
           if (!resolvedTargets) {
             return;
           }
+          const precondition = "precondition" in effect ? effect.precondition : void 0;
+          let gatedTargets;
+          if (precondition) {
+            const cachedSeats = preconditionCache.get(operation)?.get(effectIdx);
+            if (cachedSeats) {
+              gatedTargets = resolvedTargets.filter((t) => cachedSeats.has(t.seat));
+            } else {
+              gatedTargets = evaluatePrecondition({
+                expr: precondition,
+                operationTimelineIdx: operationInTimelineIdx,
+                nowTimelineIndex,
+                timelines,
+                effector,
+                targets: resolvedTargets,
+                snapshotSeatMap: playerSeatMap,
+                characterMap,
+                payloads,
+                customResolver
+              });
+              const opCache = preconditionCache.get(operation) ?? /* @__PURE__ */ new Map();
+              opCache.set(effectIdx, new Set(gatedTargets.map((t) => t.seat)));
+              preconditionCache.set(operation, opCache);
+            }
+          } else {
+            gatedTargets = resolvedTargets;
+          }
+          if (gatedTargets.length === 0 && resolvedTargets.length > 0) {
+            return;
+          }
           const makePlayersEffect = evaluateLifetime({
             effect,
             operationTimelineIdx: operationInTimelineIdx,
             nowTimelineIndex,
             timelines,
             effector,
-            targets: resolvedTargets,
+            targets: gatedTargets,
             snapshotSeatMap: lifetimeSnapshotSeatMap,
             characterMap,
             payloads,
-            statusResolver,
             customResolver
           });
           const handler = effectHandlers[effect.type];

package/dist/index.mjs

@@ -803,10 +803,6 @@ var evalPlayerStateOnPlayer = (player, atom, ctx) => {
   if (field === "IS_DEAD") {
     return compareBool(Boolean(player.isDead), op, value);
   }
-  if (field === "IS_POISONED" || field === "IS_DRUNK" || field === "IS_HEALTHY") {
-    const resolved = ctx.statusResolver ? ctx.statusResolver({ player, status: field === "IS_POISONED" ? "POISONED" : field === "IS_DRUNK" ? "DRUNK" : "HEALTHY" }) : false;
-    return compareBool(resolved, op, value);
-  }
   if (field === "CHARACTER_ID") {
     return compareString(player.characterId, op, value);
   }
@@ -985,7 +981,6 @@ var evaluateLifetime = ({
   snapshotSeatMap,
   characterMap,
   payloads,
-  statusResolver,
   customResolver
 }) => {
   const lifetime = getLifetime(effect, payloads);
@@ -1000,7 +995,6 @@ var evaluateLifetime = ({
     snapshotSeatMap,
     characterMap,
     payloads,
-    statusResolver,
     customResolver
   };
   const expr = lifetime.expr;
@@ -1010,6 +1004,34 @@ var evaluateLifetime = ({
   }
   return targets.filter((target) => evalExpr(expr, { ...baseCtx, target }));
 };
+var evaluatePrecondition = ({
+  expr,
+  operationTimelineIdx,
+  nowTimelineIndex,
+  timelines,
+  effector,
+  targets,
+  snapshotSeatMap,
+  characterMap,
+  payloads,
+  customResolver
+}) => {
+  const baseCtx = {
+    operationTimelineIdx,
+    nowTimelineIndex,
+    timelines,
+    effector,
+    snapshotSeatMap,
+    characterMap,
+    payloads,
+    customResolver
+  };
+  const dependsOnTarget = expressionReferencesTarget(expr);
+  if (!dependsOnTarget) {
+    return evalExpr(expr, { ...baseCtx, target: void 0 }) ? targets : [];
+  }
+  return targets.filter((target) => evalExpr(expr, { ...baseCtx, target }));
+};
 
 // src/apply-operation.ts
 var isDeferredOperation = (operation, abilityMap) => {
@@ -1030,7 +1052,6 @@ var applyOperationToPlayers = ({
   characters,
   timelines,
   timelineIndexAtNow,
-  statusResolver,
   customResolver
 }) => {
   if (operations.length === 0) {
@@ -1049,6 +1070,7 @@ var applyOperationToPlayers = ({
     }
     operationsByTimeline.get(timelineIndex)?.push(operation);
   });
+  const preconditionCache = /* @__PURE__ */ new Map();
   const runReplay = (lifetimeSnapshotSeatMap) => {
     const playersWithStatus = copyPlayers(players);
     const applyOpsSequence = (ops) => {
@@ -1070,7 +1092,7 @@ var applyOperationToPlayers = ({
           }
           return snapshotSeatMap;
         };
-        ability.effects.forEach((effect) => {
+        ability.effects.forEach((effect, effectIdx) => {
           const resolvedTargets = resolveEffectTargets({
             effect,
             operation,
@@ -1082,17 +1104,45 @@ var applyOperationToPlayers = ({
           if (!resolvedTargets) {
             return;
           }
+          const precondition = "precondition" in effect ? effect.precondition : void 0;
+          let gatedTargets;
+          if (precondition) {
+            const cachedSeats = preconditionCache.get(operation)?.get(effectIdx);
+            if (cachedSeats) {
+              gatedTargets = resolvedTargets.filter((t) => cachedSeats.has(t.seat));
+            } else {
+              gatedTargets = evaluatePrecondition({
+                expr: precondition,
+                operationTimelineIdx: operationInTimelineIdx,
+                nowTimelineIndex,
+                timelines,
+                effector,
+                targets: resolvedTargets,
+                snapshotSeatMap: playerSeatMap,
+                characterMap,
+                payloads,
+                customResolver
+              });
+              const opCache = preconditionCache.get(operation) ?? /* @__PURE__ */ new Map();
+              opCache.set(effectIdx, new Set(gatedTargets.map((t) => t.seat)));
+              preconditionCache.set(operation, opCache);
+            }
+          } else {
+            gatedTargets = resolvedTargets;
+          }
+          if (gatedTargets.length === 0 && resolvedTargets.length > 0) {
+            return;
+          }
           const makePlayersEffect = evaluateLifetime({
             effect,
             operationTimelineIdx: operationInTimelineIdx,
             nowTimelineIndex,
             timelines,
             effector,
-            targets: resolvedTargets,
+            targets: gatedTargets,
             snapshotSeatMap: lifetimeSnapshotSeatMap,
             characterMap,
             payloads,
-            statusResolver,
             customResolver
           });
           const handler = effectHandlers[effect.type];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bct-app/game-engine",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "Game engine utilities for BCT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@bct-app/game-model": "0.1.8"
+    "@bct-app/game-model": "0.1.9"
   },
   "devDependencies": {
     "@vitest/ui": "^4.1.3",