@bct-app/game-engine 0.1.19 → 0.1.21

package/dist/index.d.mts

@@ -133,9 +133,6 @@ type TDslPlayer = TPlayer & {
     characterKind: string | undefined;
     reminderMarks: string[];
     effectiveAlive: boolean;
-    diedThisTurn: boolean;
-    wasExecuted: boolean;
-    wasExecutedToday: boolean;
 };
 type TDslNomination = {
     nominator: number;
@@ -161,6 +158,7 @@ type TDslContext = {
     };
     currentTimeline: {
         turn: number;
+        previousTurn: number;
         phase: string;
         time: TTimeline['time'] | undefined;
         isFirstOfPhase: boolean;

package/dist/index.d.ts

@@ -133,9 +133,6 @@ type TDslPlayer = TPlayer & {
     characterKind: string | undefined;
     reminderMarks: string[];
     effectiveAlive: boolean;
-    diedThisTurn: boolean;
-    wasExecuted: boolean;
-    wasExecutedToday: boolean;
 };
 type TDslNomination = {
     nominator: number;
@@ -161,6 +158,7 @@ type TDslContext = {
     };
     currentTimeline: {
         turn: number;
+        previousTurn: number;
         phase: string;
         time: TTimeline['time'] | undefined;
         isFirstOfPhase: boolean;

package/dist/index.js

@@ -519,19 +519,20 @@ var applyStatusChange = createEffectHandler("STATUS_CHANGE", ({
   effect,
   payloads,
   makePlayersEffect,
-  operationInTimelineIdx,
+  operationTurn,
   abilityMap,
-  operation
+  operation,
+  operationTime
 }) => {
   const maybeStatus = getSourceValue(effect.source, payloads);
   if (maybeStatus === "DEAD") {
     const ability = abilityMap.get(operation.abilityId);
-    const turn = operationInTimelineIdx >= 0 ? operationInTimelineIdx : 0;
     const cause = effect.deathCause ?? (ability?.category === "STORYTELLER" ? "STORYTELLER" : "ABILITY");
     makePlayersEffect.forEach((player) => {
       player.isDead = true;
       player.deathCause = cause;
-      player.deathTurn = turn;
+      player.deathTurn = operationTurn;
+      player.deathTime = operationTime;
     });
     return;
   }
@@ -540,6 +541,7 @@ var applyStatusChange = createEffectHandler("STATUS_CHANGE", ({
       player.isDead = false;
       delete player.deathCause;
       delete player.deathTurn;
+      delete player.deathTime;
     });
     return;
   }
@@ -562,18 +564,14 @@ var effectHandlers = {
 };
 
 // src/dsl/context.ts
-var decoratePlayer = (player, characterMap, currentTurn) => {
+var decoratePlayer = (player, characterMap) => {
   const isDead = Boolean(player.isDead);
   const retainsBypass = isDead && (player.retainsAbility === "ALIVENESS" || player.retainsAbility === "ALL");
-  const wasExecuted = isDead && player.deathCause === "EXECUTION";
   return {
     ...player,
     characterKind: characterMap.get(player.characterId)?.kind,
     reminderMarks: (player.reminders ?? []).map((r) => r.mark),
-    effectiveAlive: !isDead || retainsBypass,
-    diedThisTurn: isDead && typeof player.deathTurn === "number" && player.deathTurn === currentTurn,
-    wasExecuted,
-    wasExecutedToday: wasExecuted && player.deathTurn === currentTurn
+    effectiveAlive: !isDead || retainsBypass
   };
 };
 var isExecutionTimeline = (tl) => {
@@ -581,7 +579,7 @@ var isExecutionTimeline = (tl) => {
   return (tl.operations ?? []).some((op) => op.kind === "execution");
 };
 var buildDslContextFromDerived = (derived, payload = []) => {
-  const players = derived.players.map((p) => decoratePlayer(p, derived.characterMap, derived.currentTurn));
+  const players = derived.players.map((p) => decoratePlayer(p, derived.characterMap));
   const effector = players.find((p) => p.seat === derived.effectorSeat);
   const aliveCount = players.filter((p) => !p.isDead).length;
   const deadCount = players.length - aliveCount;
@@ -609,6 +607,7 @@ var buildDslContextFromDerived = (derived, payload = []) => {
     },
     currentTimeline: {
       turn: derived.currentTurn,
+      previousTurn: derived.currentTurn - 1,
       phase: derived.currentPhase,
       time: derived.currentPhase === "NIGHT" ? "night" : derived.currentPhase === "DAY" ? "day" : void 0,
       isFirstOfPhase: derived.isFirstOfPhase,
@@ -638,8 +637,8 @@ var buildDslContextFromLifetime = ({
   const currentTime = nowTl?.time;
   const currentPhase = currentTime === "night" ? "NIGHT" : currentTime === "day" ? "DAY" : "NIGHT";
   const playersRaw = snapshotSeatMap ? [...snapshotSeatMap.values()] : [];
-  const players = playersRaw.map((p) => decoratePlayer(p, characterMap, currentTurn));
-  const effectorDecorated = effector ? players.find((p) => p.seat === effector.seat) ?? decoratePlayer(effector, characterMap, currentTurn) : void 0;
+  const players = playersRaw.map((p) => decoratePlayer(p, characterMap));
+  const effectorDecorated = effector ? players.find((p) => p.seat === effector.seat) ?? decoratePlayer(effector, characterMap) : void 0;
   const todayOps = timelines.filter((tl) => tl.turn === currentTurn && tl.time === "day").flatMap((tl) => tl.operations ?? []);
   const tonightOps = timelines.filter((tl) => tl.turn === currentTurn && tl.time === "night").flatMap((tl) => tl.operations ?? []);
   const yesterdayDayOps = timelines.filter((tl) => tl.turn === currentTurn - 1 && tl.time === "day").flatMap((tl) => tl.operations ?? []);
@@ -681,6 +680,7 @@ var buildDslContextFromLifetime = ({
     },
     currentTimeline: {
       turn: currentTurn,
+      previousTurn: currentTurn - 1,
       phase: currentPhase,
       time: currentTime,
       isFirstOfPhase: false,
@@ -869,13 +869,11 @@ var PLAYER_FIELDS = [
   { name: "alignment", type: "string", label: "\u9635\u8425", description: "GOOD / EVIL" },
   { name: "isDead", type: "boolean", label: "\u662F\u5426\u6B7B\u4EA1" },
   { name: "effectiveAlive", type: "boolean", label: "\u6709\u6548\u5B58\u6D3B", description: "\u8003\u8651 retainsAbility\uFF08ALIVENESS/ALL\uFF09\u540E\u662F\u5426\u6309\u5B58\u6D3B\u5904\u7406" },
-  { name: "diedThisTurn", type: "boolean", label: "\u672C\u56DE\u5408\u6B7B\u4EA1" },
-  { name: "wasExecuted", type: "boolean", label: "\u66FE\u88AB\u5904\u51B3" },
-  { name: "wasExecutedToday", type: "boolean", label: "\u4ECA\u65E5\u88AB\u5904\u51B3" },
   { name: "characterId", type: "string", label: "\u89D2\u8272 ID" },
   { name: "characterKind", type: "string", label: "\u89D2\u8272\u7C7B\u578B", description: "Townsfolk / Outsiders / Minions / Demons" },
   { name: "deathCause", type: "string", label: "\u6B7B\u4EA1\u539F\u56E0", description: "EXECUTION / DEMON / ABILITY / STORYTELLER / OTHER" },
   { name: "deathTurn", type: "number", label: "\u6B7B\u4EA1\u56DE\u5408" },
+  { name: "deathTime", type: "string", label: "\u6B7B\u4EA1\u65F6\u6BB5", description: "day / night" },
   { name: "abilities", type: "string[]", label: "\u80FD\u529B ID \u5217\u8868" },
   { name: "reminderMarks", type: "string[]", label: "\u63D0\u793A\u7269 mark \u5217\u8868" },
   { name: "hasUsedDeadVote", type: "boolean", label: "\u662F\u5426\u4F7F\u7528\u8FC7\u6B7B\u4EA1\u6295\u7968" },
@@ -894,6 +892,7 @@ var NOMINATION_FIELDS = [
 ];
 var CURRENT_TIMELINE_FIELDS = [
   { name: "turn", type: "number", label: "\u5F53\u524D\u56DE\u5408" },
+  { name: "previousTurn", type: "number", label: "\u4E0A\u4E00\u56DE\u5408", description: "= turn - 1\uFF0C\u9996\u56DE\u5408\u4E3A -1" },
   { name: "phase", type: "string", label: "\u5F53\u524D\u9636\u6BB5", description: "NIGHT / DAY / DUSK / DAWN" },
   { name: "time", type: "string", label: "\u5F53\u524D\u65F6\u6BB5", description: "night / day" },
   { name: "isFirstOfPhase", type: "boolean", label: "\u662F\u5426\u672C\u9636\u6BB5\u9996\u6B21" },
@@ -1708,6 +1707,8 @@ var applyOperationToPlayers = ({
         abilityMap,
         nowTimelineIndex,
         operationInTimelineIdx: record.operationInTimelineIdx,
+        operationTurn: timelines[record.operationInTimelineIdx]?.turn ?? 0,
+        operationTime: timelines[record.operationInTimelineIdx]?.time ?? "night",
         makePlayersEffect
       };
       handler(context);

package/dist/index.mjs

@@ -463,19 +463,20 @@ var applyStatusChange = createEffectHandler("STATUS_CHANGE", ({
   effect,
   payloads,
   makePlayersEffect,
-  operationInTimelineIdx,
+  operationTurn,
   abilityMap,
-  operation
+  operation,
+  operationTime
 }) => {
   const maybeStatus = getSourceValue(effect.source, payloads);
   if (maybeStatus === "DEAD") {
     const ability = abilityMap.get(operation.abilityId);
-    const turn = operationInTimelineIdx >= 0 ? operationInTimelineIdx : 0;
     const cause = effect.deathCause ?? (ability?.category === "STORYTELLER" ? "STORYTELLER" : "ABILITY");
     makePlayersEffect.forEach((player) => {
       player.isDead = true;
       player.deathCause = cause;
-      player.deathTurn = turn;
+      player.deathTurn = operationTurn;
+      player.deathTime = operationTime;
     });
     return;
   }
@@ -484,6 +485,7 @@ var applyStatusChange = createEffectHandler("STATUS_CHANGE", ({
       player.isDead = false;
       delete player.deathCause;
       delete player.deathTurn;
+      delete player.deathTime;
     });
     return;
   }
@@ -506,18 +508,14 @@ var effectHandlers = {
 };
 
 // src/dsl/context.ts
-var decoratePlayer = (player, characterMap, currentTurn) => {
+var decoratePlayer = (player, characterMap) => {
   const isDead = Boolean(player.isDead);
   const retainsBypass = isDead && (player.retainsAbility === "ALIVENESS" || player.retainsAbility === "ALL");
-  const wasExecuted = isDead && player.deathCause === "EXECUTION";
   return {
     ...player,
     characterKind: characterMap.get(player.characterId)?.kind,
     reminderMarks: (player.reminders ?? []).map((r) => r.mark),
-    effectiveAlive: !isDead || retainsBypass,
-    diedThisTurn: isDead && typeof player.deathTurn === "number" && player.deathTurn === currentTurn,
-    wasExecuted,
-    wasExecutedToday: wasExecuted && player.deathTurn === currentTurn
+    effectiveAlive: !isDead || retainsBypass
   };
 };
 var isExecutionTimeline = (tl) => {
@@ -525,7 +523,7 @@ var isExecutionTimeline = (tl) => {
   return (tl.operations ?? []).some((op) => op.kind === "execution");
 };
 var buildDslContextFromDerived = (derived, payload = []) => {
-  const players = derived.players.map((p) => decoratePlayer(p, derived.characterMap, derived.currentTurn));
+  const players = derived.players.map((p) => decoratePlayer(p, derived.characterMap));
   const effector = players.find((p) => p.seat === derived.effectorSeat);
   const aliveCount = players.filter((p) => !p.isDead).length;
   const deadCount = players.length - aliveCount;
@@ -553,6 +551,7 @@ var buildDslContextFromDerived = (derived, payload = []) => {
     },
     currentTimeline: {
       turn: derived.currentTurn,
+      previousTurn: derived.currentTurn - 1,
       phase: derived.currentPhase,
       time: derived.currentPhase === "NIGHT" ? "night" : derived.currentPhase === "DAY" ? "day" : void 0,
       isFirstOfPhase: derived.isFirstOfPhase,
@@ -582,8 +581,8 @@ var buildDslContextFromLifetime = ({
   const currentTime = nowTl?.time;
   const currentPhase = currentTime === "night" ? "NIGHT" : currentTime === "day" ? "DAY" : "NIGHT";
   const playersRaw = snapshotSeatMap ? [...snapshotSeatMap.values()] : [];
-  const players = playersRaw.map((p) => decoratePlayer(p, characterMap, currentTurn));
-  const effectorDecorated = effector ? players.find((p) => p.seat === effector.seat) ?? decoratePlayer(effector, characterMap, currentTurn) : void 0;
+  const players = playersRaw.map((p) => decoratePlayer(p, characterMap));
+  const effectorDecorated = effector ? players.find((p) => p.seat === effector.seat) ?? decoratePlayer(effector, characterMap) : void 0;
   const todayOps = timelines.filter((tl) => tl.turn === currentTurn && tl.time === "day").flatMap((tl) => tl.operations ?? []);
   const tonightOps = timelines.filter((tl) => tl.turn === currentTurn && tl.time === "night").flatMap((tl) => tl.operations ?? []);
   const yesterdayDayOps = timelines.filter((tl) => tl.turn === currentTurn - 1 && tl.time === "day").flatMap((tl) => tl.operations ?? []);
@@ -625,6 +624,7 @@ var buildDslContextFromLifetime = ({
     },
     currentTimeline: {
       turn: currentTurn,
+      previousTurn: currentTurn - 1,
       phase: currentPhase,
       time: currentTime,
       isFirstOfPhase: false,
@@ -813,13 +813,11 @@ var PLAYER_FIELDS = [
   { name: "alignment", type: "string", label: "\u9635\u8425", description: "GOOD / EVIL" },
   { name: "isDead", type: "boolean", label: "\u662F\u5426\u6B7B\u4EA1" },
   { name: "effectiveAlive", type: "boolean", label: "\u6709\u6548\u5B58\u6D3B", description: "\u8003\u8651 retainsAbility\uFF08ALIVENESS/ALL\uFF09\u540E\u662F\u5426\u6309\u5B58\u6D3B\u5904\u7406" },
-  { name: "diedThisTurn", type: "boolean", label: "\u672C\u56DE\u5408\u6B7B\u4EA1" },
-  { name: "wasExecuted", type: "boolean", label: "\u66FE\u88AB\u5904\u51B3" },
-  { name: "wasExecutedToday", type: "boolean", label: "\u4ECA\u65E5\u88AB\u5904\u51B3" },
   { name: "characterId", type: "string", label: "\u89D2\u8272 ID" },
   { name: "characterKind", type: "string", label: "\u89D2\u8272\u7C7B\u578B", description: "Townsfolk / Outsiders / Minions / Demons" },
   { name: "deathCause", type: "string", label: "\u6B7B\u4EA1\u539F\u56E0", description: "EXECUTION / DEMON / ABILITY / STORYTELLER / OTHER" },
   { name: "deathTurn", type: "number", label: "\u6B7B\u4EA1\u56DE\u5408" },
+  { name: "deathTime", type: "string", label: "\u6B7B\u4EA1\u65F6\u6BB5", description: "day / night" },
   { name: "abilities", type: "string[]", label: "\u80FD\u529B ID \u5217\u8868" },
   { name: "reminderMarks", type: "string[]", label: "\u63D0\u793A\u7269 mark \u5217\u8868" },
   { name: "hasUsedDeadVote", type: "boolean", label: "\u662F\u5426\u4F7F\u7528\u8FC7\u6B7B\u4EA1\u6295\u7968" },
@@ -838,6 +836,7 @@ var NOMINATION_FIELDS = [
 ];
 var CURRENT_TIMELINE_FIELDS = [
   { name: "turn", type: "number", label: "\u5F53\u524D\u56DE\u5408" },
+  { name: "previousTurn", type: "number", label: "\u4E0A\u4E00\u56DE\u5408", description: "= turn - 1\uFF0C\u9996\u56DE\u5408\u4E3A -1" },
   { name: "phase", type: "string", label: "\u5F53\u524D\u9636\u6BB5", description: "NIGHT / DAY / DUSK / DAWN" },
   { name: "time", type: "string", label: "\u5F53\u524D\u65F6\u6BB5", description: "night / day" },
   { name: "isFirstOfPhase", type: "boolean", label: "\u662F\u5426\u672C\u9636\u6BB5\u9996\u6B21" },
@@ -1652,6 +1651,8 @@ var applyOperationToPlayers = ({
         abilityMap,
         nowTimelineIndex,
         operationInTimelineIdx: record.operationInTimelineIdx,
+        operationTurn: timelines[record.operationInTimelineIdx]?.turn ?? 0,
+        operationTime: timelines[record.operationInTimelineIdx]?.time ?? "night",
         makePlayersEffect
       };
       handler(context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bct-app/game-engine",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "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.12"
+    "@bct-app/game-model": "0.1.14"
   },
   "devDependencies": {
     "@vitest/ui": "^4.1.3",