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

course/09-turn-pipeline/reference/ts/README.md

@@ -5,7 +5,7 @@ The course's own engine as of the end of Module 9. Part I's card engine is uncha
 - `cards/` (at the package root; not in this directory): Part I's card data, a copy of `course/cards/` staged by `tools/verify-references.mjs`. Part II doesn't read it.
 - `src/engine/puzzle/`: the Part II engine. It names no noun: the engine's own words are the operators `IS`, `AND`, `NOT`, the meta-noun `TEXT`, the property `PUSH` of the base rule `TEXT IS PUSH`, the property `YOU`, which picks the objects that move, and from Module 9 the properties `WIN` (the win check) and `FLOAT` (which objects share a tile).
   - `turn.ts` (new): the turn. `Phase`, `TURN` (the phases in order) and `Hazard` (content's rule for what destroys what).
-  - `level.ts`: a level in play. Module 9 adds `Level.step`, which runs the phases of `TURN`; the conversion phase (`X IS Y` in place, `X IS X` locks, `X IS NOT X` deletes); the hazards phase, which runs content's hazards in order; the win check; `Level.sharing` (the other objects on a tile at the same float level); `won` and `lost`. The `Level` constructor takes the hazards. `moveYou` is now movement, then a reparse.
+  - `level.ts`: a level in play. Module 9 adds `Level.step`, which runs the phases of `TURN`; the conversion phase (`X IS Y` in place, `X IS X` locks, `X IS NOT X` deletes, and `... IS NOT Y` keeps every object it names from becoming a `Y`, as `hasProperty` settles negation per object); the hazards phase, which runs content's hazards in order; the win check; `Level.sharing` (the other objects on a tile at the same float level); `won` and `lost`. The `Level` constructor takes the hazards. `moveYou` is now movement, then a reparse.
   - `grid.ts`: Module 9 adds `Board.setKind`.
   - `word.ts`: Module 9 adds `Lexicon.thingNamed` (what a conversion into a noun makes).
   - `movement.ts`, `parse.ts`, `resolve.ts`: unchanged.
@@ -13,7 +13,7 @@ The course's own engine as of the end of Module 9. Part I's card engine is uncha
 - The rest of `src/engine/`: Part I, unchanged.
 - `src/content/hazards.ts` (new) and `src/content/index.ts`: the hazards, in the order the engine runs them: `SINK`, `HOT`/`MELT`, `DEFEAT`. What destroys what at the end of a turn is content, not engine.
 - `src/content/movement.ts`: unchanged.
-- `src/content/words.json`: Module 9 adds `HOT`, `MELT`, `SINK`, `DEFEAT` and `FLOAT`.
+- `src/content/words.json`: Module 9 adds `HOT`, `MELT`, `SINK`, `DEFEAT` and `FLOAT`, and `ALL`, the Module 7 Expansion Drop, which the Module 9 tests need.
 - `src/harness.ts`: the adapter the course tests call. Module 9 adds `step`, `won` and `lost` on `Baba`.
 
 Run it with the module's tests: `node tools/verify-references.mjs 09` from the course repository.

course/09-turn-pipeline/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": "YOU", "role": "property" },
   { "name": "WIN", "role": "property" },
   { "name": "PUSH", "role": "property" },

course/09-turn-pipeline/reference/ts/src/engine/puzzle/level.ts

@@ -141,6 +141,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): void {
     const [dx, dy] = delta(dir);
@@ -150,10 +154,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);
+      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);
+      for (const moved of plan.moving) if (!plan.destroyed.has(moved)) stepped.add(moved);
     }
   }
 
@@ -169,6 +178,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.
    */
@@ -182,6 +195,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/09-turn-pipeline/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];