@scrthq/runlog 0.0.42 → 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."),
@@ -26520,7 +26522,10 @@ var EntryBase = {
   grants: external_exports.array(Id).optional().describe(
     "States applied to the relevant subject on resolution. Shorthand for an applyState trigger."
   ),
-  tags: external_exports.array(external_exports.string()).optional().describe("Free tags, for cross-referencing and for filtering results out in some modes.")
+  tags: external_exports.array(external_exports.string()).optional().describe("Free tags, for cross-referencing and for filtering results out in some modes."),
+  points: external_exports.number().int().min(0).optional().describe(
+    "What a contestant earns for completing this result in a moderated mode. A result with points is a challenge the moderator can award; one without is an effect that lands on everyone."
+  )
 };
 var LookupEntry = external_exports.object({
   ...EntryBase,
@@ -26640,7 +26645,8 @@ var Capability = external_exports.enum([
   "journal",
   "bandsResolution",
   "opposedResolution",
-  "keyedResolution"
+  "keyedResolution",
+  "moderated"
 ]).describe("An engine feature this pack needs in order to play correctly.");
 var Vocabulary = external_exports.object({
   run: external_exports.object({
@@ -26665,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(
@@ -26855,6 +26864,16 @@ var Mode = external_exports.object({
   ).optional().describe(
     "Per-unit overrides, for modes with a fixed shape \u2014 'unit three always suffers a consequence', and the like."
   ),
+  moderated: external_exports.object({
+    contestants: external_exports.object({
+      min: external_exports.number().int().min(1).default(2).describe("Fewest contestants."),
+      max: external_exports.number().int().min(1).default(10).describe("Most contestants.")
+    }).strict().default({ min: 2, max: 10 }).describe("How many people race. The moderator is not one of them."),
+    award: external_exports.enum(["first", "everyone"]).default("first").describe("Whether only the first to finish a challenge scores it, or everyone who finishes does."),
+    firstBonus: external_exports.number().int().min(0).default(0).describe("Extra points for finishing first, on top of the result's own. Meaningful with `everyone`.")
+  }).strict().optional().describe(
+    "Moderated play: one person runs the game on the device, a roster of named contestants races every drawn result, and the moderator awards points. Results with `points` are the challenges; everything else lands on everyone."
+  ),
   notes: external_exports.array(external_exports.string()).optional().describe("Reminders shown to the player in this mode.")
 }).strict().describe(
   "A set of deltas over the base ruleset. Keeping modes as deltas rather than separate rulesets is what stops them drifting apart as the pack evolves."
@@ -27245,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) {
@@ -27263,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)) {
@@ -27371,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}`));
         }
@@ -27479,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") {
@@ -27555,6 +27577,17 @@ function lintPack(pack) {
       );
     }
   };
+  const moderatedModes = Object.values(pack.modes).filter((m) => m.moderated);
+  const scoringEntries = Object.values(pack.tables).some((t) => t.entries.some((e) => (e.points ?? 0) > 0));
+  requireCap("moderated", moderatedModes.length > 0, "has a moderated mode");
+  if (moderatedModes.length > 0 && !scoringEntries) {
+    d.push(warn("mode/nothing-to-award", "modes", "a mode is moderated, but no table entry carries points, so there is nothing to award"));
+  }
+  for (const [modeId, m] of Object.entries(pack.modes)) {
+    if (m.moderated && m.moderated.contestants.max < m.moderated.contestants.min) {
+      d.push(err("mode/contestant-range", `modes.${modeId}.moderated.contestants`, `max (${m.moderated.contestants.max}) is below min (${m.moderated.contestants.min})`));
+    }
+  }
   requireCap("decks", usesDecks, "uses decks");
   requireCap("resources", usesResources, "uses resources");
   requireCap("counters", counterIds.size > 0, "declares counters");
@@ -27613,7 +27646,8 @@ var IMPLEMENTED_CAPABILITIES = [
   "journal",
   "bandsResolution",
   "opposedResolution",
-  "keyedResolution"
+  "keyedResolution",
+  "moderated"
 ];
 function parsePack(input2) {
   if (typeof input2 !== "object" || input2 === null) {
@@ -28106,6 +28140,11 @@ function modeLength(pack, mode) {
   return `as many ${n.units} as you like${max ? `, up to ${max}` : ""}`;
 }
 function modePlayers(mode) {
+  const m = mode.moderated;
+  if (m) {
+    const n = m.contestants.min === m.contestants.max ? `${m.contestants.min}` : `${m.contestants.min}\u2013${m.contestants.max}`;
+    return `moderated, ${n} contestants, ${m.award === "everyone" ? "everyone who finishes scores" : "first to finish scores"}${m.firstBonus ? ` (+${m.firstBonus} for first)` : ""}`;
+  }
   const p = mode.players;
   if (!p || p.min <= 1 && p.max <= 1) return "solo";
   return p.min === p.max ? `${p.min} players` : `${p.min}\u2013${p.max} players`;
@@ -28294,7 +28333,8 @@ function tableRows(pack, table, opts) {
       if (e.requires?.length) extras.push(`Only if ${conditionsInWords(pack, e.requires)}; otherwise roll again.`);
     }
     const text = [e.title ? `${e.title}. ` : "", sentence(e.text), ...extras.map((x) => ` ${x}`)].join("");
-    return [keys[i] ?? "", text];
+    const pts = e.points !== void 0 && e.points > 0 ? `${keys[i] ?? ""} \xB7 ${e.points} pt${e.points === 1 ? "" : "s"}` : keys[i] ?? "";
+    return [pts, text];
   });
 }
 function license(pack) {
@@ -28390,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(" ")
       ])
     );
   }
@@ -28777,6 +28817,8 @@ function initialState(pack, e) {
     outcomes: [],
     obligations: [],
     firedOnce: [],
+    contestants: [],
+    awards: [],
     ending: null
   };
 }
@@ -28951,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":
@@ -28984,6 +29030,42 @@ function reduce(pack, log) {
         state.status = "ended";
         state.ending = event.ending;
         break;
+      case "ContestantAdded":
+        if (!state.contestants.some((c) => c.id === event.contestant)) {
+          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({
+            contestant: event.contestant,
+            outcome: event.outcome,
+            table: event.table,
+            entryId: event.entryId,
+            points: event.points,
+            at: event.at
+          });
+        }
+        break;
+      case "AwardRevoked":
+        state.awards = state.awards.filter((a) => !(a.contestant === event.contestant && a.outcome === event.outcome));
+        break;
       case "Checked": {
         const key = `${event.step}|${event.item}`;
         if (event.on) {

package/package.json

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