@bct-app/game-engine 0.1.16 → 0.1.18

package/dist/index.js

@@ -572,11 +572,6 @@ var resolveDynamicValue = (value, payloads, isExpected) => {
 var getSortedPlayers = (playerSeatMap) => {
   return [...playerSeatMap.values()].sort((left, right) => left.seat - right.seat);
 };
-var getCircularDistance = (anchorIdx, targetIdx, total) => {
-  const clockwise = (targetIdx - anchorIdx + total) % total;
-  const anticlockwise = (anchorIdx - targetIdx + total) % total;
-  return Math.min(clockwise, anticlockwise);
-};
 var getAnchorSeat = (dynamicTarget, payloads, effector) => {
   const anchor = dynamicTarget.anchor;
   if (!anchor || anchor.from === "EFFECTOR") {
@@ -595,42 +590,6 @@ var resolveSelectorScope = (dynamicTarget, payloads) => {
     (value) => value === "BOTH_SIDES" || value === "LEFT_SIDE" || value === "RIGHT_SIDE"
   ) ?? "BOTH_SIDES";
 };
-var getCandidatesBySelector = (dynamicTarget, sortedPlayers, anchorSeat, payloads) => {
-  const selector = dynamicTarget.selector;
-  if (!selector) {
-    return sortedPlayers;
-  }
-  const scope = resolveSelectorScope(dynamicTarget, payloads);
-  if (!anchorSeat) {
-    return [];
-  }
-  const anchorIdx = sortedPlayers.findIndex((player) => player.seat === anchorSeat);
-  if (anchorIdx < 0) {
-    return [];
-  }
-  const total = sortedPlayers.length;
-  if (scope === "LEFT_SIDE") {
-    const left2 = [];
-    for (let step = 1; step < total; step += 1) {
-      left2.push(sortedPlayers[(anchorIdx + step) % total]);
-    }
-    return left2;
-  }
-  if (scope === "RIGHT_SIDE") {
-    const right2 = [];
-    for (let step = 1; step < total; step += 1) {
-      right2.push(sortedPlayers[(anchorIdx - step + total) % total]);
-    }
-    return right2;
-  }
-  const left = [];
-  const right = [];
-  for (let step = 1; step < total; step += 1) {
-    left.push(sortedPlayers[(anchorIdx + step) % total]);
-    right.push(sortedPlayers[(anchorIdx - step + total) % total]);
-  }
-  return [...left, ...right];
-};
 var matchesCondition = (player, condition, payloads, characterMap) => {
   if (condition.field === "IS_DEAD") {
     const expected = resolveDynamicValue(condition.value, payloads, (value) => typeof value === "boolean");
@@ -659,55 +618,72 @@ var matchesCondition = (player, condition, payloads, characterMap) => {
   const expectedKind = resolveDynamicValue(condition.value, payloads, (value) => typeof value === "string");
   return typeof expectedKind === "string" && kind === expectedKind;
 };
-var filterByWhere = (candidates, dynamicTarget, payloads, characterMap) => {
+var passesWhere = (player, dynamicTarget, payloads, characterMap) => {
   const where = dynamicTarget.where;
   const conditions = where?.conditions ?? [];
-  if (conditions.length === 0) {
-    return candidates;
-  }
+  if (conditions.length === 0) return true;
   const isAllMode = where?.mode !== "ANY";
-  return candidates.filter((player) => {
-    const results = conditions.map((condition) => matchesCondition(player, condition, payloads, characterMap));
-    return isAllMode ? results.every(Boolean) : results.some(Boolean);
-  });
+  const results = conditions.map((condition) => matchesCondition(player, condition, payloads, characterMap));
+  return isAllMode ? results.every(Boolean) : results.some(Boolean);
 };
-var applySort = (candidates, dynamicTarget, payloads, sortedPlayers, anchorSeat) => {
+var walkSidesWithFilter = (dynamicTarget, sortedPlayers, anchorSeat, payloads, characterMap) => {
   const scope = resolveSelectorScope(dynamicTarget, payloads);
-  if (scope !== "BOTH_SIDES") {
-    return [...candidates];
-  }
-  if (!anchorSeat || sortedPlayers.length <= 1) {
-    return [...candidates].sort((left, right) => left.seat - right.seat);
-  }
-  const seatIndexMap = new Map(sortedPlayers.map((player, idx) => [player.seat, idx]));
-  const anchorIdx = seatIndexMap.get(anchorSeat);
-  if (typeof anchorIdx !== "number") {
-    return [...candidates].sort((left, right) => left.seat - right.seat);
-  }
-  return [...candidates].sort((left, right) => {
-    const leftIdx = seatIndexMap.get(left.seat);
-    const rightIdx = seatIndexMap.get(right.seat);
-    if (typeof leftIdx !== "number" || typeof rightIdx !== "number") {
-      return left.seat - right.seat;
+  if (!anchorSeat) return { left: [], right: [] };
+  const anchorIdx = sortedPlayers.findIndex((player) => player.seat === anchorSeat);
+  if (anchorIdx < 0) return { left: [], right: [] };
+  const total = sortedPlayers.length;
+  const left = [];
+  const right = [];
+  if (scope === "LEFT_SIDE" || scope === "BOTH_SIDES") {
+    for (let step = 1; step < total; step += 1) {
+      const player = sortedPlayers[(anchorIdx + step) % total];
+      if (passesWhere(player, dynamicTarget, payloads, characterMap)) left.push(player);
     }
-    const leftDistance = getCircularDistance(anchorIdx, leftIdx, sortedPlayers.length);
-    const rightDistance = getCircularDistance(anchorIdx, rightIdx, sortedPlayers.length);
-    if (leftDistance !== rightDistance) {
-      return leftDistance - rightDistance;
+  }
+  if (scope === "RIGHT_SIDE" || scope === "BOTH_SIDES") {
+    for (let step = 1; step < total; step += 1) {
+      const player = sortedPlayers[(anchorIdx - step + total) % total];
+      if (passesWhere(player, dynamicTarget, payloads, characterMap)) right.push(player);
     }
-    return left.seat - right.seat;
-  });
+  }
+  return { left, right };
 };
-var pickTargets = (sortedCandidates, dynamicTarget, payloads) => {
-  const dedupedCandidates = [...new Map(sortedCandidates.map((player) => [player.seat, player])).values()];
+var pickBalanced = (sides, dynamicTarget, payloads) => {
   const configuredLimit = resolveDynamicValue(dynamicTarget.limit, payloads, (value) => typeof value === "number");
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  const pushUnique = (player) => {
+    if (!player || seen.has(player.seat)) return false;
+    seen.add(player.seat);
+    out.push(player);
+    return true;
+  };
   if (typeof configuredLimit === "undefined") {
-    return dedupedCandidates;
-  }
-  if (configuredLimit <= 0) {
-    return [];
+    sides.left.forEach(pushUnique);
+    sides.right.forEach(pushUnique);
+    return out;
+  }
+  if (configuredLimit <= 0) return [];
+  let li = 0;
+  let ri = 0;
+  let preferLeft = true;
+  while (out.length < configuredLimit && (li < sides.left.length || ri < sides.right.length)) {
+    if (preferLeft && li < sides.left.length) {
+      if (pushUnique(sides.left[li])) li += 1;
+      else li += 1;
+    } else if (!preferLeft && ri < sides.right.length) {
+      if (pushUnique(sides.right[ri])) ri += 1;
+      else ri += 1;
+    } else if (li < sides.left.length) {
+      if (pushUnique(sides.left[li])) li += 1;
+      else li += 1;
+    } else if (ri < sides.right.length) {
+      if (pushUnique(sides.right[ri])) ri += 1;
+      else ri += 1;
+    }
+    preferLeft = !preferLeft;
   }
-  return dedupedCandidates.slice(0, configuredLimit);
+  return out;
 };
 var resolveEffectTargets = ({
   effect,
@@ -740,10 +716,12 @@ var resolveEffectTargets = ({
     const dynamicTarget = effect.target;
     const sortedPlayers = getSortedPlayers(playerSeatMap);
     const anchorSeat = getAnchorSeat(dynamicTarget, payloads, effector);
-    const candidates = getCandidatesBySelector(dynamicTarget, sortedPlayers, anchorSeat, payloads);
-    const filtered = filterByWhere(candidates, dynamicTarget, payloads, characterMap);
-    const ordered = applySort(filtered, dynamicTarget, payloads, sortedPlayers, anchorSeat);
-    return pickTargets(ordered, dynamicTarget, payloads);
+    if (!dynamicTarget.selector) {
+      const matches = sortedPlayers.filter((player) => passesWhere(player, dynamicTarget, payloads, characterMap));
+      return pickBalanced({ left: matches, right: [] }, dynamicTarget, payloads);
+    }
+    const sides = walkSidesWithFilter(dynamicTarget, sortedPlayers, anchorSeat, payloads, characterMap);
+    return pickBalanced(sides, dynamicTarget, payloads);
   }
   return [];
 };
@@ -1074,11 +1052,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 +1087,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 +1140,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 +1161,7 @@ var applyOperationToPlayers = ({
           });
         });
       }
-      orderedOpsForTimeline(i).forEach((op) => {
+      opsForTimeline(i).forEach((op) => {
         if (processedOps.has(op)) applyRecordsForOp(op, playersWithStatus);
       });
     }
@@ -1199,10 +1173,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 +1201,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 +1218,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 +1286,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

@@ -532,11 +532,6 @@ var resolveDynamicValue = (value, payloads, isExpected) => {
 var getSortedPlayers = (playerSeatMap) => {
   return [...playerSeatMap.values()].sort((left, right) => left.seat - right.seat);
 };
-var getCircularDistance = (anchorIdx, targetIdx, total) => {
-  const clockwise = (targetIdx - anchorIdx + total) % total;
-  const anticlockwise = (anchorIdx - targetIdx + total) % total;
-  return Math.min(clockwise, anticlockwise);
-};
 var getAnchorSeat = (dynamicTarget, payloads, effector) => {
   const anchor = dynamicTarget.anchor;
   if (!anchor || anchor.from === "EFFECTOR") {
@@ -555,42 +550,6 @@ var resolveSelectorScope = (dynamicTarget, payloads) => {
     (value) => value === "BOTH_SIDES" || value === "LEFT_SIDE" || value === "RIGHT_SIDE"
   ) ?? "BOTH_SIDES";
 };
-var getCandidatesBySelector = (dynamicTarget, sortedPlayers, anchorSeat, payloads) => {
-  const selector = dynamicTarget.selector;
-  if (!selector) {
-    return sortedPlayers;
-  }
-  const scope = resolveSelectorScope(dynamicTarget, payloads);
-  if (!anchorSeat) {
-    return [];
-  }
-  const anchorIdx = sortedPlayers.findIndex((player) => player.seat === anchorSeat);
-  if (anchorIdx < 0) {
-    return [];
-  }
-  const total = sortedPlayers.length;
-  if (scope === "LEFT_SIDE") {
-    const left2 = [];
-    for (let step = 1; step < total; step += 1) {
-      left2.push(sortedPlayers[(anchorIdx + step) % total]);
-    }
-    return left2;
-  }
-  if (scope === "RIGHT_SIDE") {
-    const right2 = [];
-    for (let step = 1; step < total; step += 1) {
-      right2.push(sortedPlayers[(anchorIdx - step + total) % total]);
-    }
-    return right2;
-  }
-  const left = [];
-  const right = [];
-  for (let step = 1; step < total; step += 1) {
-    left.push(sortedPlayers[(anchorIdx + step) % total]);
-    right.push(sortedPlayers[(anchorIdx - step + total) % total]);
-  }
-  return [...left, ...right];
-};
 var matchesCondition = (player, condition, payloads, characterMap) => {
   if (condition.field === "IS_DEAD") {
     const expected = resolveDynamicValue(condition.value, payloads, (value) => typeof value === "boolean");
@@ -619,55 +578,72 @@ var matchesCondition = (player, condition, payloads, characterMap) => {
   const expectedKind = resolveDynamicValue(condition.value, payloads, (value) => typeof value === "string");
   return typeof expectedKind === "string" && kind === expectedKind;
 };
-var filterByWhere = (candidates, dynamicTarget, payloads, characterMap) => {
+var passesWhere = (player, dynamicTarget, payloads, characterMap) => {
   const where = dynamicTarget.where;
   const conditions = where?.conditions ?? [];
-  if (conditions.length === 0) {
-    return candidates;
-  }
+  if (conditions.length === 0) return true;
   const isAllMode = where?.mode !== "ANY";
-  return candidates.filter((player) => {
-    const results = conditions.map((condition) => matchesCondition(player, condition, payloads, characterMap));
-    return isAllMode ? results.every(Boolean) : results.some(Boolean);
-  });
+  const results = conditions.map((condition) => matchesCondition(player, condition, payloads, characterMap));
+  return isAllMode ? results.every(Boolean) : results.some(Boolean);
 };
-var applySort = (candidates, dynamicTarget, payloads, sortedPlayers, anchorSeat) => {
+var walkSidesWithFilter = (dynamicTarget, sortedPlayers, anchorSeat, payloads, characterMap) => {
   const scope = resolveSelectorScope(dynamicTarget, payloads);
-  if (scope !== "BOTH_SIDES") {
-    return [...candidates];
-  }
-  if (!anchorSeat || sortedPlayers.length <= 1) {
-    return [...candidates].sort((left, right) => left.seat - right.seat);
-  }
-  const seatIndexMap = new Map(sortedPlayers.map((player, idx) => [player.seat, idx]));
-  const anchorIdx = seatIndexMap.get(anchorSeat);
-  if (typeof anchorIdx !== "number") {
-    return [...candidates].sort((left, right) => left.seat - right.seat);
-  }
-  return [...candidates].sort((left, right) => {
-    const leftIdx = seatIndexMap.get(left.seat);
-    const rightIdx = seatIndexMap.get(right.seat);
-    if (typeof leftIdx !== "number" || typeof rightIdx !== "number") {
-      return left.seat - right.seat;
+  if (!anchorSeat) return { left: [], right: [] };
+  const anchorIdx = sortedPlayers.findIndex((player) => player.seat === anchorSeat);
+  if (anchorIdx < 0) return { left: [], right: [] };
+  const total = sortedPlayers.length;
+  const left = [];
+  const right = [];
+  if (scope === "LEFT_SIDE" || scope === "BOTH_SIDES") {
+    for (let step = 1; step < total; step += 1) {
+      const player = sortedPlayers[(anchorIdx + step) % total];
+      if (passesWhere(player, dynamicTarget, payloads, characterMap)) left.push(player);
     }
-    const leftDistance = getCircularDistance(anchorIdx, leftIdx, sortedPlayers.length);
-    const rightDistance = getCircularDistance(anchorIdx, rightIdx, sortedPlayers.length);
-    if (leftDistance !== rightDistance) {
-      return leftDistance - rightDistance;
+  }
+  if (scope === "RIGHT_SIDE" || scope === "BOTH_SIDES") {
+    for (let step = 1; step < total; step += 1) {
+      const player = sortedPlayers[(anchorIdx - step + total) % total];
+      if (passesWhere(player, dynamicTarget, payloads, characterMap)) right.push(player);
     }
-    return left.seat - right.seat;
-  });
+  }
+  return { left, right };
 };
-var pickTargets = (sortedCandidates, dynamicTarget, payloads) => {
-  const dedupedCandidates = [...new Map(sortedCandidates.map((player) => [player.seat, player])).values()];
+var pickBalanced = (sides, dynamicTarget, payloads) => {
   const configuredLimit = resolveDynamicValue(dynamicTarget.limit, payloads, (value) => typeof value === "number");
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  const pushUnique = (player) => {
+    if (!player || seen.has(player.seat)) return false;
+    seen.add(player.seat);
+    out.push(player);
+    return true;
+  };
   if (typeof configuredLimit === "undefined") {
-    return dedupedCandidates;
-  }
-  if (configuredLimit <= 0) {
-    return [];
+    sides.left.forEach(pushUnique);
+    sides.right.forEach(pushUnique);
+    return out;
+  }
+  if (configuredLimit <= 0) return [];
+  let li = 0;
+  let ri = 0;
+  let preferLeft = true;
+  while (out.length < configuredLimit && (li < sides.left.length || ri < sides.right.length)) {
+    if (preferLeft && li < sides.left.length) {
+      if (pushUnique(sides.left[li])) li += 1;
+      else li += 1;
+    } else if (!preferLeft && ri < sides.right.length) {
+      if (pushUnique(sides.right[ri])) ri += 1;
+      else ri += 1;
+    } else if (li < sides.left.length) {
+      if (pushUnique(sides.left[li])) li += 1;
+      else li += 1;
+    } else if (ri < sides.right.length) {
+      if (pushUnique(sides.right[ri])) ri += 1;
+      else ri += 1;
+    }
+    preferLeft = !preferLeft;
   }
-  return dedupedCandidates.slice(0, configuredLimit);
+  return out;
 };
 var resolveEffectTargets = ({
   effect,
@@ -700,10 +676,12 @@ var resolveEffectTargets = ({
     const dynamicTarget = effect.target;
     const sortedPlayers = getSortedPlayers(playerSeatMap);
     const anchorSeat = getAnchorSeat(dynamicTarget, payloads, effector);
-    const candidates = getCandidatesBySelector(dynamicTarget, sortedPlayers, anchorSeat, payloads);
-    const filtered = filterByWhere(candidates, dynamicTarget, payloads, characterMap);
-    const ordered = applySort(filtered, dynamicTarget, payloads, sortedPlayers, anchorSeat);
-    return pickTargets(ordered, dynamicTarget, payloads);
+    if (!dynamicTarget.selector) {
+      const matches = sortedPlayers.filter((player) => passesWhere(player, dynamicTarget, payloads, characterMap));
+      return pickBalanced({ left: matches, right: [] }, dynamicTarget, payloads);
+    }
+    const sides = walkSidesWithFilter(dynamicTarget, sortedPlayers, anchorSeat, payloads, characterMap);
+    return pickBalanced(sides, dynamicTarget, payloads);
   }
   return [];
 };
@@ -1034,11 +1012,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 +1047,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 +1100,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 +1121,7 @@ var applyOperationToPlayers = ({
           });
         });
       }
-      orderedOpsForTimeline(i).forEach((op) => {
+      opsForTimeline(i).forEach((op) => {
         if (processedOps.has(op)) applyRecordsForOp(op, playersWithStatus);
       });
     }
@@ -1159,10 +1133,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 +1161,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 +1178,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 +1246,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",
+  "version": "0.1.18",
   "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.10"
+    "@bct-app/game-model": "0.1.11"
   },
   "devDependencies": {
     "@vitest/ui": "^4.1.3",