Merge branch 'staging/features' into feature/room-entry-flow

Reviewed-on: #3

src/rules/dungeon.ts

@@ -49,7 +49,15 @@ function cloneRoom(room: RoomState): RoomState {
     dimensions: { ...room.dimensions },
     exits: room.exits.map((exit) => ({ ...exit })),
     discovery: { ...room.discovery },
-    encounter: room.encounter ? { ...room.encounter, creatureIds: [...room.encounter.creatureIds] } : undefined,
+    encounter: room.encounter
+      ? {
+          ...room.encounter,
+          creatureIds: [...room.encounter.creatureIds],
+          creatureNames: room.encounter.creatureNames
+            ? [...room.encounter.creatureNames]
+            : undefined,
+        }
+      : undefined,
     objects: room.objects.map((object) => ({
       ...object,
       effects: object.effects ? [...object.effects] : undefined,

src/rules/encounters.test.ts

@@ -0,0 +1,73 @@
+import { describe, expect, it } from "vitest";
+
+import { sampleContentPack } from "@/data/sampleContentPack";
+
+import { createRoomStateFromTemplate } from "./rooms";
+import { resolveRoomEncounter } from "./encounters";
+
+function createSequenceRoller(values: number[]) {
+  let index = 0;
+
+  return () => {
+    const next = values[index];
+    index += 1;
+    return next;
+  };
+}
+
+describe("encounter resolution", () => {
+  it("marks explicitly empty rooms as having no encounter", () => {
+    const room = createRoomStateFromTemplate(
+      sampleContentPack,
+      "room.level1.small.empty",
+      1,
+      "room.level1.small.empty-space",
+    );
+    room.notes.push("Nothing here.");
+
+    const result = resolveRoomEncounter(sampleContentPack, room);
+
+    expect(result.encounter?.creatureIds).toEqual([]);
+    expect(result.encounter?.resultLabel).toBe("No encounter");
+  });
+
+  it("uses room context to resolve a guard encounter table", () => {
+    const room = createRoomStateFromTemplate(
+      sampleContentPack,
+      "room.level1.guard-room",
+      1,
+      "room.level1.normal.guard-room",
+    );
+    room.notes.push("Use the guards encounter table if occupied.");
+
+    const result = resolveRoomEncounter(
+      sampleContentPack,
+      room,
+      createSequenceRoller([6]),
+    );
+
+    expect(result.lookup?.entry.label).toBe("Guard and Warrior");
+    expect(result.encounter?.sourceTableCode).toBe("L1G");
+    expect(result.encounter?.creatureNames).toEqual(["Guard", "Warrior"]);
+  });
+
+  it("resolves crate events from room context when the room hints at crate rolls", () => {
+    const room = createRoomStateFromTemplate(
+      sampleContentPack,
+      "room.level1.storage-area",
+      1,
+      "room.level1.normal.storage-area",
+    );
+    room.notes.push("Roll for food, drink, or crate events while searching.");
+
+    const result = resolveRoomEncounter(
+      sampleContentPack,
+      room,
+      createSequenceRoller([2]),
+    );
+
+    expect(result.lookup?.entry.label).toBe("Giant Rat Pair");
+    expect(result.encounter?.sourceTableCode).toBe("L1CE");
+    expect(result.encounter?.creatureNames).toEqual(["Giant Rat Pair"]);
+  });
+});

src/rules/encounters.ts

@@ -0,0 +1,110 @@
+import { findTableByCode } from "@/data/contentHelpers";
+import type { ContentPack } from "@/types/content";
+import type { EncounterState, RoomState } from "@/types/state";
+
+import { lookupTable, type TableLookupResult } from "./tables";
+import type { DiceRoller } from "./dice";
+
+export type EncounterResolutionResult = {
+  room: RoomState;
+  encounter?: EncounterState;
+  lookup?: TableLookupResult;
+};
+
+const ROOM_HINT_TO_TABLE: Array<{ pattern: RegExp; tableCode: string }> = [
+  { pattern: /\bdogs?\b/i, tableCode: "L1D" },
+  { pattern: /\bguards?\b/i, tableCode: "L1G" },
+  { pattern: /\bmartial\b/i, tableCode: "L1M" },
+  { pattern: /\bworkers?\b/i, tableCode: "L1W" },
+  { pattern: /\blabourers?\b/i, tableCode: "L1P" },
+  { pattern: /\bpreacher\b/i, tableCode: "L1P" },
+  { pattern: /\banimals?\b/i, tableCode: "L1A" },
+  { pattern: /\bsnakes?\b/i, tableCode: "L1A" },
+  { pattern: /\bfungal\b/i, tableCode: "L1F" },
+  { pattern: /\bslimy\b/i, tableCode: "L1F" },
+  { pattern: /\bcrate\b/i, tableCode: "L1CE" },
+];
+
+function splitEncounterLabel(label: string) {
+  return label
+    .split(/\sand\s/i)
+    .map((part) => part.trim())
+    .filter(Boolean);
+}
+
+function inferEncounterTableCode(room: RoomState) {
+  const noteText = room.notes.join(" ");
+  const flagText = room.flags.join(" ");
+  const combinedText = `${noteText} ${flagText}`;
+
+  for (const mapping of ROOM_HINT_TO_TABLE) {
+    if (mapping.pattern.test(combinedText)) {
+      return mapping.tableCode;
+    }
+  }
+
+  return undefined;
+}
+
+function isNonEncounterRoom(room: RoomState) {
+  const noteText = room.notes.join(" ").toLowerCase();
+  return noteText.includes("nothing here") || noteText.includes("no encounter");
+}
+
+export function resolveRoomEncounter(
+  content: ContentPack,
+  room: RoomState,
+  roller?: DiceRoller,
+): EncounterResolutionResult {
+  if (room.encounter?.resolved) {
+    return {
+      room,
+      encounter: room.encounter,
+    };
+  }
+
+  if (isNonEncounterRoom(room)) {
+    const emptyEncounter: EncounterState = {
+      id: `${room.id}.encounter`,
+      creatureIds: [],
+      creatureNames: [],
+      resultLabel: "No encounter",
+      resolved: true,
+    };
+
+    return {
+      room: {
+        ...room,
+        encounter: emptyEncounter,
+      },
+      encounter: emptyEncounter,
+    };
+  }
+
+  const tableCode = inferEncounterTableCode(room);
+
+  if (!tableCode) {
+    return { room };
+  }
+
+  const table = findTableByCode(content, tableCode);
+  const lookup = lookupTable(table, { roller });
+  const creatureNames = splitEncounterLabel(lookup.entry.label);
+  const encounter: EncounterState = {
+    id: `${room.id}.encounter`,
+    sourceTableCode: tableCode,
+    creatureIds: creatureNames.map((_, index) => `${room.id}.creature.${index + 1}`),
+    creatureNames,
+    resultLabel: lookup.entry.label,
+    resolved: true,
+  };
+
+  return {
+    room: {
+      ...room,
+      encounter,
+    },
+    encounter,
+    lookup,
+  };
+}

src/rules/roomEntry.test.ts

@@ -0,0 +1,115 @@
+import { describe, expect, it } from "vitest";
+
+import { sampleContentPack } from "@/data/sampleContentPack";
+
+import { expandLevelFromExit, initializeDungeonLevel } from "./dungeon";
+import { createRoomStateFromTemplate } from "./rooms";
+import { enterRoom } from "./roomEntry";
+
+function createSequenceRoller(values: number[]) {
+  let index = 0;
+
+  return () => {
+    const next = values[index];
+    index += 1;
+    return next;
+  };
+}
+
+describe("room entry flow", () => {
+  it("marks a newly generated room as entered and resolves an empty encounter", () => {
+    const levelState = initializeDungeonLevel({ content: sampleContentPack });
+    const expanded = expandLevelFromExit({
+      content: sampleContentPack,
+      levelState,
+      fromRoomId: "room.level1.start",
+      exitDirection: "north",
+      roomTableCode: "L1SR",
+      roller: createSequenceRoller([1, 1]),
+    });
+
+    const result = enterRoom({
+      content: sampleContentPack,
+      levelState: expanded.levelState,
+      roomId: expanded.createdRoom.id,
+      at: "2026-03-15T12:00:00.000Z",
+    });
+
+    expect(result.firstEntry).toBe(true);
+    expect(result.encounterResolved).toBe(true);
+    expect(result.room.discovery.entered).toBe(true);
+    expect(result.room.discovery.cleared).toBe(true);
+    expect(result.room.encounter?.resultLabel).toBe("No encounter");
+    expect(result.logEntries.map((entry) => entry.text)).toEqual([
+      "Entered Empty Space.",
+      "Empty Space is quiet.",
+    ]);
+  });
+
+  it("resolves a guard encounter once and records the lookup roll", () => {
+    const levelState = initializeDungeonLevel({ content: sampleContentPack });
+    const guardRoom = createRoomStateFromTemplate(
+      sampleContentPack,
+      "room.level1.guard-room",
+      1,
+      "room.level1.normal.guard-room",
+      { x: 0, y: -1 },
+    );
+
+    levelState.rooms[guardRoom.id] = guardRoom;
+    levelState.discoveredRoomOrder.push(guardRoom.id);
+
+    const result = enterRoom({
+      content: sampleContentPack,
+      levelState,
+      roomId: guardRoom.id,
+      roller: createSequenceRoller([6]),
+      at: "2026-03-15T12:00:00.000Z",
+    });
+
+    expect(result.room.templateId).toBe("room.level1.normal.guard-room");
+    expect(result.lookup?.entry.label).toBe("Guard and Warrior");
+    expect(result.room.encounter?.creatureNames).toEqual(["Guard", "Warrior"]);
+    expect(result.room.discovery.cleared).toBe(false);
+    expect(result.logEntries.map((entry) => entry.type)).toEqual(["room", "roll", "room"]);
+    expect(result.logEntries[1]?.text).toContain("Guard and Warrior");
+  });
+
+  it("does not reroll an encounter when re-entering a room", () => {
+    const levelState = initializeDungeonLevel({ content: sampleContentPack });
+    const guardRoom = createRoomStateFromTemplate(
+      sampleContentPack,
+      "room.level1.guard-room",
+      1,
+      "room.level1.normal.guard-room",
+      { x: 0, y: -1 },
+    );
+
+    levelState.rooms[guardRoom.id] = guardRoom;
+    levelState.discoveredRoomOrder.push(guardRoom.id);
+
+    const firstEntry = enterRoom({
+      content: sampleContentPack,
+      levelState,
+      roomId: guardRoom.id,
+      roller: createSequenceRoller([4]),
+      at: "2026-03-15T12:00:00.000Z",
+    });
+    const secondEntry = enterRoom({
+      content: sampleContentPack,
+      levelState: firstEntry.levelState,
+      roomId: guardRoom.id,
+      roller: createSequenceRoller([6]),
+      at: "2026-03-15T12:05:00.000Z",
+    });
+
+    expect(firstEntry.room.encounter?.resultLabel).toBe("Guard");
+    expect(secondEntry.room.encounter?.resultLabel).toBe("Guard");
+    expect(secondEntry.lookup).toBeUndefined();
+    expect(secondEntry.firstEntry).toBe(false);
+    expect(secondEntry.logEntries.map((entry) => entry.text)).toEqual([
+      "Re-entered Guard Room.",
+      "Encounter in Guard Room: Guard.",
+    ]);
+  });
+});

src/rules/roomEntry.ts

@@ -0,0 +1,164 @@
+import { findRoomTemplateById } from "@/data/contentHelpers";
+import type { ContentPack } from "@/types/content";
+import type { DungeonLevelState, RoomState } from "@/types/state";
+import type { LogEntry } from "@/types/rules";
+
+import type { DiceRoller } from "./dice";
+import { resolveRoomEncounter } from "./encounters";
+import type { TableLookupResult } from "./tables";
+
+export type EnterRoomOptions = {
+  content: ContentPack;
+  levelState: DungeonLevelState;
+  roomId: string;
+  roller?: DiceRoller;
+  at?: string;
+};
+
+export type EnterRoomResult = {
+  levelState: DungeonLevelState;
+  room: RoomState;
+  logEntries: LogEntry[];
+  lookup?: TableLookupResult;
+  firstEntry: boolean;
+  encounterResolved: boolean;
+};
+
+function cloneRoom(room: RoomState): RoomState {
+  return {
+    ...room,
+    position: { ...room.position },
+    dimensions: { ...room.dimensions },
+    exits: room.exits.map((exit) => ({ ...exit })),
+    discovery: { ...room.discovery },
+    encounter: room.encounter
+      ? {
+          ...room.encounter,
+          creatureIds: [...room.encounter.creatureIds],
+          creatureNames: room.encounter.creatureNames
+            ? [...room.encounter.creatureNames]
+            : undefined,
+        }
+      : undefined,
+    objects: room.objects.map((object) => ({
+      ...object,
+      effects: object.effects ? [...object.effects] : undefined,
+    })),
+    notes: [...room.notes],
+    flags: [...room.flags],
+  };
+}
+
+function cloneLevel(levelState: DungeonLevelState): DungeonLevelState {
+  return {
+    ...levelState,
+    rooms: Object.fromEntries(
+      Object.entries(levelState.rooms).map(([roomId, room]) => [roomId, cloneRoom(room)]),
+    ),
+    discoveredRoomOrder: [...levelState.discoveredRoomOrder],
+  };
+}
+
+function getRoomLabel(content: ContentPack, room: RoomState) {
+  if (room.templateId) {
+    return findRoomTemplateById(content, room.templateId).title;
+  }
+
+  return room.notes[0] ?? room.id;
+}
+
+function createLogEntry(
+  id: string,
+  at: string,
+  type: LogEntry["type"],
+  text: string,
+  relatedIds: string[],
+): LogEntry {
+  return {
+    id,
+    at,
+    type,
+    text,
+    relatedIds,
+  };
+}
+
+function formatRollText(lookup: TableLookupResult) {
+  const total = lookup.roll.modifiedTotal ?? lookup.roll.total;
+  const rolledValues = lookup.roll.rolls.join(", ");
+
+  return `Rolled ${lookup.roll.diceKind} [${rolledValues}] on ${lookup.tableId} for ${total}: ${lookup.entry.label}.`;
+}
+
+export function enterRoom(options: EnterRoomOptions): EnterRoomResult {
+  const levelState = cloneLevel(options.levelState);
+  const room = levelState.rooms[options.roomId];
+
+  if (!room) {
+    throw new Error(`Unknown room id: ${options.roomId}`);
+  }
+
+  const at = options.at ?? new Date().toISOString();
+  const roomLabel = getRoomLabel(options.content, room);
+  const firstEntry = !room.discovery.entered;
+  room.discovery.entered = true;
+
+  const resolution = resolveRoomEncounter(options.content, room, options.roller);
+  const nextRoom = resolution.room;
+  const encounterResolved = Boolean(resolution.encounter);
+
+  if (resolution.encounter && resolution.encounter.creatureIds.length === 0) {
+    nextRoom.discovery.cleared = true;
+  }
+
+  levelState.rooms[nextRoom.id] = nextRoom;
+
+  const entryVerb = firstEntry ? "Entered" : "Re-entered";
+  const logEntries: LogEntry[] = [
+    createLogEntry(
+      `${nextRoom.id}.entry.${firstEntry ? "first" : "repeat"}`,
+      at,
+      "room",
+      `${entryVerb} ${roomLabel}.`,
+      [nextRoom.id],
+    ),
+  ];
+
+  if (resolution.lookup) {
+    logEntries.push(
+      createLogEntry(
+        `${nextRoom.id}.entry.roll`,
+        at,
+        "roll",
+        formatRollText(resolution.lookup),
+        [nextRoom.id, resolution.lookup.tableId],
+      ),
+    );
+  }
+
+  if (resolution.encounter) {
+    const encounterText =
+      resolution.encounter.creatureIds.length === 0
+        ? `${roomLabel} is quiet.`
+        : `Encounter in ${roomLabel}: ${resolution.encounter.resultLabel ?? "Unknown threat"}.`;
+
+    logEntries.push(
+      createLogEntry(
+        `${nextRoom.id}.entry.encounter`,
+        at,
+        "room",
+        encounterText,
+        [nextRoom.id, resolution.encounter.id],
+      ),
+    );
+  }
+
+  return {
+    levelState,
+    room: nextRoom,
+    logEntries,
+    lookup: resolution.lookup,
+    firstEntry,
+    encounterResolved,
+  };
+}

src/rules/rooms.ts

@@ -136,7 +136,9 @@ export function createRoomStateFromTemplate(
     },
     encounter: undefined,
     objects: [],
-    notes: [template.text ?? template.title].filter(Boolean),
+    notes: [template.text ?? template.title, template.encounterText].filter(
+      (note): note is string => Boolean(note),
+    ),
     flags: [
       `table:${template.tableCode}`,
       `entry:${template.tableEntryKey}`,

src/schemas/state.ts

@@ -110,6 +110,8 @@ export const encounterStateSchema = z.object({
   id: z.string().min(1),
   sourceTableCode: z.string().optional(),
   creatureIds: z.array(z.string()),
+  creatureNames: z.array(z.string()).optional(),
+  resultLabel: z.string().optional(),
   resolved: z.boolean(),
   surprise: z.boolean().optional(),
   rewardPending: z.boolean().optional(),

src/types/state.ts

@@ -111,6 +111,8 @@ export type EncounterState = {
   id: string;
   sourceTableCode?: string;
   creatureIds: string[];
+  creatureNames?: string[];
+  resultLabel?: string;
   resolved: boolean;
   surprise?: boolean;
   rewardPending?: boolean;