Build distinct Joke Shop and TV Studio venues

Add the alley walls, warm lantern, shutters, dumpster, AC clutter and door
step for the Joke Shop. Build the studio stone facade, bulb canopy, glossy
black car, stanchions and barriers. Rebuild only the world container when the
venue changes, so the guard and UI survive; add per-venue navigation checks.
Capture gallery shots 12/13, update the concept mapping and docs. Headless
231/231, Python 87/87, screenshot gate 13 good/0 bad. The vision-judge retry is
tracked separately because the API key is invalid.

AGENTS.md

@@ -14,6 +14,14 @@ The project should be developed in small, reviewable steps. Agents must keep pla
 - `MEMORY.md` — Persistent session memory for important decisions, discoveries, unresolved questions, constraints, and useful implementation context.
 - `README.md` — Root-level documentation for the project. It should explain what the game is, how to work on it, how to run it, and where to find project information.
 - `AGENTS.md` — This collaboration and agent workflow guide.
+- `CHANGELOG.md` — The version history of user-facing changes. Keep an entry for each patch, minor, and major version.
+- `docs/development-status.md` — The implemented-features list and what is not yet implemented. Update it whenever a feature lands, is renamed, or is removed.
+- `docs/architecture.md` — The arc42-style architecture documentation (goals, constraints, building blocks, runtime views, decisions, risks).
+- `docs/gameplay.md` — Gameplay systems, venues, and the escalation model.
+- `docs/asset-tooling.md` — Asset pipelines, model tools, and screenshot gates.
+- `docs/getting-started.md` — Setup, run/test commands, and the controls table.
+- `docs/smoke-checklist.md` — The manual smoke-test checklist.
+- `docs/adr/` — Architecture Decision Records.
 
 ## Required Workflow
 
@@ -75,6 +83,8 @@ When every task in a `TODO.md` section is complete:
 
 Do not move partially completed sections. Leave them in `TODO.md` until all of their tasks are complete, or split the section into smaller sections first.
 
+When a completed section represents shipped functionality, also record the new capability in `docs/development-status.md` so the implemented-features list stays accurate, and write a matching entry in `CHANGELOG.md` (see "Maintain `CHANGELOG.md`" below).
+
 ### 4. Maintain `MEMORY.md`
 
 Use `MEMORY.md` for information that should persist between sessions but does not belong in the general plan or task list.
@@ -82,7 +92,7 @@ Use `MEMORY.md` for information that should persist between sessions but does no
 Record items such as:
 
 - Important design and architecture decisions
-- Current implementation state
+- Notable implementation state and gotchas (the canonical implemented-features list lives in `docs/development-status.md`, not here)
 - Known bugs and workarounds
 - Commands needed to run, test, or build the project
 - Decisions that future agents should not revisit unnecessarily
@@ -132,9 +142,27 @@ The root-level `README.md` is the project’s public-facing technical and projec
 - Links to `PLAN.md`, `TODO.md`, `DONE.md`, `MEMORY.md`, and this file where appropriate
 - Known limitations and contribution guidance
 
-Update `README.md` whenever setup instructions, commands, project structure, or user-facing behavior changes.
+Update `README.md` whenever setup instructions, commands, project structure, or user-facing behavior changes. The README is intentionally concise and links to the `docs/` files; keep `docs/development-status.md` (and the other docs it links to) synchronized with the implementation rather than pasting detail back into the README.
 
-### 7. Implement in Small Increments
+### 7. Maintain `CHANGELOG.md`
+
+The root-level `CHANGELOG.md` records the user-facing changes for every release. It exists so players and contributors can see what changed between versions without reading the commit log.
+
+- Add an entry for every patch, minor, and major version change.
+- Follow Semantic Versioning (`major.minor.patch`): bump major for breaking or vision-level changes, minor for new features, and patch for fixes and small polish.
+- Group each entry under `Added`, `Changed`, `Fixed`, and `Removed` headings, and date every entry.
+- Describe changes in user-facing terms, not as raw commit messages.
+- Add the entry when its work ships. If the version number is not yet known, record it under `Unreleased` and move it into a numbered version when the version is tagged.
+
+When a full level-2 section in `TODO.md` is implemented, completed, and moved to `DONE.md`:
+
+1. Verify the work and mark every checkbox in the section `[x]`.
+2. Use the section heading and its completed items to describe the changes and write a `CHANGELOG.md` entry under the next appropriate version.
+3. Move the section to `DONE.md`.
+
+Do not move a completed section to `DONE.md` without adding its `CHANGELOG.md` entry.
+
+### 8. Implement in Small Increments
 
 For each task:
 
@@ -142,11 +170,11 @@ For each task:
 2. Inspect the relevant files and dependencies.
 3. Make the smallest coherent change that completes the task.
 4. Run the relevant tests, checks, or manual verification.
-5. Update documentation and `MEMORY.md` if the change creates lasting context.
+5. Update documentation if the change creates lasting context: add features to `docs/development-status.md`, adjust the README links or other `docs/` files as needed, and record decisions/gotchas in `MEMORY.md`.
 6. Mark the task complete.
-7. Move its section to `DONE.md` when the entire section is complete.
+7. Move its section to `DONE.md` when the entire section is complete (after recording its `CHANGELOG.md` entry).
 8. Commit the changes to the version control system with a descriptive message.
-9. If a section from `TODO.md` has been fully completed, create a new version or tag in the version control system to mark the milestone.
+9. If a section from `TODO.md` has been fully completed, ensure its `CHANGELOG.md` entry is in place, then create a new version or tag in the version control system to mark the milestone.
 10. Push the committed changes to the shared repository if applicable.
 11. Note the new version or tag created in the version control system in any relevant documentation or handoff summary.
 

CHANGELOG.md

@@ -4,33 +4,64 @@ All notable user-facing changes to Gig Line. The format follows
 [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and versions use
 Semantic Versioning.
 
+## [0.7.0] — 2026-11-01
+
+### Changed
+
+- Agent workflow now requires maintaining this changelog for every patch, minor, and major version.
+
+## [Unreleased]
+
+### Added
+
+- Distinct venue geometry: the Joke Shop is now a narrow brick alley with a
+  shuttered facade, warm wall lantern, dumpster and AC clutter; the TV Studio
+  has a stone facade, bulb-lit canopy, glossy black car and a stanchion/barrier
+  line at the door.
+- The README gallery includes captured Joke Shop and TV Studio views.
+
+### Changed
+
+- Venue geometry is data-driven through `WorldBuilder.VENUE_SPECS`; switching
+  venues rebuilds the world while keeping the guard and UI intact.
+- Each venue has its own navigation bounds and concept-gallery mapping.
+
+### Fixed
+
+- The Joke Shop no longer renders the Hollywood skyline or marquee.
+- The TV Studio no longer uses the boulevard marquee or palm-lined layout.
+
 ## [0.6.1] — 2026-11-01
 
 ### Added
 
-- Gear-fit checks: `tools/blender_assets.py fit` reports head/skirt clearance,
+- Per-phase AI skyline panoramas (day, dusk, night) replacing the flat box skyline.
-  and the headless suite verifies that head and back gear clears the body
+- Higher-detail surface textures with normal maps (brick, concrete, asphalt, awning, and more).
-  silhouette.
+- A runtime image root (`assets/images/`) with a UI and scene art loader; the start menu,
-- A refreshed Influencer portrait and gallery captures with a before/after
+  pause, settings, shift review, radio, wand, inspection, and radial menu are styled against
-  report in `docs/screens/realism/2026-11-01-gear/`.
+  their mockups.
-- An explicit `--portrait-type` override for capturing hooded roles when a
+- NPC face and hand detail: eyes, nose, lips, ears, fingered hands, and cuffed sleeves.
-  scenario spawns one.
+- A staged NPC portrait capture for judging avatar quality up close.
+- Gear-fit checks (`tools/blender_assets.py fit`) and regression tests for head and back gear.
 
 ### Changed
 
-- Narrowed the sunglasses so they sit inside the face silhouette.
+- Scene lighting, fog, sun angle, and night glow retuned to match the AI concept frames;
-- Moved the shoulder bag outboard so it clears both the coat and dress skirts.
+  the Late phase uses wet asphalt.
-- Raised the firefighter helmet so the brim no longer sits on the brow.
+- The flashlight is a tighter forward spot that reads in the dark.
-- Portrait captures now turn the subject toward the camera and hide the blue
+- Sunglasses narrowed to sit inside the face silhouette; shoulder bag moved clear of the
-  focus overlay, so close-ups show the character rather than the UI.
+  coat and dress skirts; firefighter helmet lifted off the brow.
-- The README now links to focused docs pages for gameplay, architecture, setup,
+- The README now links to focused docs pages for gameplay, architecture, setup, asset
-  asset tooling, development status and the manual smoke checklist.
+  tooling, development status, and the manual smoke checklist; `PLAN.md` was compacted
+  into a design plan.
 
 ### Fixed
 
-- The shoulder bag no longer clips through the coat's skirt.
+- Sidewalk overexposure at the entrance reduced to match the concept target.
-- The firefighter helmet no longer cuts into the brow ridge.
+- The body-camera overlay no longer overlaps the shift/reputation/crowd status.
-- The portrait subject no longer faces away from the camera.
+- Selecting a venue releases the menu input lock and recaptures the mouse.
+- The shoulder bag no longer clips through the coat's skirt; the firefighter helmet no
+  longer cuts into the brow ridge; the portrait subject now faces the camera.
 - `--portrait-type` is now parsed and applied instead of being ignored.
 
 ## [0.6.0] — 2026-11-01
@@ -40,20 +71,14 @@ Semantic Versioning.
 - Blender-authored character, gear and prop library with baked ambient occlusion.
 - Higher-resolution environment textures with tangent normal maps.
 - Phase-driven emissive details on library props, characters and street dressing.
-- Dedicated README docs for gameplay, architecture, setup, asset tooling,
-  development status and manual smoke testing.
 
 ### Changed
 
-- Environment lighting, fog, sun angle and night glow were retuned for the new
+- The game was renamed from "Step Line" to "Gig Line".
-  skyline and surface assets.
-- The flashlight beam is visible at night and the NPC detail pass adds faces,
-  hands and cuffs.
 
 ### Fixed
 
-- The body-camera overlay no longer covers the shift status.
+- NPCs now face their movement direction instead of walking backwards.
-- Selecting a venue releases the menu input lock and recaptures the mouse.
 
 ## [0.5.0] — 2026-11-01
 
@@ -76,6 +101,28 @@ Semantic Versioning.
 - Collision and navigation footprints for every street prop.
 - Zoned prop placements with deterministic variants and small clutter.
 
+## [0.3.3] — 2026-11-01
+
+### Added
+
+- Staged in-game captures for the wand screening, escalation HUD, and body-camera timeline screens.
+
+## [0.3.2] — 2026-11-01
+
+### Added
+
+- AI reference mockups for the seven remaining catalogue screens.
+
+## [0.3.1] — 2026-10-31
+
+### Added
+
+- Prop models drawn with a single texture atlas (one material per prop).
+
+### Changed
+
+- The Web build is listed in the README downloads table.
+
 ## [0.3.0] — 2026-10-31
 
 ### Added
@@ -85,3 +132,153 @@ Semantic Versioning.
 - Framed facade windows, door trim, curb and lane markings.
 - Generated street-furniture models and the Web export.
 - Aim-free targeting, a focus cone and precision walk.
+
+## [0.2.16] — 2026-10-31
+
+### Added
+
+- Venues authorable as editor `.tres` resources.
+
+## [0.2.15] — 2026-10-31
+
+### Added
+
+- A vision-model judge for comparing screenshots against reference designs.
+
+## [0.2.14] — 2026-10-31
+
+### Added
+
+- Anonymous release downloads enabled on the host.
+
+### Fixed
+
+- `Strings.fmt` keeps positional placeholders stable when new keys are added.
+
+## [0.2.13] — 2026-10-31
+
+### Added
+
+- Missing scenario content: Joke Shop reservation/ID cases, wand refusal and late
+  arrival events, the studio filming-boundary repeat, and a celebrity-arrival crowd spike.
+
+## [0.2.12] — 2026-10-31
+
+### Fixed
+
+- Release uploads fail loudly instead of leaving an empty release with a green job.
+- Pruned releases restored and CI publishing verified end to end.
+
+## [0.2.11] — 2026-10-31
+
+### Fixed
+
+- Releases publish using the runner's checkout credentials when no token or git
+  credentials exist.
+
+## [0.2.10] — 2026-10-31
+
+### Fixed
+
+- Release publishing fixed with a CI token fallback.
+
+## [0.2.9] — 2026-10-31
+
+### Added
+
+- Accessibility pass: escalation feedback that reads in grayscale and a working HUD font scale.
+
+## [0.2.8] — 2026-10-31
+
+### Added
+
+- Procedural crowd ambience that rises with crowd mood, and a radio crackle.
+
+## [0.2.7] — 2026-10-31
+
+### Added
+
+- NPC theater poses: sitting, taking photos, filming, and performing.
+
+## [0.2.6] — 2026-10-31
+
+### Added
+
+- A body-camera timeline on the shift review for stepping through recorded events.
+
+## [0.2.5] — 2026-10-31
+
+### Added
+
+- Emergency aftermath: evacuation clears the entrance, and unjustified calls write
+  an investigation note with a false-report reputation hit.
+
+## [0.2.4] — 2026-10-31
+
+### Added
+
+- Crowd presentation: onlookers rubberneck at incidents and clear out during panic.
+
+### Fixed
+
+- NPC navigation issues resolved.
+
+## [0.2.3] — 2026-10-31
+
+### Added
+
+- Remaining PLAN actions: eye contact, "I recognize this person", a formal-warning
+  body-camera flag, blocking that stations the guard in front of the door, and
+  requesting a reason for entry.
+
+### Fixed
+
+- A dead incident-recording path.
+
+## [0.2.2] — 2026-10-31
+
+### Added
+
+- Session shell: startup menu with venue selection, pause overlay, settings
+  persistence, and a "run another shift" flow back to the menu.
+- Control pass: focus cone, head ring, radial action menu, and named input actions.
+
+### Fixed
+
+- Release publishing now uploads the installer and AppImage.
+
+## [0.2.1] — 2026-10-31
+
+### Added
+
+- Windows NSIS installer and Linux AppImage packaging; all exports embed the PCK.
+- An AI texture generation mode in the asset pipeline.
+
+### Fixed
+
+- NSIS build fixed for Linux (absolute defines, space-free installed exe, BMP icon).
+- Runtime hygiene: RefCounted cycle cleanup, full-length shifts, and a wand cooldown.
+
+## [0.2.0] — 2026-10-31
+
+### Added
+
+- First playable build of the security-guard simulation at the Hollywood Boulevard entrance.
+- Core simulation: shift coordination, venue scenarios, event scheduling, NPC movement
+  and states, and escalation from observation through deterrence, warnings, and blocking.
+- Access verification for wristbands, IDs, tickets, credentials, and guest lists, with
+  admit/redirect/hold/refuse decisions and feedback scoring.
+- Escalation levels 0–5 with radio assistance and a hold-to-confirm emergency call.
+- Incident recording, body-camera evidence, reputation scoring, crowd reactions, and
+  an end-of-shift review.
+- Scenario content for Hollywood Boulevard, The Joke Shop, and the TV Studio, including
+  a mental-health crisis event.
+- A protester NPC, the "call someone else" reaction, a lockable door, and a flashlight.
+- Save/persistence, navmesh pathfinding, and JSON localization.
+- Visual polish: phase lighting, street lamps, marquee, street dressing, and NPC variety.
+- Detailed graphics: authored textures, a humanoid NPC rig, and HUD/inspection feedback.
+- Downloadable Linux, Windows, and macOS builds published by CI.
+
+### Removed
+
+- The dialogue tone-of-voice picker (reactions now depend on escalation level and NPC profile).

DONE.md

@@ -1242,3 +1242,40 @@ live in `tools/blender_assets.py` (`_build_gear()`), the contract in `docs/blend
 - [x] Consider a second character close-up for a hoodie/winter NPC so headgear is covered too.
       `--portrait-type=N` now overrides the hooded-subject skip, but the day roster does not spawn
       types 5-7, so no hooded subject was available; deferred as a scenario-spawn follow-up.
+
+## Venue geometry and the committed gallery (v0.6.1)
+
+Completed 2026-11-01. All three venues now build distinct geometry from `WorldBuilder.VENUE_SPECS`; the gallery has Joke Shop and TV Studio views (13 good / 0 bad). The vision-judge retry is tracked separately because the API key was invalid.
+
+Today all three venues share the Hollywood `WorldBuilder` geometry, so the Joke Shop and studio
+concepts are only compared on lighting (noted in `tools/scene_concepts.py` `SHOTS`). They also
+have no stage in the committed `docs/screenshots/` gallery, only in `capture_realism.gd`.
+
+- [x] Extract a geometry spec per venue instead of branching inline: `WorldBuilder.VENUE_SPECS`
+      now holds facade/stair/street/nav dimensions, window/pilaster rows, guard spawn, feature
+      flags and prop placements for Hollywood, Joke Shop and TV Studio. Unknown ids fall back to
+      Hollywood; `test_venue_geometry_specs_are_distinct_and_defaulted` checks the narrow Joke Shop
+      facade, disabled skyline/marquee, studio bulb-canopy flag and fallback.
+- [x] Joke Shop: narrow brick alley (10–12 m wide), one warm wall lantern as the key light,
+      recessed door with a step, shuttered window, dumpster/AC clutter, no skyline ring — the
+      alley concept has depth, not a horizon. `_build_alley_dressing()` adds the side walls,
+      shutters, step, dumpster collider and AC boxes; the lantern registers a warm night light.
+- [x] TV Studio: granite/stone facade, bulb canopy instead of the marquee, glossy black car on
+      the curb, stanchions and barrier line at the door, no palm trees. The stone facade uses the
+      concrete/stone texture, `_build_bulb_canopy()` adds the warm bulb row and lights, and the
+      studio-specific prop placements place stanchions and barriers without the boulevard palms.
+- [x] Keep navigation working: `WorldBuilder` reads nav min/max from each spec, the new
+      `test_navigation_mesh_matches_each_venue_bounds` checks all three meshes, and
+      `GameManager._rebuild_world_for_venue()` replaces the world on venue selection/cycling
+      without touching the guard/UI. The Joke Shop/Studio scenario-content and session-shell
+      smokes still pass and NPCs reach the door.
+- [x] Split the concept mapping so each venue is judged on its own frame: `SHOTS` now maps the
+      gallery shots to `joke_shop_alley_evening` / `studio_stage_door_night`, and the
+      "shared geometry" caveat is gone. `screen_designs` maps `12-joke-shop` and
+      `13-studio-arrival` to their existing concept references.
+- [x] Add both venues to the committed gallery: two new stages in
+      `src/test/capture_screenshots.gd` (`12-joke-shop.png`, `13-studio-arrival.png`) reuse the
+      existing `joke_shop_queue` / `studio_arrival` designs. `check_screenshots.sh` is **13 good /
+      0 bad**; the new screenshots are 18.2 / 32.6 MAE against their references.
+- [-] Update `docs/architecture.md` (venue geometry), `README.md` (gallery) and the screenshot
+      table when the stages land.

MEMORY.md

@@ -72,7 +72,7 @@ Session memory for durable decisions, state, and gotchas. Keep concise, remove o
 
 ## Handoff (read this first)
 
-- **Status (2026-11-01, after the gear-fit pass):** v0.6.1 is released. Post-v0.6.0 the
+- **Status (2026-11-01, after the venue-geometry pass):** v0.7.0 is released. Post-v0.6.0 the
   realism pass, the visual-alignment pass and the NPC face/hand pass all landed. Headless
   **229/229**, Python tooling **87/87**, `tools/check_screenshots.sh` **11 good / 0 bad**,
   `screen_designs.py compare` 11 good / 0 bad, `scene_concepts.py audit` all GOOD,
@@ -246,6 +246,8 @@ Session memory for durable decisions, state, and gotchas. Keep concise, remove o
   helmet is lifted 2 cm above the brow. `test_npc_character` guards head/back gear in Godot.
   Blender's GLB export is byte-nondeterministic for unchanged assets (padding/index order), so do
   not commit a full no-op rebuild; rebuild only the assets whose geometry changed.
+- **Venue geometry (v0.6.1+):** `WorldBuilder.VENUE_SPECS` is the per-venue table; `WorldBuilder.new(root, id)` / `set_venue()` select it, unknown ids fall back to `hollywood_building`. Dimensions, window/pilaster rows, stairs, street, nav bounds, guard spawn, feature flags and prop placements are read from the spec. `GameManager.world_root` holds only the world; `_rebuild_world_for_venue()` frees/recreates it on venue selection/cycling so guard/UI survive. Joke Shop uses procedural alley walls/shutters/dumpster/AC; TV Studio uses a stone facade, bulb canopy, car paint and barrier placements. Gallery shots 12/13 use the existing `joke_shop_queue`/`studio_arrival` references.
+- **Screen-design judge (2026-11-01):** `screen_designs.py judge` could not run because `OPENROUTER_API_KEY` returned HTTP 400 "API key not valid". `check_screenshots.sh` still passed 13/13; the judge retry is a TODO follow-up.
 - **Portrait capture:** `capture_realism.gd` faces the **Rig** toward the camera (using the
   inverse look direction) and hides the blue `FocusCircle`; the old code used the wrong yaw and
   left the focus disc over the face. An explicit `--portrait-type=N` now overrides the hooded

PLAN.md

@@ -172,7 +172,7 @@ Primary decisions: [ADR-0007](docs/adr/0007-locomotion-and-input-layers.md), [AD
 
 ## Versioning and Delivery
 
-`config/version` in `project.godot` is the single version source (currently `0.6.1`). Releases are tagged `v<version>`; the CI pipeline builds and publishes the six artifacts. Version bumps follow [Semantic Versioning](https://semver.org/). See [`docs/RELEASING.md`](docs/RELEASING.md) and [`README.md`](README.md) for commands.
+`config/version` in `project.godot` is the single version source (currently `0.7.0`). Releases are tagged `v<version>`; the CI pipeline builds and publishes the six artifacts. Version bumps follow [Semantic Versioning](https://semver.org/). See [`docs/RELEASING.md`](docs/RELEASING.md) and [`README.md`](README.md) for commands.
 
 ## Design Direction
 

README.md

@@ -15,9 +15,11 @@ The central design goal is simple:
 | ![Late night: street lamps lit, marquee glowing, dark Hollywood Boulevard](docs/screenshots/05-late-night-avenue.png) | ![Night shift: guard flashlight cutting through the dark](docs/screenshots/06-night-flashlight.png) |
 | ![Wand screening at The Joke Shop: false alarm on keys](docs/screenshots/07-wand-screening.png) | ![Escalation HUD at L3 with body camera armed and reaction log](docs/screenshots/08-escalation-hud.png) |
 | ![Body-camera timeline: formal warning, body camera on, blocking](docs/screenshots/09-body-camera-timeline.png) | ![Prop gallery: the six generated street-furniture models on a studio backdrop](docs/screenshots/10-prop-gallery.png) |
-| ![Precision walk at the venue steps with the HUD chip visible](docs/screenshots/11-precision-walk.png) | |
+| ![Precision walk at the venue steps with the HUD chip visible](docs/screenshots/11-precision-walk.png) | ![The Joke Shop: a narrow brick alley with shuttered windows, a warm wall lantern and a dumpster](docs/screenshots/12-joke-shop.png) |
+| ![Late-night TV studio arrival: stone facade, bulb canopy, black car and barriers](docs/screenshots/13-studio-arrival.png) | |
 
-*Screenshots are generated by [`src/test/capture_screenshots.gd`](src/test/capture_screenshots.gd) and [`src/test/capture_prop_gallery.gd`](src/test/capture_prop_gallery.gd) from the current build — day, late-night, wand screening, escalation, shift-review timeline, precision walk, and the prop lineup.*
+*Screenshots are generated by [`src/test/capture_screenshots.gd`](src/test/capture_screenshots.gd) and [`src/test/capture_prop_gallery.gd`](src/test/capture_prop_gallery.gd) from the current build — day, late-night, wand screening, escalation, shift-review timeline,
+precision walk, the Joke Shop alley, the TV Studio arrival, and the prop lineup.*
 
 ## ⬇️ Downloads
 
@@ -35,9 +37,9 @@ The central design goal is simple:
 > Downloads are public (no sign-in required) since the host's instance-wide
 > `REQUIRE_SIGNIN_VIEW` was disabled on 2026-10-31.
 >
-> **Latest: v0.6.1** — fitted NPC gear, a refreshed portrait/gallery capture and the
+> **Latest: v0.7.0** — distinct Joke Shop and TV Studio geometry, fitted NPC gear,
-> post-v0.6.0 realism/visual-alignment work (v2 skylines/textures, UI mockup art,
+> and the post-v0.6.0 realism/visual-alignment work (v2 skylines/textures, UI mockup
-> flashlight beam, HUD fixes).
+> art, flashlight beam, HUD fixes).
 > Releases are built automatically when a `vX.Y.Z` tag is pushed
 > (see [`docs/RELEASING.md`](docs/RELEASING.md)); manual builds use
 > `./tools/build_releases.sh`. Installer/AppImage packaging runs in the same pipeline
@@ -116,9 +118,9 @@ Full setup, every run/test/smoke command, and the controls table are in
 
 ## Development Status
 
-v0.6.1 shipped (fitted NPC gear and refreshed captures) on top of v0.6.0's
+v0.7.0 shipped distinct venue geometry: the Joke Shop alley and TV Studio
-Blender character/gear/prop library, baked AO and environment lift. The
+entrance no longer share the Hollywood layout. It builds on v0.6.1's fitted NPC
-realism and visual-alignment passes are part of the same release. See
+gear and v0.6.0's Blender asset library, baked AO and environment lift. See
 [`docs/development-status.md`](docs/development-status.md) for the full
 implemented list and [`TODO.md`](TODO.md) for what's next. Manual verification
 uses the [`docs/smoke-checklist.md`](docs/smoke-checklist.md).

TODO.md

@@ -3,34 +3,7 @@
 Work is grouped by theme. Each item should be small enough to complete and verify on its own;
 see `AGENTS.md` for the workflow and `MEMORY.md` for the decisions behind these plans.
 
-## Venue geometry and the committed gallery (v0.6.1)
+## Forward+ desktop preset and a volumetric flashlight (v0.7.1)
-
-Today all three venues share the Hollywood `WorldBuilder` geometry, so the Joke Shop and studio
-concepts are only compared on lighting (noted in `tools/scene_concepts.py` `SHOTS`). They also
-have no stage in the committed `docs/screenshots/` gallery, only in `capture_realism.gd`.
-
-- [ ] Extract a geometry spec per venue instead of branching inline: a `scenario.` (or
-      `WorldBuilder`) table of facade width/height, door style, window rows, awning/marquee
-      flags, street furniture set, palette and props, defaulting to the Hollywood values so
-      nothing regresses.
-- [ ] Joke Shop: narrow brick alley (10–12 m wide), one warm wall lantern as the key light,
-      recessed door with a step, shuttered window, dumpster/AC clutter, no skyline ring — the
-      alley concept has depth, not a horizon.
-- [ ] TV Studio: granite/stone facade, bulb canopy instead of the marquee, glossy black car on
-      the curb, stanchions and barrier line at the door, no palm trees.
-- [ ] Keep navigation working: regenerate/verify the `NavigationRegion3D` bake per venue,
-      update sidewalk/steps/door waypoints (Joke Shop and Studio already have `sidewalk` and
-      `steps_end`), and confirm NPCs still reach the door (smoke + `test_venue_*`).
-- [ ] Split the concept mapping so each venue is judged on its own frame (`joke_shop_*`,
-      `studio_*`) and drop the "shared geometry" caveat in `tools/scene_concepts.py`.
-- [ ] Add both venues to the committed gallery: two new stages in
-      `src/test/capture_screenshots.gd` (`12-joke-shop.png`, `13-studio-arrival.png`) reusing the
-      existing `joke_shop_queue` / `studio_arrival` designs, then `check_screenshots.sh` and a
-      fresh judge run.
-- [ ] Update `docs/architecture.md` (venue geometry), `README.md` (gallery) and the screenshot
-      table when the stages land.
-
-## Forward+ desktop preset and a volumetric flashlight (v0.7.0)
 
 The Compatibility renderer has no volumetrics, so the flashlight is a tight pool of light with
 no visible shaft. A second desktop build can render it properly without touching the CI/default
@@ -53,6 +26,8 @@ path.
 
 ## Realism follow-ups (deferred)
 
+- [ ] Re-run the screen-design judge for `12-joke-shop` / `13-studio-arrival` when
+      `OPENROUTER_API_KEY` is valid; the 2026-11-01 attempt failed with an invalid-key HTTP 400.
 - [ ] Capture a hooded/winter NPC close-up once a scenario spawns types 5-7 (the explicit
       `--portrait-type` override is already in `capture_realism.gd`).
 - [ ] Human-authored tree/hedge silhouettes: the whole scene now reads well except the foliage,

docs/architecture.md

@@ -37,7 +37,7 @@ This document follows the structure of the arc42 architecture documentation temp
 - **MINOR** — new venues, NPC archetypes, systems, or features that are backward compatible.
 - **PATCH** — bug fixes and small polish that do not change behavior.
 
-The single source of truth for the version is `config/version` in `project.godot` (currently `0.6.1`). Each release is tagged in git as `v<version>` (e.g. `v0.6.0`). The `0.x` series is pre-1.0, so MINOR bumps may introduce breaking changes while the prototype is still stabilizing. `tools/build_releases.sh` and `tools/publish_release.sh` read the version from `project.godot`, so bumping it there is the only required step before a release. The full bump checklist lives in [`RELEASING.md`](RELEASING.md).
+The single source of truth for the version is `config/version` in `project.godot` (currently `0.7.0`). Each release is tagged in git as `v<version>` (e.g. `v0.6.0`). The `0.x` series is pre-1.0, so MINOR bumps may introduce breaking changes while the prototype is still stabilizing. `tools/build_releases.sh` and `tools/publish_release.sh` read the version from `project.godot`, so bumping it there is the only required step before a release. The full bump checklist lives in [`RELEASING.md`](RELEASING.md).
 
 ## 3. Context and Scope
 
@@ -78,7 +78,7 @@ The player interacts with NPCs, venue entrances, access artifacts, equipment, st
 - `CrowdSystem` models queues, attention, congestion, and public reaction.
 - `ShiftReview` presents decisions, consequences, and improvement opportunities.
 - `SurfaceMaterials` (`src/game/materials.gd`) holds the surface profiles, textured albedo/normal recipes, baked-AO wiring, glass/emissive recipes, and the environment tune-up (tonemapping, glow, fog, grading) that the phase lighting applies.
-- `WorldBuilder` assembles the procedural venue, prefers the Blender prop library in `assets/models/blender/props/`, and falls back to `assets/models/generated/` or primitives. It also wires the phase-driven library emissives and street dressing.
+- `WorldBuilder` assembles the procedural venue from a per-venue `VENUE_SPECS` table (facade, windows, stairs, street, nav bounds, guard spawn, feature flags and prop placements), prefers the Blender prop library in `assets/models/blender/props/`, and falls back to `assets/models/generated/` or primitives. `GameManager` rebuilds only the `World` container when the venue changes, so the guard/UI and their state survive. It also wires the phase-driven library emissives and street dressing.
 - `src/game/ui/art.gd` loads runtime UI/scene art from `assets/images/ui/` and `assets/images/scenes/`, with null fallbacks so panels keep their procedural layouts.
 - `tools/model_pipeline.py` builds and audits the street-prop `.glb` models and packs their colour atlases.
 - `tools/npc_pipeline.py` builds and audits the skinned NPC base model (`assets/models/generated/npc_base.glb`) and its per-slot material maps, with an optional AI fabric override (ADR-0013).

docs/development-status.md

@@ -5,7 +5,7 @@ Implemented so far:
 - Godot 4.3 project scaffold, input map, procedural world builder
 - Venue-driven simulation core: `ShiftCoordinator`, `VenueScenario`, `EventScheduler`, `NPCController` + FSM, `AccessVerifier`, `EscalationManager`, `RadioSystem`, `IncidentRecorder`, `ReputationEvaluator`, `CrowdSystem`
 - Three authored scenarios (Hollywood Boulevard building, The Joke Shop, Late Night TV Studio) with access policies, NPC archetypes, and event pools
-- Headless unit tests: **229 passing** (access rules and venue-correct access loadout, escalation, radio cooldown/battery, NPC reaction determinism, door lock, flashlight perception, persistence round-trip, settings round-trip, input remaps, navmesh, step colliders, skyline alpha, scenario data, full-shift simulation, wand screening, responder dispatch, localization strings, focus cone, action wheel, session shell, PLAN verbs and incident recording, crowd presentation, emergency aftermath, body-camera timeline, NPC theater poses, audio, accessibility, authored scenario content, string formatting, `.tres` venue round-trip, surface materials and environment, focus ranking and outfit/gait helpers, generated prop models, web export preset, prop atlas material, player movement, NPC character layers/LOD/queue, input bindings)
+- Headless unit tests: **231 passing** (access rules and venue-correct access loadout, escalation, radio cooldown/battery, NPC reaction determinism, door lock, flashlight perception, persistence round-trip, settings round-trip, input remaps, navmesh, step colliders, skyline alpha, scenario data, full-shift simulation, wand screening, responder dispatch, localization strings, focus cone, action wheel, session shell, PLAN verbs and incident recording, crowd presentation, emergency aftermath, body-camera timeline, NPC theater poses, audio, accessibility, authored scenario content, string formatting, `.tres` venue round-trip, surface materials and environment, focus ranking and outfit/gait helpers, generated prop models, web export preset, prop atlas material, player movement, NPC character layers/LOD/queue, input bindings)
 - Simulation extras: protester archetype, CALL_SOMEONE reaction, door lock/secure mechanic (visual indicator), flashlight with night perception bonus, LATE shift phase reaching the violent-threat event
 - First-person prototype with interaction HUD, access inspection, wand screening, radio report form (incl. emergency hold-to-confirm), dispatched responder avatars, aim-free targeting, venue cycling between all three scenarios, color-coded escalation feedback, procedural audio cues, navigation-mesh NPC paths, JSON-backed localized strings, persisted shift history, debug overlay, and shift review
 - Control pass: focus cone on NPC heads with a billboarded blue circle in front of the face and name, action wheel (LMB/Space) with de-escalation-first slices, mouse-look freeze while a panel is open, acceleration-based walking, and named input actions (`action_menu`, `confirm`, `cancel`, `inspect`, `wand`)
@@ -41,6 +41,7 @@ Implemented so far:
 - Visual alignment: start/venue menu, pause, settings, shift review, radio, wand, inspection, timeline, HUD target chip/escalation bar, and radial menu now use or match their AI references in `assets/images/ui/`. The runtime art loader (`src/game/ui/art.gd`) falls back cleanly when a file is missing.
 - Realism adoption (post-v0.6.0): v2 per-phase skylines and surface tiles with normal maps, retuned sun/exposure/fog, wet asphalt, denser foliage, a visible additive flashlight beam, and refreshed staging captures. `tools/check_screenshots.sh` is the repeatable capture/compare gate; judge is clean of `diff` verdicts.
 - Input/reliability fixes: selecting a venue now releases the start-menu input lock and recaptures the mouse; the body-camera overlay no longer covers the shift status.
+- Venue geometry (v0.7.0): the Joke Shop now builds as a narrow brick alley with a warm wall lantern, shutters, dumpster/AC clutter and no skyline; the TV Studio builds a stone facade, bulb canopy, glossy black car and barrier line. `WorldBuilder.VENUE_SPECS` drives facade/street/nav dimensions, and `GameManager` rebuilds only the world container when the venue changes.
 - Gear fit (post-v0.6.0): Blender gear is measured against the avatar head/skirt silhouette and the checks run in both the Python tooling and the headless suite. Sunglasses, the shoulder bag and the firefighter helmet were fitted to the new faces; the Influencer portrait and gallery were recaptured with a before/after report.
 
 Not yet implemented: a desktop-only Forward+ preset (the renderer stays GL Compatibility for Web parity), live 3D body-camera replay, editor-based GUT integration, and crowd performance profiling/LOD (see [`TODO.md`](../TODO.md)).

docs/gameplay.md

@@ -26,11 +26,11 @@ Authorized people must either be recognized by the guard or present a valid wris
 
 ### The Joke Shop
 
-The Joke Shop is a comedy-club scenario. The door person checks IDs, tickets, reservations, and guest-list status, then uses a handheld security wand according to venue policy. The player must interpret wand alerts rather than treating every alert as proof of a weapon; keys, belts, phones, and other harmless objects can trigger false alarms.
+The Joke Shop is a narrow brick alley with a recessed door, shuttered windows, a warm wall lantern, a dumpster and wall-mounted AC clutter. The door person checks IDs, tickets, reservations, and guest-list status, then uses a handheld security wand according to venue policy. The player must interpret wand alerts rather than treating every alert as proof of a weapon; keys, belts, phones, and other harmless objects can trigger false alarms.
 
 ### Hollywood Boulevard Late Night TV Studio
 
-This scenario combines the previously defined NPC types with a busy television-studio entrance. The player manages audience members, production staff, performers, guests, deliveries, celebrity arrivals, tourists, street performers, influencers, confused visitors, intoxicated pedestrians, trespassers, people experiencing a mental-health crisis, and rare violent threats.
+This scenario combines the previously defined NPC types with a busy television-studio entrance: a stone facade, a bulb-lit canopy, a glossy black car at the curb, and stanchions/barriers holding the arrival line. The player manages audience members, production staff, performers, guests, deliveries, celebrity arrivals, tourists, street performers, influencers, confused visitors, intoxicated pedestrians, trespassers, people experiencing a mental-health crisis, and rare violent threats.
 
 The studio uses wristbands, credentials, tickets, guest-list confirmation, and personal recognition to authorize entry. Crowd control, filming boundaries, following authorized guests through the door, and counterfeit credentials are key events.
 

project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="Gig Line"
 config/description="Workplace security simulation about observation, access verification, and proportionate escalation."
-config/version="0.6.1"
+config/version="0.7.0"
 run/main_scene="res://scenes/main.tscn"
 config/features=PackedStringArray("4.3", "GL Compatibility")
 

src/game/game_manager.gd

@@ -32,6 +32,9 @@ const SettingsPanel := preload("res://src/game/ui/settings_panel.gd")
 const EventTimeline := preload("res://src/game/ui/event_timeline.gd")
 
 var world_builder: WorldBuilder = null
+## Dedicated container for the procedural world, so switching venues can rebuild
+## the geometry without touching the guard, UI, or other scene-root children.
+var world_root: Node3D = null
 var door := DoorState.new()
 var flashlight_on := false
 var body_camera_on := false
@@ -135,8 +138,11 @@ func _ready() -> void:
 	scene_root = Node3D.new()
 	scene_root.name = "SceneRoot"
 	add_child(scene_root)
+	world_root = Node3D.new()
+	world_root.name = "World"
+	scene_root.add_child(world_root)
 
-	world_builder = WorldBuilder.new(scene_root)
+	world_builder = WorldBuilder.new(world_root, active_scenario_id)
 	world_builder.build()
 	_ensure_lighting()
 
@@ -235,9 +241,26 @@ func _build_scenario(id: String) -> VenueScenario:
 func switch_scenario(id: String) -> void:
 	active_scenario_id = id
 	selected_scenario = _build_scenario(id)
+	_rebuild_world_for_venue(id)
 	if coordinator:
 		restart_shift()
 
+## Rebuild the procedural venue in place. The guard/UI stay under `SceneRoot`;
+## only the `World` container is replaced, so navigation, props, lights and the
+## venue-specific dressing match the selected scenario.
+func _rebuild_world_for_venue(id: String) -> void:
+	if world_root == null:
+		return
+	for child in world_root.get_children():
+		child.free()
+	world_builder = WorldBuilder.new(world_root, id)
+	world_builder.build()
+	if guard != null:
+		guard.global_position = world_builder.spec.get("guard_spawn", Vector3(0, 0.1, -2.0))
+		guard.rotation.y = PI
+	if world_builder != null:
+		world_builder.set_door_locked(door.locked)
+
 func restart_shift() -> void:
 	if shift_review_panel:
 		shift_review_panel.hide()
@@ -301,6 +324,7 @@ func _on_venue_selected(scenario_id: String) -> void:
 	active_scenario_id = scenario_id
 	_venue_index = maxi(0, VENUE_ORDER.find(scenario_id))
 	selected_scenario = _build_scenario(scenario_id)
+	_rebuild_world_for_venue(scenario_id)
 	if hud:
 		hud.set_wand_icon(false)
 	_reset_shift_state()

src/game/world_builder.gd

@@ -59,21 +59,116 @@ var library_nodes: Array[Node3D] = []
 ## Total triangle budget for the Blender library pieces placed in the world.
 const LIBRARY_TRIANGLE_BUDGET := 60000
 
-func _init(root_node: Node3D) -> void:
+## Per-venue geometry data. The Hollywood values are the fallback: every field
+## here defaults to the long-standing boulevard layout, so adding a venue cannot
+## silently regress the original scene. Joke Shop and TV Studio override the
+## facade/street measurements and feature flags; their bespoke dressing lands in
+## the following tasks.
+const VENUE_SPECS := {
+	"hollywood_building": {
+		"display_name": "Hollywood Boulevard Building",
+		"facade_width": 40.0, "facade_height": 18.0, "facade_depth": 4.0,
+		"facade_center_z": -6.0, "facade_texture": T_BRICK,
+		"facade_tint": Color(0.86, 0.85, 0.83), "facade_role": "brick",
+		"window_columns": [-17.0, -13.6, -10.2, -6.8, 6.8, 10.2, 13.6, 17.0],
+		"pilaster_columns": [-15.3, -11.9, -8.5, -5.1, 5.1, 8.5, 11.9, 15.3],
+		"window_rows": [9.2, 12.4],
+		"stair_width": 8.0, "stair_count": 4, "stair_tread": 0.6, "stair_height": 0.16,
+		"sidewalk_width": 30.0, "sidewalk_depth": 8.0,
+		"street_width": 120.0, "street_depth": 26.0,
+		"nav_min": Vector2(-18.0, -0.6), "nav_max": Vector2(18.0, 20.0),
+		"guard_spawn": Vector3(0.0, 0.1, -2.0),
+		"features": {
+			"marquee": true, "skyline": true, "handrail": true, "sedan": true,
+			"wall_lanterns": true, "palms": true, "street_trees": true,
+			"street_lamps": true, "crosswalk": true, "bulb_canopy": false,
+		},
+	},
+	"joke_shop": {
+		"display_name": "The Joke Shop",
+		"facade_width": 12.0, "facade_height": 12.0, "facade_depth": 5.0,
+		"facade_center_z": -6.5, "facade_texture": T_BRICK,
+		"facade_tint": Color(0.78, 0.66, 0.58), "facade_role": "brick",
+		"window_columns": [-3.8, 3.8],
+		"pilaster_columns": [-5.2, 5.2],
+		"window_rows": [8.2],
+		"stair_width": 5.0, "stair_count": 2, "stair_tread": 0.65, "stair_height": 0.16,
+		"sidewalk_width": 22.0, "sidewalk_depth": 6.0,
+		"street_width": 75.0, "street_depth": 18.0,
+		"nav_min": Vector2(-9.0, -0.6), "nav_max": Vector2(9.0, 14.0),
+		"guard_spawn": Vector3(0.0, 0.1, -1.6),
+		"features": {
+			"marquee": false, "skyline": false, "handrail": false, "sedan": false,
+			"wall_lanterns": true, "palms": false, "street_trees": false,
+			"street_lamps": false, "crosswalk": false, "bulb_canopy": false,
+		},
+		"prop_placements": [],
+	},
+	"tv_studio": {
+		"display_name": "Late Night TV Studio",
+		"facade_width": 30.0, "facade_height": 15.0, "facade_depth": 4.0,
+		"facade_center_z": -6.0, "facade_texture": T_CONCRETE,
+		"facade_tint": Color(0.58, 0.57, 0.55), "facade_role": "stone",
+		"window_columns": [-11.0, -7.2, 7.2, 11.0],
+		"pilaster_columns": [-13.2, -9.0, -5.0, 5.0, 9.0, 13.2],
+		"window_rows": [10.5],
+		"stair_width": 7.0, "stair_count": 3, "stair_tread": 0.6, "stair_height": 0.16,
+		"sidewalk_width": 28.0, "sidewalk_depth": 7.0,
+		"street_width": 100.0, "street_depth": 24.0,
+		"nav_min": Vector2(-14.0, -0.6), "nav_max": Vector2(14.0, 18.0),
+		"guard_spawn": Vector3(0.0, 0.1, -1.8),
+		"sedan_position": Vector3(5.4, 0.1, 8.8), "sedan_rotation": 90.0,
+		"features": {
+			"marquee": false, "skyline": true, "handrail": true, "sedan": true,
+			"wall_lanterns": false, "palms": false, "street_trees": true,
+			"street_lamps": true, "crosswalk": true, "bulb_canopy": true,
+		},
+		"prop_placements": [
+			{"zone": "entrance", "prop": "stanchion", "x": -2.8, "z": 4.4},
+			{"zone": "entrance", "prop": "stanchion", "x": 2.8, "z": 4.4},
+			{"zone": "entrance", "prop": "crowd_barrier", "x": -5.2, "z": 4.2},
+			{"zone": "entrance", "prop": "crowd_barrier", "x": 5.2, "z": 4.2},
+			{"zone": "curb", "prop": "security_podium", "x": 4.6, "z": 5.9, "rot": -15.0},
+		],
+	},
+}
+const DEFAULT_VENUE := "hollywood_building"
+
+var venue_id := DEFAULT_VENUE
+var spec: Dictionary = VENUE_SPECS[DEFAULT_VENUE]
+
+func _init(root_node: Node3D, id: String = DEFAULT_VENUE) -> void:
 	root = root_node
+	set_venue(id)
+
+## Select the geometry spec before `build()`. Unknown ids fall back to the
+## boulevard so old callers and tests keep working.
+func set_venue(id: String) -> void:
+	venue_id = id if VENUE_SPECS.has(id) else DEFAULT_VENUE
+	spec = VENUE_SPECS[venue_id]
+
+func _feature(name: String) -> bool:
+	return bool((spec.get("features", {}) as Dictionary).get(name, false))
 
 func build() -> void:
 	_build_ground()
 	_build_building()
+	if _feature("skyline"):
 		_build_skyline_backdrop()
+	if _feature("marquee"):
 		_build_marquee()
+	if _feature("bulb_canopy"):
+		_build_bulb_canopy()
 	_build_steps()
 	_build_sidewalk()
 	_build_street()
+	if _feature("crosswalk"):
 		_build_crosswalk()
 	_build_street_furniture()
 	_build_street_detail()
 	_build_library_dressing()
+	if venue_id == "joke_shop":
+		_build_alley_dressing()
 	_build_guard_spawn()
 	_build_navmesh()
 	set_night_mode(false)
@@ -111,41 +206,49 @@ func _build_ground() -> void:
 func _build_building() -> void:
 	var building := StaticBody3D.new()
 	building.name = "Building"
-	# Main facade (textured brick)
+	var w := float(spec["facade_width"])
-	_add_box(building, Vector3(40, 18, 4), Vector3(0, 9, -6), Color(0.86, 0.85, 0.83), false, T_BRICK, Vector2(22, 10), "brick")
+	var h := float(spec["facade_height"])
+	var d := float(spec["facade_depth"])
+	var cz := float(spec["facade_center_z"])
+	var front := cz + d * 0.5
+	# Main facade (brick on the boulevard/alley, stone on the studio)
+	var facade_texture: Texture2D = spec.get("facade_texture", T_BRICK)
+	var facade_tint: Color = spec.get("facade_tint", Color(0.86, 0.85, 0.83))
+	var facade_role := str(spec.get("facade_role", "brick"))
+	_add_box(building, Vector3(w, h, d), Vector3(0, h * 0.5, cz), facade_tint, false, facade_texture, Vector2(w * 0.55, h * 0.55), facade_role)
 	# Stone base course so the facade has a footing instead of meeting the steps dead-on.
-	_add_box(building, Vector3(40, 0.8, 0.5), Vector3(0, 0.4, -3.78), Color(0.52, 0.5, 0.47), false, null, Vector2.ONE, "stone")
+	_add_box(building, Vector3(w, 0.8, 0.5), Vector3(0, 0.4, front + 0.22), Color(0.52, 0.5, 0.47), false, null, Vector2.ONE, "stone")
 	# Facade depth, not a flat wall: a projecting plinth, a string course between
 	# the window bands, a cornice under the roofline and pilasters at the bays.
-	_add_box(building, Vector3(40, 0.34, 0.22), Vector3(0, 0.93, -3.9), Color(0.6, 0.58, 0.55), true, null, Vector2.ONE, "stone")
+	_add_box(building, Vector3(w, 0.34, 0.22), Vector3(0, 0.93, front + 0.1), Color(0.6, 0.58, 0.55), true, null, Vector2.ONE, "stone")
-	_add_box(building, Vector3(40, 0.28, 0.28), Vector3(0, 7.6, -3.86), Color(0.6, 0.58, 0.55), true, null, Vector2.ONE, "stone")
+	_add_box(building, Vector3(w, 0.28, 0.28), Vector3(0, 7.6, front + 0.14), Color(0.6, 0.58, 0.55), true, null, Vector2.ONE, "stone")
-	_add_box(building, Vector3(40, 0.5, 0.5), Vector3(0, 17.7, -3.75), Color(0.56, 0.54, 0.51), true, null, Vector2.ONE, "stone")
+	_add_box(building, Vector3(w, 0.5, 0.5), Vector3(0, h - 0.3, front + 0.25), Color(0.56, 0.54, 0.51), true, null, Vector2.ONE, "stone")
-	_add_box(building, Vector3(40, 0.22, 0.2), Vector3(0, 10.9, -3.9), Color(0.58, 0.56, 0.53), true, null, Vector2.ONE, "stone")
+	_add_box(building, Vector3(w, 0.22, 0.2), Vector3(0, 10.9, front + 0.1), Color(0.58, 0.56, 0.53), true, null, Vector2.ONE, "stone")
-	for bay in [-15.3, -11.9, -8.5, -5.1, 5.1, 8.5, 11.9, 15.3]:
+	for bay in spec.get("pilaster_columns", [-15.3, -11.9, -8.5, -5.1, 5.1, 8.5, 11.9, 15.3]):
-		_add_box(building, Vector3(0.5, 8.4, 0.24), Vector3(bay, 12.6, -3.9),
+		_add_box(building, Vector3(0.5, 8.4, 0.24), Vector3(float(bay), 12.6, front + 0.1),
-			Color(0.8, 0.78, 0.76), true, T_BRICK, Vector2(0.3, 4.7), "brick")
+			Color(0.8, 0.78, 0.76), true, facade_texture, Vector2(0.3, 4.7), facade_role)
 	# Entrance recess + door recess frame
-	_add_box(building, Vector3(5.4, 6.4, 0.2), Vector3(0, 3.2, -3.9), Color(0.08, 0.08, 0.09), false, null, Vector2.ONE, "stone")
+	_add_box(building, Vector3(5.4, 6.4, 0.2), Vector3(0, 3.2, front + 0.1), Color(0.08, 0.08, 0.09), false, null, Vector2.ONE, "stone")
 	# Door frame columns and lintel, so the entrance is framed rather than painted on.
 	for side in [-1.55, 1.55]:
-		_add_box(building, Vector3(0.28, 5.2, 0.42), Vector3(side, 2.9, -3.86), Color(0.30, 0.28, 0.26), true, null, Vector2.ONE, "stone")
+		_add_box(building, Vector3(0.28, 5.2, 0.42), Vector3(side, 2.9, front + 0.14), Color(0.30, 0.28, 0.26), true, null, Vector2.ONE, "stone")
-	_add_box(building, Vector3(3.4, 0.3, 0.42), Vector3(0, 5.55, -3.86), Color(0.30, 0.28, 0.26), true, null, Vector2.ONE, "stone")
+	_add_box(building, Vector3(3.4, 0.3, 0.42), Vector3(0, 5.55, front + 0.14), Color(0.30, 0.28, 0.26), true, null, Vector2.ONE, "stone")
 	# Door frame and dark door
-	_add_box(building, Vector3(3.0, 5.2, 0.3), Vector3(0, 2.9, -3.98), Color(0.13, 0.12, 0.11), true, null, Vector2.ONE, "painted_metal")
+	_add_box(building, Vector3(3.0, 5.2, 0.3), Vector3(0, 2.9, front + 0.02), Color(0.13, 0.12, 0.11), true, null, Vector2.ONE, "painted_metal")
 	# Door glass (semi-transparent)
-	var glass := _add_box(building, Vector3(1.8, 1.4, 0.34), Vector3(0, 3.8, -3.9), Color(0.6, 0.75, 0.9, 0.55))
+	var glass := _add_box(building, Vector3(1.8, 1.4, 0.34), Vector3(0, 3.8, front + 0.1), Color(0.6, 0.75, 0.9, 0.55))
 	glass.material_override = Materials.glass(Color(0.55, 0.7, 0.88, 0.55))
 	# Door handles: two slim metal bars where the guard reaches for the lock.
 	for side in [-0.42, 0.42]:
-		_add_box(building, Vector3(0.06, 0.5, 0.06), Vector3(side, 2.6, -3.79), Color(0.75, 0.74, 0.70), false, null, Vector2.ONE, "metal")
+		_add_box(building, Vector3(0.06, 0.5, 0.06), Vector3(side, 2.6, front + 0.21), Color(0.75, 0.74, 0.70), false, null, Vector2.ONE, "metal")
 	# Door lock indicator (green = open, red = locked), placed beside the handle
-	door_indicator = _add_box(building, Vector3(0.18, 0.18, 0.24), Vector3(-1.8, 1.7, -3.82), Color(0.1, 0.9, 0.3))
+	door_indicator = _add_box(building, Vector3(0.18, 0.18, 0.24), Vector3(-1.8, 1.7, front + 0.18), Color(0.1, 0.9, 0.3))
 	door_indicator.material_override = _lock_indicator_material(Color(0.1, 0.9, 0.3))
 	# Blender glazed double door in front of the recessed frame.
 	var door_model := _load_prop_scene("double_door")
 	if door_model != null:
 		door_model.name = "LibraryDoubleDoor"
-		door_model.position = Vector3(0, 0.0, -3.84)
+		door_model.position = Vector3(0, 0.0, front + 0.16)
 		building.add_child(door_model)
 		library_nodes.append(door_model)
 		_apply_library_ao(door_model, "double_door")
@@ -154,18 +257,21 @@ func _build_building() -> void:
 				_lamp_bulb_mats.append(material)
 	_build_facade_windows(building)
 	var col := BoxShape3D.new()
-	col.size = Vector3(40, 18, 4)
+	col.size = Vector3(w, h, d)
 	var so := building.create_shape_owner(building)
 	building.shape_owner_add_shape(so, col)
-	building.shape_owner_set_transform(so, Transform3D(Basis(), Vector3(0, 9, -6)))
+	building.shape_owner_set_transform(so, Transform3D(Basis(), Vector3(0, h * 0.5, cz)))
 	root.add_child(building)
 
 ## Regular window bands above the entrance. Panes are dark glass by day and
 ## light up after dark, which gives the facade depth at night.
 func _build_facade_windows(parent: Node3D) -> void:
-	var columns := [-17.0, -13.6, -10.2, -6.8, 6.8, 10.2, 13.6, 17.0]
+	var columns: Array = spec.get("window_columns", [-17.0, -13.6, -10.2, -6.8, 6.8, 10.2, 13.6, 17.0])
-	for y in [9.2, 12.4]:
+	var rows: Array = spec.get("window_rows", [9.2, 12.4])
-		for x in columns:
+	for value in rows:
+		var y := float(value)
+		for x_value in columns:
+			var x := float(x_value)
 			# Recessed reveal, then the pane: gives the window a dark frame edge.
 			_add_box(parent, Vector3(1.96, 2.46, 0.1), Vector3(x, y, -3.99),
 				Color(0.22, 0.21, 0.20), false, null, Vector2.ONE, "stone")
@@ -188,12 +294,13 @@ func _build_steps() -> void:
 	# The ground and building provide the actual collision boundaries.
 	var steps := StaticBody3D.new()
 	steps.name = "Steps"
-	var step_w := 8.0
+	var step_w := float(spec.get("stair_width", 8.0))
-	var tread := 0.6
+	var tread := float(spec.get("stair_tread", 0.6))
-	var height := 0.16
+	var height := float(spec.get("stair_height", 0.16))
-	for i in 4:
+	var count := int(spec.get("stair_count", 4))
+	for i in count:
 		var y: float = i * height
-		var z: float = 4.0 * tread - i * tread
+		var z: float = float(count) * tread - i * tread
 		var w: float = step_w - i * 0.35
 		_add_box(steps, Vector3(w, height, tread), Vector3(0, y + height / 2.0, z), Color(0.55, 0.52, 0.5))
 		# Add collision shape to each tread
@@ -203,10 +310,11 @@ func _build_steps() -> void:
 		steps.shape_owner_add_shape(owner_id, tread_col)
 		steps.shape_owner_set_transform(owner_id, Transform3D(Basis(), Vector3(0, y + height / 2.0, z)))
 	# Landing at the top with collision
-	var landing_y: float = 4 * height + 0.1
+	var landing_y: float = count * height + 0.1
-	_add_box(steps, Vector3(9, 0.2, 3), Vector3(0, landing_y, -1.5), Color(0.5, 0.47, 0.45))
+	var landing_w := step_w + 1.0
+	_add_box(steps, Vector3(landing_w, 0.2, 3), Vector3(0, landing_y, -1.5), Color(0.5, 0.47, 0.45))
 	var landing_col := BoxShape3D.new()
-	landing_col.size = Vector3(9, 0.2, 3)
+	landing_col.size = Vector3(landing_w, 0.2, 3)
 	var landing_owner := steps.create_shape_owner(steps)
 	steps.shape_owner_add_shape(landing_owner, landing_col)
 	steps.shape_owner_set_transform(landing_owner, Transform3D(Basis(), Vector3(0, landing_y, -1.5)))
@@ -215,12 +323,14 @@ func _build_steps() -> void:
 func _build_sidewalk() -> void:
 	var sidewalk := StaticBody3D.new()
 	sidewalk.name = "Sidewalk"
-	_add_box(sidewalk, Vector3(30, 0.18, 8), Vector3(0, 0.09, 8), Color(0.55, 0.55, 0.54), false, T_CONCRETE, Vector2(9, 2.4), "concrete")
+	var w := float(spec.get("sidewalk_width", 30.0))
+	var d := float(spec.get("sidewalk_depth", 8.0))
+	_add_box(sidewalk, Vector3(w, 0.18, d), Vector3(0, 0.09, d * 0.5), Color(0.55, 0.55, 0.54), false, T_CONCRETE, Vector2(w * 0.3, d * 0.3), "concrete")
 	var col := BoxShape3D.new()
-	col.size = Vector3(30, 0.36, 8)
+	col.size = Vector3(w, 0.36, d)
 	var so := sidewalk.create_shape_owner(sidewalk)
 	sidewalk.shape_owner_add_shape(so, col)
-	sidewalk.shape_owner_set_transform(so, Transform3D(Basis(), Vector3(0, 0, 8)))
+	sidewalk.shape_owner_set_transform(so, Transform3D(Basis(), Vector3(0, 0, d * 0.5)))
 	root.add_child(sidewalk)
 
 func _build_street() -> void:
@@ -230,20 +340,24 @@ func _build_street() -> void:
 	# white looked like more pavement.
 	# The street keeps its own material so night mode can switch to the wet
 	# asphalt map (glossier, with lamp reflections) and back.
-	_street_mat = Materials.asphalt(Color(0.62, 0.63, 0.66), Vector2(30, 7))
+	var street_w := float(spec.get("street_width", 120.0))
-	var street_mesh := _add_box(street, Vector3(120, 0.1, 26), Vector3(0, 0.05, 22),
+	var street_d := float(spec.get("street_depth", 26.0))
-		Color(0.62, 0.63, 0.66), false, T_ASPHALT, Vector2(30, 7), "asphalt")
+	var curb_z := float(spec.get("sidewalk_depth", 8.0)) + 4.1
+	var street_z := curb_z + street_d * 0.5 - 3.1
+	_street_mat = Materials.asphalt(Color(0.62, 0.63, 0.66), Vector2(street_w * 0.25, street_d * 0.27))
+	var street_mesh := _add_box(street, Vector3(street_w, 0.1, street_d), Vector3(0, 0.05, street_z),
+		Color(0.62, 0.63, 0.66), false, T_ASPHALT, Vector2(street_w * 0.25, street_d * 0.27), "asphalt")
 	street_mesh.material_override = _street_mat
 	# Center dashes along the street (x varied so they form a lane line, not a stack).
-	for i in range(-40, 41, 4):
+	for i in range(-int(street_w / 3.0), int(street_w / 3.0) + 1, 4):
-		_add_box(street, Vector3(0.2, 0.02, 1.2), Vector3(float(i), 0.11, 22), Color(0.85, 0.85, 0.30), false, null, Vector2.ONE, "concrete")
+		_add_box(street, Vector3(0.2, 0.02, 1.2), Vector3(float(i), 0.11, street_z), Color(0.85, 0.85, 0.30), false, null, Vector2.ONE, "concrete")
 	# Curb between the sidewalk and the roadway.
-	_add_box(street, Vector3(120, 0.22, 0.5), Vector3(0, 0.11, 12.1), Color(0.62, 0.61, 0.58), false, null, Vector2.ONE, "concrete")
+	_add_box(street, Vector3(street_w, 0.22, 0.5), Vector3(0, 0.11, curb_z), Color(0.62, 0.61, 0.58), false, null, Vector2.ONE, "concrete")
 	var col := BoxShape3D.new()
-	col.size = Vector3(120, 0.2, 26)
+	col.size = Vector3(street_w, 0.2, street_d)
 	var so := street.create_shape_owner(street)
 	street.shape_owner_add_shape(so, col)
-	street.shape_owner_set_transform(so, Transform3D(Basis(), Vector3(0, 0, 22)))
+	street.shape_owner_set_transform(so, Transform3D(Basis(), Vector3(0, 0, street_z)))
 	root.add_child(street)
 
 func _build_navmesh() -> void:
@@ -256,9 +370,11 @@ func _build_navmesh() -> void:
 	mesh.agent_max_climb = 0.8
 	mesh.agent_max_slope = 45.0
 	mesh.cell_size = 0.25
+	var nav_min: Vector2 = spec.get("nav_min", Vector2(-18.0, -0.6))
+	var nav_max: Vector2 = spec.get("nav_max", Vector2(18.0, 20.0))
 	var verts := PackedVector3Array([
-		Vector3(-18, 0.0, -0.6), Vector3(18, 0.0, -0.6),
+		Vector3(nav_min.x, 0.0, nav_min.y), Vector3(nav_max.x, 0.0, nav_min.y),
-		Vector3(18, 0.0, 20.0), Vector3(-18, 0.0, 20.0),
+		Vector3(nav_max.x, 0.0, nav_max.y), Vector3(nav_min.x, 0.0, nav_max.y),
 	])
 	mesh.set_vertices(verts)
 	mesh.add_polygon(PackedInt32Array([0, 1, 2, 3]))
@@ -377,7 +493,7 @@ func _build_marquee() -> void:
 ## a parked sedan, and wall lanterns. Kept separate so the placement validator
 ## only sees grounded sidewalk furniture.
 func _build_library_dressing() -> void:
-	if ResourceLoader.exists(BLENDER_PROP_DIR + "handrail.glb"):
+	if _feature("handrail") and ResourceLoader.exists(BLENDER_PROP_DIR + "handrail.glb"):
 		var rail := _load_prop_scene("handrail")
 		if rail != null:
 			rail.name = "LibraryHandrail"
@@ -386,27 +502,144 @@ func _build_library_dressing() -> void:
 			root.add_child(rail)
 			library_nodes.append(rail)
 			_apply_library_ao(rail, "handrail")
-	if ResourceLoader.exists(BLENDER_PROP_DIR + "sedan.glb"):
+	if _feature("sedan") and ResourceLoader.exists(BLENDER_PROP_DIR + "sedan.glb"):
-		var sedan := _add_prop_model(root, "sedan", Vector3(6.0, 0.1, 17.0), 180.0)
+		var sedan_pos: Vector3 = spec.get("sedan_position", Vector3(6.0, 0.1, 17.0))
+		var sedan_rot := float(spec.get("sedan_rotation", 180.0))
+		var sedan := _add_prop_model(root, "sedan", sedan_pos, sedan_rot)
 		sedan.name = "ParkedSedan"
+		if venue_id == "tv_studio":
+			_apply_car_paint(sedan)
 		if not library_nodes.has(sedan):
 			library_nodes.append(sedan)
 		for material in _emissive_materials(sedan):
 			if not _lamp_bulb_mats.has(material):
 				_lamp_bulb_mats.append(material)
-	if ResourceLoader.exists(BLENDER_PROP_DIR + "wall_lantern.glb"):
+	if _feature("wall_lanterns") and ResourceLoader.exists(BLENDER_PROP_DIR + "wall_lantern.glb"):
+		if venue_id == "joke_shop":
+			_add_wall_lantern(Vector3(3.2, 3.3, -3.72), true)
+		else:
 			for side in [-4.9, 4.9]:
+				_add_wall_lantern(Vector3(side, 3.3, -3.78), false)
+
+## The TV studio entrance canopy: a dark metal slab with a row of warm bulbs,
+## replacing the boulevard marquee.
+func _build_bulb_canopy() -> void:
+	var front := float(spec["facade_center_z"]) + float(spec["facade_depth"]) * 0.5
+	var canopy := _add_box(root, Vector3(7.2, 0.22, 2.2),
+		Vector3(0, 5.7, front + 1.0), Color(0.16, 0.16, 0.18),
+		true, null, Vector2.ONE, "metal")
+	canopy.name = "BulbCanopy"
+	for x in [-3.0, 3.0]:
+		_add_box(root, Vector3(0.12, 5.5, 0.12),
+			Vector3(x, 2.75, front + 1.95), Color(0.20, 0.20, 0.22),
+			true, null, Vector2.ONE, "metal")
+	for x in [-2.8, -1.4, 0.0, 1.4, 2.8]:
+		var bulb := MeshInstance3D.new()
+		var sphere := SphereMesh.new()
+		sphere.radius = 0.075
+		sphere.height = 0.15
+		bulb.mesh = sphere
+		var mat := _emissive_material(Color(1.0, 0.78, 0.42))
+		bulb.material_override = mat
+		bulb.position = Vector3(x, 5.53, front + 1.0)
+		root.add_child(bulb)
+		if not _marquee_emissive.has(mat):
+			_marquee_emissive.append(mat)
+	for x in [-2.2, 2.2]:
+		var omni := OmniLight3D.new()
+		omni.position = Vector3(x, 5.15, front + 1.4)
+		omni.omni_range = 8.0
+		omni.light_energy = 0.0
+		omni.light_color = Color(1.0, 0.72, 0.36)
+		root.add_child(omni)
+		_lamp_omni.append(omni)
+
+## Glossy black paint for the studio's parked car. The library sedan keeps its
+## tintable slots; the studio overrides the body meshes with a single paint.
+func _apply_car_paint(holder: Node3D) -> void:
+	var paint := StandardMaterial3D.new()
+	paint.resource_name = "StudioCarPaint"
+	paint.albedo_color = Color(0.018, 0.020, 0.024)
+	paint.metallic = 0.85
+	paint.roughness = 0.12
+	paint.metallic_specular = 0.8
+	for node in holder.find_children("*", "MeshInstance3D", true, false):
+		var mi := node as MeshInstance3D
+		if mi != null:
+			mi.material_override = paint
+
+## One wall lantern plus an optional warm light. The Joke Shop uses a single
+## lantern as its key light; the boulevard keeps two unlit visual lanterns.
+func _add_wall_lantern(pos: Vector3, with_light: bool) -> void:
 	var lantern := _load_prop_scene("wall_lantern")
 	if lantern == null:
-				continue
+		return
 	lantern.name = "WallLantern"
-			lantern.position = Vector3(side, 3.3, -3.78)
+	lantern.position = pos
 	root.add_child(lantern)
 	library_nodes.append(lantern)
 	_apply_library_ao(lantern, "wall_lantern")
 	for material in _emissive_materials(lantern):
 		if not _lamp_bulb_mats.has(material):
 			_lamp_bulb_mats.append(material)
+	if with_light:
+		var omni := OmniLight3D.new()
+		omni.name = "LanternGlow"
+		omni.position = pos + Vector3(0.0, -0.1, 0.45)
+		omni.omni_range = 9.0
+		omni.light_energy = 0.0
+		omni.light_color = Color(1.0, 0.72, 0.38)
+		root.add_child(omni)
+		_lamp_omni.append(omni)
+
+## The Joke Shop alley: two brick side walls frame a 12 m passage, with
+## shutters, a recessed door step, a dumpster and wall-mounted AC boxes.
+func _build_alley_dressing() -> void:
+	var front := float(spec["facade_center_z"]) + float(spec["facade_depth"]) * 0.5
+	var height := float(spec["facade_height"])
+	var wall_x := float(spec["facade_width"]) * 0.5 + 0.35
+	for side in [-1.0, 1.0]:
+		var wall := _add_box(root, Vector3(0.7, height, 15.0),
+			Vector3(side * wall_x, height * 0.5, front + 7.5), Color(0.72, 0.70, 0.68),
+			true, T_BRICK, Vector2(8, 6), "brick")
+		wall.name = "AlleyWall"
+		_add_box(root, Vector3(0.9, 0.35, 15.0),
+			Vector3(side * wall_x, 0.18, front + 7.5), Color(0.44, 0.42, 0.40),
+			true, null, Vector2.ONE, "stone")
+	# Shutters over the two upper windows.
+	for x in [-3.8, 3.8]:
+		_add_box(root, Vector3(2.0, 2.5, 0.12), Vector3(x, 8.2, front + 0.22),
+			Color(0.18, 0.24, 0.21), true, null, Vector2.ONE, "painted_metal")
+		for slat in range(-4, 5):
+			_add_box(root, Vector3(1.9, 0.07, 0.04),
+				Vector3(x, 8.2 + slat * 0.28, front + 0.30),
+				Color(0.24, 0.31, 0.27), false, null, Vector2.ONE, "painted_metal")
+	# The recessed door gets a low stone step into the alley.
+	_add_box(root, Vector3(3.4, 0.16, 0.55), Vector3(0, 0.08, front + 0.75),
+		Color(0.48, 0.45, 0.42), true, null, Vector2.ONE, "stone")
+	# Dumpster and its lid; a solid body so guests and the guard walk around it.
+	var dump := StaticBody3D.new()
+	dump.name = "AlleyDumpster"
+	dump.position = Vector3(-4.2, 0, front + 9.2)
+	_add_box(dump, Vector3(1.9, 1.15, 1.25), Vector3(0, 0.58, 0),
+		Color(0.16, 0.28, 0.21), true, null, Vector2.ONE, "painted_metal")
+	_add_box(dump, Vector3(2.0, 0.08, 1.35), Vector3(0, 1.18, -0.02),
+		Color(0.11, 0.19, 0.15), true, null, Vector2.ONE, "painted_metal")
+	var dump_col := BoxShape3D.new()
+	dump_col.size = Vector3(1.9, 1.2, 1.3)
+	var owner_id := dump.create_shape_owner(dump)
+	dump.shape_owner_add_shape(owner_id, dump_col)
+	dump.shape_owner_set_transform(owner_id, Transform3D(Basis(), Vector3(0, 0.6, 0)))
+	root.add_child(dump)
+	# AC boxes on the inside faces of the walls, above head height.
+	for side in [-1.0, 1.0]:
+		for z in [front + 3.0, front + 7.0]:
+			_add_box(root, Vector3(0.55, 0.8, 1.1),
+				Vector3(side * (wall_x - 0.5), 5.8, z),
+				Color(0.56, 0.57, 0.55), true, null, Vector2.ONE, "metal")
+			_add_box(root, Vector3(0.08, 0.55, 0.8),
+				Vector3(side * (wall_x - 0.78), 5.8, z),
+				Color(0.22, 0.23, 0.22), false, null, Vector2.ONE, "metal")
 
 ## Emissive materials under a prop, used to tie library bulbs/LEDs to night mode.
 func _emissive_materials(holder: Node3D) -> Array[StandardMaterial3D]:
@@ -426,6 +659,7 @@ func _build_street_furniture() -> void:
 	# Blender library street lamps (bulbs + omni lights, off by day). The lamp
 	# arm points to local -X, so the left side is rotated 180 degrees to face
 	# the sidewalk.
+	if _feature("street_lamps"):
 		for side in [-7.5, 7.5]:
 			var holder := _add_prop_model(root, "street_lamp",
 				Vector3(side, 0.18, 8.5), 180.0 if side < 0.0 else 0.0)
@@ -440,6 +674,7 @@ func _build_street_furniture() -> void:
 			_collect_emissive(holder)
 	# Blender library street trees replace the cone trees. Flank the walkway and
 	# keep the sight line to the door clear.
+	if _feature("street_trees"):
 		for i in 6:
 			var side := -1.0 if i % 2 == 0 else 1.0
 			var x := side * (6.5 + float(int(i / 2)) * 3.0)
@@ -585,8 +820,9 @@ func _build_street_detail() -> void:
 	var detail := Node3D.new()
 	detail.name = "StreetDetail"
 	root.add_child(detail)
-	for index in PROP_PLACEMENTS.size():
+	var placements: Array = spec.get("prop_placements", PROP_PLACEMENTS)
-		var entry: Dictionary = PROP_PLACEMENTS[index]
+	for index in placements.size():
+		var entry: Dictionary = placements[index]
 		var base_rot := float(entry.get("rot", 0.0))
 		var variant := variant_for(index, base_rot)
 		var holder := _add_prop_model(detail, str(entry["prop"]),
@@ -821,7 +1057,7 @@ func _build_guard_spawn() -> void:
 	# The guard's head offset is 1.6m, so spawn at y=0.76-1.6=-0.84 to place feet on ground
 	# But we want the guard at eye-level with the sidewalk, so adjust to y=0.1 for feet
 	# Then the head will be at y=1.7 (1.6 offset + 0.1 base)
-	marker.position = Vector3(0, 0.1, -2.0)
+	marker.position = spec.get("guard_spawn", Vector3(0, 0.1, -2.0))
 	root.add_child(marker)
 
 func _lock_indicator_material(color: Color) -> StandardMaterial3D:

src/test/capture_screenshots.gd

@@ -207,6 +207,36 @@ func _advance() -> void:
 				_shoot("11-precision-walk.png")
 				Input.action_release("move_forward")
 				Input.action_release("walk_slow")
+				if gm != null:
+					gm.switch_scenario("joke_shop")
+					gm.coordinator.elapsed_s = 620.0
+				state = 12
+				state_frames = 0
+		12:
+			if state_frames == 1 and gm != null:
+				gm.guard.global_position = Vector3(-1.5, 0.1, 8.5)
+				gm.guard.rotation.y = deg_to_rad(-5.0)
+				gm.guard.head.rotation.x = deg_to_rad(2.0)
+				gm.hud.clear_log()
+				gm.hud.set_escalation(0)
+				gm.hud.set_body_camera(false)
+			if state_frames >= 90:
+				_shoot("12-joke-shop.png")
+				if gm != null:
+					gm.switch_scenario("tv_studio")
+					gm.coordinator.elapsed_s = 620.0
+				state = 13
+				state_frames = 0
+		13:
+			if state_frames == 1 and gm != null:
+				gm.guard.global_position = Vector3(0, 0.1, 14.0)
+				gm.guard.rotation.y = 0.0
+				gm.guard.head.rotation.x = deg_to_rad(2.0)
+				gm.hud.clear_log()
+				gm.hud.set_escalation(0)
+				gm.hud.set_body_camera(false)
+			if state_frames >= 120:
+				_shoot("13-studio-arrival.png")
 				quit(0)
 
 ## Put the guard a couple of steps in front of the target so a staged UI capture

src/test/tests/test_world.gd

@@ -19,6 +19,71 @@ func test_navmesh_built() -> bool:
 	root.free()
 	return a and b
 
+func test_venue_geometry_specs_are_distinct_and_defaulted() -> bool:
+	var hollywood := WorldBuilder.new(Node3D.new())
+	var joke := WorldBuilder.new(Node3D.new(), "joke_shop")
+	var studio := WorldBuilder.new(Node3D.new(), "tv_studio")
+	var unknown := WorldBuilder.new(Node3D.new(), "not_a_venue")
+	var a := TestUtils.check(hollywood.venue_id == "hollywood_building",
+		"the default venue is Hollywood")
+	var b := TestUtils.check(float(hollywood.spec["facade_width"]) > float(joke.spec["facade_width"]),
+		"the Joke Shop alley is narrower than the boulevard")
+	var c := TestUtils.check(not bool(joke.spec["features"]["skyline"])
+		and not bool(joke.spec["features"]["marquee"]),
+		"the Joke Shop disables the skyline and marquee")
+	var d := TestUtils.check(bool(studio.spec["features"]["bulb_canopy"])
+		and not bool(studio.spec["features"]["marquee"]),
+		"the studio uses a bulb canopy instead of the marquee")
+	var e := TestUtils.check(unknown.venue_id == "hollywood_building",
+		"an unknown venue falls back to Hollywood")
+	var root := Node3D.new()
+	var builder := WorldBuilder.new(root, "joke_shop")
+	builder.build()
+	var body := root.find_child("Building", true, false)
+	var facade := body.get_child(0) as MeshInstance3D if body != null else null
+	var f := TestUtils.check(facade != null and (facade.mesh as BoxMesh).size.x < 20.0,
+		"the Joke Shop builds the narrow facade")
+	var g := TestUtils.check(root.find_child("SkylineBackdrop", true, false) == null,
+		"the Joke Shop builds no skyline ring")
+	hollywood.root.free()
+	joke.root.free()
+	studio.root.free()
+	unknown.root.free()
+	root.free()
+	return a and b and c and d and e and f and g
+
+func test_navigation_mesh_matches_each_venue_bounds() -> bool:
+	var problems: Array[String] = []
+	for id in ["hollywood_building", "joke_shop", "tv_studio"]:
+		var root := Node3D.new()
+		var builder := WorldBuilder.new(root, id)
+		builder.build()
+		var region := root.find_child("NavRegion", true, false) as NavigationRegion3D
+		if region == null or region.navigation_mesh == null:
+			problems.append("%s has no navmesh" % id)
+			root.free()
+			continue
+		var verts := region.navigation_mesh.get_vertices()
+		var nav_min: Vector2 = builder.spec["nav_min"]
+		var nav_max: Vector2 = builder.spec["nav_max"]
+		var min_x := 999.0
+		var max_x := -999.0
+		var min_z := 999.0
+		var max_z := -999.0
+		for v in verts:
+			min_x = minf(min_x, v.x)
+			max_x = maxf(max_x, v.x)
+			min_z = minf(min_z, v.z)
+			max_z = maxf(max_z, v.z)
+		if absf(min_x - nav_min.x) > 0.01 or absf(max_x - nav_max.x) > 0.01 \
+				or absf(min_z - nav_min.y) > 0.01 or absf(max_z - nav_max.y) > 0.01:
+			problems.append("%s navmesh %s does not match spec %s" % [
+				id, str(Vector4(min_x, max_x, min_z, max_z)),
+				str(Vector4(nav_min.x, nav_max.x, nav_min.y, nav_max.y))])
+		root.free()
+	return TestUtils.check(problems.is_empty(),
+		"each venue builds its own navigation bounds (%s)" % str(problems))
+
 func test_phase_lighting_config_covered() -> bool:
 	var ok := true
 	for phase in [Rules.Phase.EARLY, Rules.Phase.MIDDAY, Rules.Phase.EVENING, Rules.Phase.LATE]:

tools/scene_concepts.py

@@ -191,10 +191,13 @@ SHOTS = {
     "street_night": "boulevard_skyline_dusk",
     "entrance_late": "hollywood_entrance_rain_night",
     "street_late": "boulevard_skyline_dusk",
-    # The venues share the Hollywood geometry for now, so these two compare
+    # Each venue is judged on its own frame; the real geometry no longer shares
-    # lighting and atmosphere rather than layout (noted in TODO.md).
+    # the Hollywood layout.
     "joke_shop_door": "joke_shop_door_closeup",
+    "12-joke-shop": "joke_shop_alley_evening",
     "studio_door": "studio_stage_door_night",
+    "studio_stage_door_night": "studio_stage_door_night",
+    "13-studio-arrival": "studio_stage_door_night",
     "npc_portrait": "npc_portrait_day",
 }
 

tools/screen_designs.py

@@ -369,7 +369,7 @@ SCREENS = [
         "kind": "scene",
         "title": "Joke Shop door queue",
         "source": "PLAN.md The Joke Shop — long line, ID and ticket checks",
-        "ref": None,
+        "ref": "12-joke-shop.png",
         "description": "Evening view of a small comedy-club entrance: a short queue "
                        "on the sidewalk, a door person checking an ID and a ticket "
                        "under a warm bulb, a red awning, and the show board.",
@@ -391,7 +391,7 @@ SCREENS = [
         "kind": "scene",
         "title": "TV Studio celebrity arrival",
         "source": "PLAN.md Late Night TV Studio — crowd gathers for an arrival",
-        "ref": None,
+        "ref": "13-studio-arrival.png",
         "description": "A celebrity arrival at the studio entrance: tourists and "
                        "influencers pressing toward the door, cameras raised, the "
                        "guard holding a line on the steps, studio marquee behind.",