Merge branch 'worktree-agent-ab151ac84f067999f' into revise/edge-cases-and-sources

course/10-spellgrid/reference/ts/src/content/words.json

@@ -8,6 +8,7 @@
   { "name": "DOOR", "role": "noun" },
   { "name": "SKULL", "role": "noun" },
   { "name": "WATER", "role": "noun" },
+  { "name": "ALL", "role": "noun", "selects": "things" },
   { "name": "KEG", "role": "noun" },
   { "name": "BRAMBLE", "role": "noun" },
   { "name": "HEDGE", "role": "noun" },

course/10-spellgrid/reference/ts/src/engine/puzzle/level.ts

@@ -156,6 +156,10 @@ export class Level {
    * The `YOU` objects move one at a time, the one furthest ahead in `dir` first
    * (oldest first on a tie); each one's move is planned in full, then committed,
    * before the next is planned. Every move uses the rules in force before the first.
+   *
+   * An object steps at most once in a movement phase. A `YOU` object that an
+   * earlier move already carried along (pushed, or moved by any other response)
+   * doesn't start a move of its own, and no later move can make it step again.
    */
   private movement(dir: Dir, destroy: Destroy): void {
     const [dx, dy] = delta(dir);
@@ -165,10 +169,15 @@ export class Level {
       .filter((o) => this.hasProperty(o.id, YOU))
       .sort((a, b) => ahead(b) - ahead(a) || a.id - b.id)
       .map((o) => o.id);
+    const stepped = new Set<ObjectId>();
     for (const id of you) {
       if (this.board.find(id) === undefined) continue; // destroyed by an earlier move
-      const planner = new Planner(this, dir);
-      if (planner.tryMove(id)) this.commit(planner.result(), dir, destroy);
+      if (stepped.has(id)) continue; // already moved, by an earlier move
+      const planner = new Planner(this, dir, stepped);
+      if (!planner.tryMove(id)) continue;
+      const plan = planner.result();
+      this.commit(plan, dir, destroy);
+      for (const moved of plan.moving) if (!plan.destroyed.has(moved)) stepped.add(moved);
     }
   }
 
@@ -187,6 +196,10 @@ export class Level {
    * this. An object named by `X IS NOT X` is deleted, and still makes its `Y`s,
    * as new objects: the negation cancelled `X IS X`.
    *
+   * Negation is settled per object, as in `hasProperty`: an object doesn't become
+   * a `Y` if any active `... IS NOT Y` names it, whatever noun gave it the
+   * conversion (`ALL IS Y` with `X IS NOT Y` leaves every X an X).
+   *
    * Every object is decided from the board as movement left it, before any
    * changes, so `X IS Y` and `Y IS X` swap the Xs and the Ys.
    */
@@ -200,6 +213,7 @@ export class Level {
       if (!locked) {
         for (const r of aboutIt) {
           if (r.negated || !isConversion(r)) continue;
+          if (aboutIt.some((n) => n.negated && n.complement === r.complement)) continue;
           const kind = this.lexicon.thingNamed(r.complement);
           if (kind === undefined) continue;
           const same = (k: Kind) => Kind.format(k) === Kind.format(kind);

course/10-spellgrid/reference/ts/src/engine/puzzle/movement.ts

@@ -63,13 +63,18 @@ export interface MoveContext {
   responses(): readonly Response[];
 }
 
-/** Plans one move on a board it only reads. */
+/**
+ * Plans one move on a board it only reads. `stepped` holds the objects that have
+ * already stepped in this movement phase, in an earlier committed plan: an object
+ * steps at most once per phase, so none of them can step again.
+ */
 export class Planner {
   private plan: Plan = { moving: new Set(), destroyed: new Set() };
 
   constructor(
     private readonly level: MoveContext,
     private readonly dir: Dir,
+    private readonly stepped: ReadonlySet<ObjectId>,
   ) {}
 
   /** Does object `id` have `property`, under the rules in force before the move? */
@@ -98,10 +103,13 @@ export class Planner {
    * Plan object `id` stepping one tile in the move's direction, with whatever
    * the responses add. Returns whether it can. If it can't, the plan is left as
    * it was before the call. An object already planned to move, or to be
-   * destroyed, is out of the way: the answer is yes, and nothing is added.
+   * destroyed, is out of the way: the answer is yes, and nothing is added. An
+   * object that has already stepped in this movement phase can't step again: the
+   * answer is no.
    */
   tryMove(id: ObjectId): boolean {
     if (this.plan.moving.has(id) || this.plan.destroyed.has(id)) return true;
+    if (this.stepped.has(id)) return false;
     const o = this.level.board.get(id);
     const [dx, dy] = delta(this.dir);
     const to: Pos = [o.x + dx, o.y + dy];