@bct-app/game-engine 0.1.17 → 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 [];
 };

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 [];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bct-app/game-engine",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Game engine utilities for BCT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",