@bct-app/game-engine 0.1.16-beta.1 → 0.1.17

package/dist/index.js

@@ -1074,11 +1074,16 @@ var evaluatePrecondition = ({
 };
 
 // src/apply-operation.ts
-var isDeferredOperation = (operation, abilityMap) => {
-  const ability = abilityMap.get(operation.abilityId);
-  return ability?.executionTiming === "DEFER_TO_END";
-};
 var FIXED_POINT_MAX_ITERATIONS = 32;
+var seatSetsEqual = (left, right) => {
+  if (left.length !== right.length) return false;
+  const sortedLeft = [...left].sort((a, b) => a - b);
+  const sortedRight = [...right].sort((a, b) => a - b);
+  for (let i = 0; i < sortedLeft.length; i += 1) {
+    if (sortedLeft[i] !== sortedRight[i]) return false;
+  }
+  return true;
+};
 var applyOperationToPlayers = ({
   players,
   operations,
@@ -1104,20 +1109,11 @@ var applyOperationToPlayers = ({
     }
     operationsByTimeline.get(timelineIndex)?.push(operation);
   });
-  const orderedOpsForTimeline = (timelineIdx) => {
-    const ops = operationsByTimeline.get(timelineIdx) ?? [];
-    const normal = [];
-    const deferred = [];
-    ops.forEach((op) => {
-      if (isDeferredOperation(op, abilityMap)) deferred.push(op);
-      else normal.push(op);
-    });
-    return [...normal, ...deferred];
-  };
+  const opsForTimeline = (timelineIdx) => operationsByTimeline.get(timelineIdx) ?? [];
   const allOpsInOrder = [];
-  allOpsInOrder.push(...orderedOpsForTimeline(-1));
+  allOpsInOrder.push(...opsForTimeline(-1));
   for (let i = 0; i <= nowTimelineIndex; i += 1) {
-    if (timelines[i]) allOpsInOrder.push(...orderedOpsForTimeline(i));
+    if (timelines[i]) allOpsInOrder.push(...opsForTimeline(i));
   }
   const processedOps = /* @__PURE__ */ new Set();
   const records = [];
@@ -1166,7 +1162,7 @@ var applyOperationToPlayers = ({
   };
   const rebuildState = () => {
     const playersWithStatus = copyPlayers(players);
-    const settingsOps = orderedOpsForTimeline(-1);
+    const settingsOps = opsForTimeline(-1);
     settingsOps.forEach((op) => {
       if (processedOps.has(op)) applyRecordsForOp(op, playersWithStatus);
     });
@@ -1187,7 +1183,7 @@ var applyOperationToPlayers = ({
           });
         });
       }
-      orderedOpsForTimeline(i).forEach((op) => {
+      opsForTimeline(i).forEach((op) => {
         if (processedOps.has(op)) applyRecordsForOp(op, playersWithStatus);
       });
     }
@@ -1199,10 +1195,10 @@ var applyOperationToPlayers = ({
       console.warn("Ability not found for operation:", op);
       return [];
     }
+    const operationInTimelineIdx = operationTimelineMap.get(op) ?? -1;
     const playerSeatMap = buildPlayerSeatMap(state);
     const effector = playerSeatMap.get(op.effector);
     const payloads = op.payloads || [];
-    const operationInTimelineIdx = operationTimelineMap.get(op) ?? -1;
     const newRecords = [];
     ability.effects.forEach((effect, effectIdx) => {
       const resolvedTargets = resolveEffectTargets({
@@ -1227,9 +1223,7 @@ var applyOperationToPlayers = ({
         payloads,
         customResolver
       }) : resolvedTargets;
-      if (gatedTargets.length === 0 && resolvedTargets.length > 0) {
-        return;
-      }
+      if (gatedTargets.length === 0 && resolvedTargets.length > 0) return;
       const lifeTargets = evaluateLifetime({
         effect,
         operationTimelineIdx: operationInTimelineIdx,
@@ -1246,42 +1240,60 @@ var applyOperationToPlayers = ({
         operation: op,
         effectIdx,
         operationInTimelineIdx,
-        activeTargetSeats: lifeTargets.map((t) => t.seat)
+        activeTargetSeats: lifeTargets.map((t) => t.seat),
+        resolvedSeatsAtApply: new Set(resolvedTargets.map((t) => t.seat)),
+        gatedSeatsAtApply: new Set(gatedTargets.map((t) => t.seat))
       });
     });
     return newRecords;
   };
-  const reEvaluateLifetimes = (state) => {
+  const reResolveRecord = (record, state) => {
+    const ability = abilityMap.get(record.operation.abilityId);
+    if (!ability) return [];
+    const effect = ability.effects[record.effectIdx];
+    if (!effect) return [];
     const playerSeatMap = buildPlayerSeatMap(state);
-    let anyShrunk = false;
+    const effector = playerSeatMap.get(record.operation.effector);
+    const payloads = record.operation.payloads || [];
+    const resolvedTargets = resolveEffectTargets({
+      effect,
+      operation: record.operation,
+      payloads,
+      effector,
+      playerSeatMap,
+      characterMap
+    });
+    if (!resolvedTargets) return [];
+    const gatedTargets = resolvedTargets.filter((target) => {
+      if (record.resolvedSeatsAtApply.has(target.seat)) {
+        return record.gatedSeatsAtApply.has(target.seat);
+      }
+      return true;
+    });
+    const lifeTargets = evaluateLifetime({
+      effect,
+      operationTimelineIdx: record.operationInTimelineIdx,
+      nowTimelineIndex,
+      timelines,
+      effector,
+      targets: gatedTargets,
+      snapshotSeatMap: playerSeatMap,
+      characterMap,
+      payloads,
+      customResolver
+    });
+    return lifeTargets.map((t) => t.seat);
+  };
+  const reResolveRecords = (state) => {
+    let anyChanged = false;
     records.forEach((record) => {
-      if (record.activeTargetSeats.length === 0) return;
-      const ability = abilityMap.get(record.operation.abilityId);
-      if (!ability) return;
-      const effect = ability.effects[record.effectIdx];
-      if (!effect) return;
-      const effector = playerSeatMap.get(record.operation.effector);
-      const payloads = record.operation.payloads || [];
-      const targets = record.activeTargetSeats.map((seat) => playerSeatMap.get(seat)).filter((p) => Boolean(p));
-      const liveTargets = evaluateLifetime({
-        effect,
-        operationTimelineIdx: record.operationInTimelineIdx,
-        nowTimelineIndex,
-        timelines,
-        effector,
-        targets,
-        snapshotSeatMap: playerSeatMap,
-        characterMap,
-        payloads,
-        customResolver
-      });
-      const newSeats = liveTargets.map((t) => t.seat);
-      if (newSeats.length < record.activeTargetSeats.length) {
+      const newSeats = reResolveRecord(record, state);
+      if (!seatSetsEqual(newSeats, record.activeTargetSeats)) {
         record.activeTargetSeats = newSeats;
-        anyShrunk = true;
+        anyChanged = true;
       }
     });
-    return anyShrunk;
+    return anyChanged;
   };
   let lastState = copyPlayers(players);
   allOpsInOrder.forEach((op) => {
@@ -1296,13 +1308,13 @@ var applyOperationToPlayers = ({
     let state = rebuildState();
     let iter = 0;
     while (iter < FIXED_POINT_MAX_ITERATIONS) {
-      const shrunk = reEvaluateLifetimes(state);
-      if (!shrunk) break;
+      const changed = reResolveRecords(state);
+      if (!changed) break;
       state = rebuildState();
       iter += 1;
     }
     if (iter >= FIXED_POINT_MAX_ITERATIONS) {
-      console.warn("applyOperationToPlayers: lifetime fixed-point did not converge within %d iterations after op %s", FIXED_POINT_MAX_ITERATIONS, op.abilityId);
+      console.warn("applyOperationToPlayers: target re-resolution fixed-point did not converge within %d iterations after op %s", FIXED_POINT_MAX_ITERATIONS, op.abilityId);
     }
     lastState = state;
   });

package/dist/index.mjs

@@ -1034,11 +1034,16 @@ var evaluatePrecondition = ({
 };
 
 // src/apply-operation.ts
-var isDeferredOperation = (operation, abilityMap) => {
-  const ability = abilityMap.get(operation.abilityId);
-  return ability?.executionTiming === "DEFER_TO_END";
-};
 var FIXED_POINT_MAX_ITERATIONS = 32;
+var seatSetsEqual = (left, right) => {
+  if (left.length !== right.length) return false;
+  const sortedLeft = [...left].sort((a, b) => a - b);
+  const sortedRight = [...right].sort((a, b) => a - b);
+  for (let i = 0; i < sortedLeft.length; i += 1) {
+    if (sortedLeft[i] !== sortedRight[i]) return false;
+  }
+  return true;
+};
 var applyOperationToPlayers = ({
   players,
   operations,
@@ -1064,20 +1069,11 @@ var applyOperationToPlayers = ({
     }
     operationsByTimeline.get(timelineIndex)?.push(operation);
   });
-  const orderedOpsForTimeline = (timelineIdx) => {
-    const ops = operationsByTimeline.get(timelineIdx) ?? [];
-    const normal = [];
-    const deferred = [];
-    ops.forEach((op) => {
-      if (isDeferredOperation(op, abilityMap)) deferred.push(op);
-      else normal.push(op);
-    });
-    return [...normal, ...deferred];
-  };
+  const opsForTimeline = (timelineIdx) => operationsByTimeline.get(timelineIdx) ?? [];
   const allOpsInOrder = [];
-  allOpsInOrder.push(...orderedOpsForTimeline(-1));
+  allOpsInOrder.push(...opsForTimeline(-1));
   for (let i = 0; i <= nowTimelineIndex; i += 1) {
-    if (timelines[i]) allOpsInOrder.push(...orderedOpsForTimeline(i));
+    if (timelines[i]) allOpsInOrder.push(...opsForTimeline(i));
   }
   const processedOps = /* @__PURE__ */ new Set();
   const records = [];
@@ -1126,7 +1122,7 @@ var applyOperationToPlayers = ({
   };
   const rebuildState = () => {
     const playersWithStatus = copyPlayers(players);
-    const settingsOps = orderedOpsForTimeline(-1);
+    const settingsOps = opsForTimeline(-1);
     settingsOps.forEach((op) => {
       if (processedOps.has(op)) applyRecordsForOp(op, playersWithStatus);
     });
@@ -1147,7 +1143,7 @@ var applyOperationToPlayers = ({
           });
         });
       }
-      orderedOpsForTimeline(i).forEach((op) => {
+      opsForTimeline(i).forEach((op) => {
         if (processedOps.has(op)) applyRecordsForOp(op, playersWithStatus);
       });
     }
@@ -1159,10 +1155,10 @@ var applyOperationToPlayers = ({
       console.warn("Ability not found for operation:", op);
       return [];
     }
+    const operationInTimelineIdx = operationTimelineMap.get(op) ?? -1;
     const playerSeatMap = buildPlayerSeatMap(state);
     const effector = playerSeatMap.get(op.effector);
     const payloads = op.payloads || [];
-    const operationInTimelineIdx = operationTimelineMap.get(op) ?? -1;
     const newRecords = [];
     ability.effects.forEach((effect, effectIdx) => {
       const resolvedTargets = resolveEffectTargets({
@@ -1187,9 +1183,7 @@ var applyOperationToPlayers = ({
         payloads,
         customResolver
       }) : resolvedTargets;
-      if (gatedTargets.length === 0 && resolvedTargets.length > 0) {
-        return;
-      }
+      if (gatedTargets.length === 0 && resolvedTargets.length > 0) return;
       const lifeTargets = evaluateLifetime({
         effect,
         operationTimelineIdx: operationInTimelineIdx,
@@ -1206,42 +1200,60 @@ var applyOperationToPlayers = ({
         operation: op,
         effectIdx,
         operationInTimelineIdx,
-        activeTargetSeats: lifeTargets.map((t) => t.seat)
+        activeTargetSeats: lifeTargets.map((t) => t.seat),
+        resolvedSeatsAtApply: new Set(resolvedTargets.map((t) => t.seat)),
+        gatedSeatsAtApply: new Set(gatedTargets.map((t) => t.seat))
       });
     });
     return newRecords;
   };
-  const reEvaluateLifetimes = (state) => {
+  const reResolveRecord = (record, state) => {
+    const ability = abilityMap.get(record.operation.abilityId);
+    if (!ability) return [];
+    const effect = ability.effects[record.effectIdx];
+    if (!effect) return [];
     const playerSeatMap = buildPlayerSeatMap(state);
-    let anyShrunk = false;
+    const effector = playerSeatMap.get(record.operation.effector);
+    const payloads = record.operation.payloads || [];
+    const resolvedTargets = resolveEffectTargets({
+      effect,
+      operation: record.operation,
+      payloads,
+      effector,
+      playerSeatMap,
+      characterMap
+    });
+    if (!resolvedTargets) return [];
+    const gatedTargets = resolvedTargets.filter((target) => {
+      if (record.resolvedSeatsAtApply.has(target.seat)) {
+        return record.gatedSeatsAtApply.has(target.seat);
+      }
+      return true;
+    });
+    const lifeTargets = evaluateLifetime({
+      effect,
+      operationTimelineIdx: record.operationInTimelineIdx,
+      nowTimelineIndex,
+      timelines,
+      effector,
+      targets: gatedTargets,
+      snapshotSeatMap: playerSeatMap,
+      characterMap,
+      payloads,
+      customResolver
+    });
+    return lifeTargets.map((t) => t.seat);
+  };
+  const reResolveRecords = (state) => {
+    let anyChanged = false;
     records.forEach((record) => {
-      if (record.activeTargetSeats.length === 0) return;
-      const ability = abilityMap.get(record.operation.abilityId);
-      if (!ability) return;
-      const effect = ability.effects[record.effectIdx];
-      if (!effect) return;
-      const effector = playerSeatMap.get(record.operation.effector);
-      const payloads = record.operation.payloads || [];
-      const targets = record.activeTargetSeats.map((seat) => playerSeatMap.get(seat)).filter((p) => Boolean(p));
-      const liveTargets = evaluateLifetime({
-        effect,
-        operationTimelineIdx: record.operationInTimelineIdx,
-        nowTimelineIndex,
-        timelines,
-        effector,
-        targets,
-        snapshotSeatMap: playerSeatMap,
-        characterMap,
-        payloads,
-        customResolver
-      });
-      const newSeats = liveTargets.map((t) => t.seat);
-      if (newSeats.length < record.activeTargetSeats.length) {
+      const newSeats = reResolveRecord(record, state);
+      if (!seatSetsEqual(newSeats, record.activeTargetSeats)) {
         record.activeTargetSeats = newSeats;
-        anyShrunk = true;
+        anyChanged = true;
       }
     });
-    return anyShrunk;
+    return anyChanged;
   };
   let lastState = copyPlayers(players);
   allOpsInOrder.forEach((op) => {
@@ -1256,13 +1268,13 @@ var applyOperationToPlayers = ({
     let state = rebuildState();
     let iter = 0;
     while (iter < FIXED_POINT_MAX_ITERATIONS) {
-      const shrunk = reEvaluateLifetimes(state);
-      if (!shrunk) break;
+      const changed = reResolveRecords(state);
+      if (!changed) break;
       state = rebuildState();
       iter += 1;
     }
     if (iter >= FIXED_POINT_MAX_ITERATIONS) {
-      console.warn("applyOperationToPlayers: lifetime fixed-point did not converge within %d iterations after op %s", FIXED_POINT_MAX_ITERATIONS, op.abilityId);
+      console.warn("applyOperationToPlayers: target re-resolution fixed-point did not converge within %d iterations after op %s", FIXED_POINT_MAX_ITERATIONS, op.abilityId);
     }
     lastState = state;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bct-app/game-engine",
-  "version": "0.1.16-beta.1",
+  "version": "0.1.17",
   "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.9"
+    "@bct-app/game-model": "0.1.11"
   },
   "devDependencies": {
     "@vitest/ui": "^4.1.3",