@scrthq/runlog 0.0.43 → 0.0.44

package/dist/runlog.js

@@ -26448,13 +26448,15 @@ var Action = external_exports.lazy(
       do: external_exports.literal("modCounter").describe("Adjust a counter."),
       counter: Id.describe("Id of the counter to change."),
       by: external_exports.number().int().optional().describe("Amount to add; negative subtracts."),
-      set: external_exports.number().int().optional().describe("Absolute value to set, overriding `by`.")
+      set: external_exports.number().int().optional().describe("Absolute value to set, overriding `by`."),
+      setFrom: external_exports.string().min(1).optional().describe("Set it to a value bound earlier \u2014 a roll's total or a prompt's answer \u2014 by name. Overrides `by` and `set`.")
     }).strict().describe("Adjust a counter."),
     external_exports.object({
       do: external_exports.literal("modResource").describe("Adjust a resource."),
       resource: Id.describe("Id of the resource to change."),
       by: external_exports.number().int().optional().describe("Amount to add; negative spends."),
-      set: external_exports.number().int().optional().describe("Absolute value to set, overriding `by`.")
+      set: external_exports.number().int().optional().describe("Absolute value to set, overriding `by`."),
+      setFrom: external_exports.string().min(1).optional().describe("Set it to a value bound earlier \u2014 a roll's total or a prompt's answer \u2014 by name. Overrides `by` and `set`.")
     }).strict().describe("Adjust a resource, clamped to its declared min and max."),
     external_exports.object({
       do: external_exports.literal("grantCard").describe("Draw cards into the player's hand."),
@@ -26669,7 +26671,10 @@ var StateDef = external_exports.object({
   short: external_exports.string().max(8).optional().describe(
     "Compact form for embedding in the name of the thing itself \u2014 a file, a layer, a DAW track. Keep it very short, e.g. VF."
   ),
-  scope: external_exports.enum(["subject", "run"]).default("subject").describe("Whether this attaches to one subject or to the whole run."),
+  scope: external_exports.enum(["subject", "run", "contestant"]).default("subject").describe(
+    "Whether this attaches to one subject, to the whole run, or \u2014 in moderated play \u2014 to one contestant on the roster, marked by the moderator: spared from a curse, disqualified, and so on."
+  ),
+  until: external_exports.enum(["unitEnd"]).optional().describe("When the state lifts by itself. `unitEnd`: it is taken off everything it is on when the unit closes \u2014 a curse for this region, a cure for this region."),
   semantics: external_exports.array(
     external_exports.enum(["blocksEdit", "makesUntargetable", "excludesFromResult", "locksValue", "removesFromPlay"])
   ).optional().describe(
@@ -27259,6 +27264,7 @@ function lintPack(pack) {
   let usesResources = resourceIds.size > 0;
   let usesTimers = false;
   let usesResolveTarget = false;
+  const movedCounters = /* @__PURE__ */ new Set();
   for (const site of collectActionSites(pack)) {
     walkActions(site.actions, (a) => {
       switch (a.do) {
@@ -27277,6 +27283,7 @@ function lintPack(pack) {
           if (!counterIds.has(a.counter)) {
             d.push(err("ref/unknown-counter", site.path, `references unknown counter ${a.counter}`));
           }
+          movedCounters.add(a.counter);
           break;
         case "modResource":
           if (!resourceIds.has(a.resource)) {
@@ -27385,6 +27392,7 @@ function lintPack(pack) {
         if (typeof item !== "string" && item.tally && !counterIds.has(item.tally)) {
           d.push(err("ref/unknown-counter", `${path}.${field}[${ii}]`, `tallies unknown counter ${item.tally}`));
         }
+        if (typeof item !== "string" && item.tally) movedCounters.add(item.tally);
         if (typeof item !== "string" && item.shows && !tableIds.has(item.shows.table)) {
           d.push(err("ref/unknown-table", `${path}.${field}[${ii}]`, `shows unknown table ${item.shows.table}`));
         }
@@ -27493,8 +27501,8 @@ function lintPack(pack) {
         d.push(err("ref/unknown-state", path, `hooks unknown state ${sel.state}`));
       }
     }
-    if (!counter.incrementOn?.length && !counter.triggers?.length) {
-      d.push(warn("counter/inert", path, "counter has no incrementOn and no triggers; nothing will ever change it"));
+    if (!counter.incrementOn?.length && !counter.triggers?.length && !movedCounters.has(counterId)) {
+      d.push(warn("counter/inert", path, "counter has no incrementOn, no triggers, and nothing moves it; it will never change"));
     }
   }
   if (pack.targeting?.strategy === "anchoredOffset") {
@@ -28422,8 +28430,8 @@ function rulebookDoc(pack) {
       ["State", "On", "Means"],
       states.map(([, s]) => [
         s.short ? `${s.label} (${s.short})` : s.label,
-        s.scope === "run" ? `the ${n.run}` : `a ${n.subject}`,
-        [s.description ?? "", ...(s.semantics ?? []).map(semanticInWords), s.group ? `Replaces any other \u201C${s.group}\u201D state.` : ""].filter(Boolean).join(" ")
+        s.scope === "run" ? `the ${n.run}` : s.scope === "contestant" ? "a contestant" : `a ${n.subject}`,
+        [s.description ?? "", ...(s.semantics ?? []).map(semanticInWords), s.group ? `Replaces any other \u201C${s.group}\u201D state.` : "", s.until === "unitEnd" ? `Lifts when the ${n.unit} closes.` : ""].filter(Boolean).join(" ")
       ])
     );
   }
@@ -28985,6 +28993,10 @@ function reduce(pack, log) {
         for (const subject of state.subjects) {
           if (subject.unit === state.unit) subject.finalized = true;
         }
+        const lifts = (id) => pack.states?.[id]?.until === "unitEnd";
+        state.runStates = state.runStates.filter((id) => !lifts(id));
+        for (const subject of state.subjects) subject.states = subject.states.filter((id) => !lifts(id));
+        for (const who of state.contestants) who.states = who.states.filter((id) => !lifts(id));
         break;
       }
       case "JournalWritten":
@@ -29020,12 +29032,25 @@ function reduce(pack, log) {
         break;
       case "ContestantAdded":
         if (!state.contestants.some((c) => c.id === event.contestant)) {
-          state.contestants.push({ id: event.contestant, name: event.name });
+          state.contestants.push({ id: event.contestant, name: event.name, states: [] });
         }
         break;
       case "ContestantRemoved":
         state.contestants = state.contestants.filter((c) => c.id !== event.contestant);
         break;
+      case "ContestantStateApplied": {
+        const who = state.contestants.find((c) => c.id === event.contestant);
+        if (!who) break;
+        const group = pack.states?.[event.state]?.group;
+        if (group) who.states = who.states.filter((s) => s === event.state || pack.states?.[s]?.group !== group);
+        if (!who.states.includes(event.state)) who.states.push(event.state);
+        break;
+      }
+      case "ContestantStateRemoved": {
+        const who = state.contestants.find((c) => c.id === event.contestant);
+        if (who) who.states = who.states.filter((s) => s !== event.state);
+        break;
+      }
       case "Awarded":
         if (!state.awards.some((a) => a.contestant === event.contestant && a.outcome === event.outcome)) {
           state.awards.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrthq/runlog",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "Validate, lint, bundle and test Runlog rule packs.",
   "type": "module",
   "license": "MIT",