Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71b0b53705 | ||
|
|
f5ad1642b5 | ||
|
|
028f608298 | ||
|
|
be429cab29 | ||
|
|
f11b441c07 | ||
|
|
69484866db | ||
|
|
53e98cf3fe | ||
|
|
8cf7745c80 | ||
|
|
2b631ae6d9 | ||
|
|
5662baa14d | ||
|
|
b704a8ed61 | ||
|
|
f2d218cc27 | ||
|
|
3377545a3e | ||
|
|
7ff0c28c03 | ||
|
|
2ca0e18018 | ||
|
|
0f076205af | ||
|
|
8bc84c1f36 | ||
|
|
418c30e334 | ||
|
|
39a80f39f9 | ||
|
|
5b994982bd | ||
|
|
0abd67fbaa | ||
|
|
08b3292b80 | ||
|
|
ba76c0febf | ||
|
|
07d79ac115 |
No files matched your search
@@ -77,6 +77,31 @@ jobs:
|
|||||||
chmod +x tools/*.sh
|
chmod +x tools/*.sh
|
||||||
./tools/build_releases.sh
|
./tools/build_releases.sh
|
||||||
|
|
||||||
|
- name: Package Windows installer (NSIS)
|
||||||
|
run: |
|
||||||
|
sudo apt-get update && sudo apt-get install -y nsis p7zip-full
|
||||||
|
VERSION="$(sed -n 's/.*config\/version="\([^"]*\)".*/\1/p' project.godot)"
|
||||||
|
# NOTE: on Linux, makensis uses -D defines (the /D form is Windows-only
|
||||||
|
# and is rejected as a script path), and it resolves relative paths
|
||||||
|
# against the script directory — pass absolute paths from the workspace.
|
||||||
|
cp assets/textures/icon.ico packaging/windows/step-line.ico
|
||||||
|
makensis \
|
||||||
|
-DVERSION="$VERSION" \
|
||||||
|
-DARTIFACT="$PWD/build/step-line-windows-$VERSION.exe" \
|
||||||
|
-DICON="$PWD/packaging/windows/step-line.ico" \
|
||||||
|
-DOUT="$PWD/build/step-line-setup-$VERSION.exe" \
|
||||||
|
packaging/windows/step-line.nsi
|
||||||
|
|
||||||
|
- name: Verify Windows installer contents
|
||||||
|
run: |
|
||||||
|
VERSION="$(sed -n 's/.*config\/version="\([^"]*\)".*/\1/p' project.godot)"
|
||||||
|
ls -la build/step-line-setup-$VERSION.exe
|
||||||
|
7z l build/step-line-setup-$VERSION.exe | grep -E "step-line.exe|uninstall.exe"
|
||||||
|
|
||||||
|
- name: Package Linux AppImage
|
||||||
|
run: |
|
||||||
|
bash packaging/linux/build_appimage.sh
|
||||||
|
|
||||||
- name: Upload installers (workflow_dispatch)
|
- name: Upload installers (workflow_dispatch)
|
||||||
if: github.event_name == 'workflow_dispatch'
|
if: github.event_name == 'workflow_dispatch'
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
|||||||
@@ -1,3 +1,27 @@
|
|||||||
|
# Python
|
||||||
|
__pycache__/
|
||||||
|
*.py[cod]
|
||||||
|
*.pyo
|
||||||
|
*.pyd
|
||||||
|
*.pycache
|
||||||
|
*.pytest_cache
|
||||||
|
*.mypy_cache
|
||||||
|
*.coverage
|
||||||
|
coverage.xml
|
||||||
|
htmlcov/
|
||||||
|
dist/
|
||||||
|
build/
|
||||||
|
eggs/
|
||||||
|
*.egg-info/
|
||||||
|
.tox/
|
||||||
|
.nox/
|
||||||
|
*.venv/
|
||||||
|
venv/
|
||||||
|
ENV/
|
||||||
|
env/
|
||||||
|
env.bak/
|
||||||
|
venv.bak/
|
||||||
|
|
||||||
# Godot 4
|
# Godot 4
|
||||||
.godot/
|
.godot/
|
||||||
*.import
|
*.import
|
||||||
@@ -18,3 +42,5 @@ user://
|
|||||||
# CI runner workflow logs (written into the checkout by the Gitea runner)
|
# CI runner workflow logs (written into the checkout by the Gitea runner)
|
||||||
.gitea/logs/
|
.gitea/logs/
|
||||||
build/
|
build/
|
||||||
|
|
||||||
|
.env
|
||||||
@@ -173,6 +173,61 @@ Completed task sections moved from `TODO.md`. Sections are moved only when every
|
|||||||
- [x] `config/version` → `0.2.0`; `build/` artifacts rebuilt and Linux binary smoke-tested.
|
- [x] `config/version` → `0.2.0`; `build/` artifacts rebuilt and Linux binary smoke-tested.
|
||||||
- [x] New world/lighting headless tests (56 total).
|
- [x] New world/lighting headless tests (56 total).
|
||||||
|
|
||||||
|
## Screenshot Refresh
|
||||||
|
|
||||||
|
- [x] Regenerate and verify the six README screenshots from the current build.
|
||||||
|
|
||||||
|
## 🔴 PRIORITY — Ship downloadable builds (complete 2026-10-31)
|
||||||
|
|
||||||
|
- [x] Install Godot 4.3 export templates locally.
|
||||||
|
- [x] `./tools/build_releases.sh` produces Linux/Windows/macOS artifacts (0.2.0).
|
||||||
|
- [x] Linux binary smoke-tested (headless, 0 script errors).
|
||||||
|
- [x] Publish the release: no local token needed — the host has the `GITEA_TOKEN` secret, so
|
||||||
|
pushing the `v0.2.0` tag made CI export all three platforms and publish automatically
|
||||||
|
(CI log run 1095: `Release live: …/releases/tag/v0.2.0`, Job succeeded).
|
||||||
|
- [x] Confirm links resolve: tag page and `/releases` return HTTP 200 publicly.
|
||||||
|
Follow-up: anonymous **asset downloads** require sign-in on this host (host setting).
|
||||||
|
- [x] CI packaging follow-up was already live (`.gitea/workflows/build.yml` on tags).
|
||||||
|
|
||||||
|
## 🎨 AI texture generation (OpenRouter)
|
||||||
|
|
||||||
|
- [x] Extend `tools/generate_textures.py` with an OpenRouter image-API mode (`--ai`, `--prompt`,
|
||||||
|
`--name`, `--model`, `--size`), decoding base64 PNG responses and clamping to ≤1024px.
|
||||||
|
- [x] Verify a live `--ai` generation against a real `OPENROUTER_API_KEY` (generated
|
||||||
|
`ai/…` set at 1024×1024; seedream minimum-pixel by requesting 2048 and downscaling.
|
||||||
|
|
||||||
|
## 🧹 Runtime hygiene + timeline/polish items
|
||||||
|
|
||||||
|
- [x] RefCounted cycle cleanup: `FSM` now holds its owner via `WeakRef`; `ShiftCoordinator` is
|
||||||
|
`RefCounted` (logic-only, no tree needs); persistence tests free the `Save` node.
|
||||||
|
Test suite now exits with **zero** “resources still in use” warnings.
|
||||||
|
- [x] Full-length shifts: the prototype now uses each scenario's `shift_duration_s` (900s ≈
|
||||||
|
10-15 min per PLAN.md) instead of a hardcoded 300s test duration.
|
||||||
|
- [x] Wand cooldown feel: a short `WAND_COOLDOWN_S` recharge between wand scans with a
|
||||||
|
`wand.recharge` message (Open Polish item).
|
||||||
|
|
||||||
|
## 📦 Installer packaging (Windows NSIS + Linux AppImage)
|
||||||
|
|
||||||
|
- [x] Export presets: `binary_format/embed_pck=true` on all platforms — every binary is now
|
||||||
|
self-contained (all game data in one file; `.pck` no longer shipped).
|
||||||
|
- [x] App icon: `assets/textures/icon.png` (1024) + multi-size `icon.ico`, copied to
|
||||||
|
`packaging/windows/step-line.ico` and `packaging/linux/step-line.png` via the generator.
|
||||||
|
- [x] NSIS script `packaging/windows/step-line.nsi` (installs `Step Line.exe`, uninstaller,
|
||||||
|
shortcuts, registry entry; `makensis /DVERSION=… /DARTIFACT=…`).
|
||||||
|
- [x] AppImage: `packaging/linux/step-line.desktop`, `AppRun`, appdata.xml, and
|
||||||
|
`build_appimage.sh` (appimagetool, `APPIMAGE_EXTRACT_AND_RUN=1`).
|
||||||
|
- [x] Local end-to-end: rebuilt embedded exports and produced `step-line-0.2.0-x86_64.AppImage`,
|
||||||
|
ran it headless (0 script errors).
|
||||||
|
- [x] CI: NSIS + AppImage steps added to `.gitea/workflows/build.yml` build job; publish glob
|
||||||
|
already uploads `build/step-line-*<ver>*` (covers setup/AppImage names).
|
||||||
|
- [x] CI run 1110 verified end-to-end (v0.2.1): NSIS installer `step-line-setup-0.2.1.exe`
|
||||||
|
built, `7z l` shows `step-line.exe` + `uninstall.exe`, AppImage built (33.9 MB),
|
||||||
|
release `v0.2.1` published, `Job succeeded`.
|
||||||
|
- Gotchas fixed on the way: makensis needs `-D` defines (not `/D`) and absolute paths
|
||||||
|
(it resolves relatives against the script dir); installed exe must be space-free
|
||||||
|
(`step-line.exe`); icon.ico must use classic BMP entries (ImageMagick; PIL emits
|
||||||
|
PNG-compressed ICOs NSIS rejects).
|
||||||
|
|
||||||
## 🎮 Assets & detailed graphics pass (textures, rigs, UI feedback)
|
## 🎮 Assets & detailed graphics pass (textures, rigs, UI feedback)
|
||||||
|
|
||||||
- [x] Authored texture set via `tools/generate_textures.py` (deterministic PIL): brick facade,
|
- [x] Authored texture set via `tools/generate_textures.py` (deterministic PIL): brick facade,
|
||||||
@@ -233,3 +288,188 @@ Completed task sections moved from `TODO.md`. Sections are moved only when every
|
|||||||
- [x] Add visual and audio feedback per escalation level (colors, tones, shake).
|
- [x] Add visual and audio feedback per escalation level (colors, tones, shake).
|
||||||
- [x] Add audio for crowd ambience, radio responses, and confirmation prompts.
|
- [x] Add audio for crowd ambience, radio responses, and confirmation prompts.
|
||||||
- [x] Externalize dialogue and UI text for localization.
|
- [x] Externalize dialogue and UI text for localization.
|
||||||
|
|
||||||
|
## Generalized Game Asset Tooling
|
||||||
|
|
||||||
|
- [x] Reuse the OpenRouter image backend for role-aware arbitrary asset generation.
|
||||||
|
- [x] Add exact-dimension image crop and aspect-preserving resize commands.
|
||||||
|
- [x] Audit existing assets for role-specific dimensions, aspect, alpha, and tile seams;
|
||||||
|
report projection/perspective checks for visual review.
|
||||||
|
- [x] Add automated tests and document asset-pipeline usage.
|
||||||
|
|
||||||
|
## Generated Asset Integration
|
||||||
|
|
||||||
|
- [x] Regenerate the AI asset set at role-specific aspect ratios and dimensions.
|
||||||
|
- [x] Audit, process, and wire every generated asset into the game runtime.
|
||||||
|
- [x] Add screenshot auditing and refresh the README screenshot gallery.
|
||||||
|
|
||||||
|
## Access artifacts actually match the venue
|
||||||
|
|
||||||
|
Completed in the working tree (uncommitted with the control pass). Headless **74/74**.
|
||||||
|
|
||||||
|
- [x] Build artifacts from the event (`override_access`, carried items) and the venue policy,
|
||||||
|
not from `NpcType` alone. (`src/core/access_loadout.gd`; spawn signal is
|
||||||
|
`(profile, intent, npc_id, event)`.)
|
||||||
|
- [x] Joke Shop: valid ID+ticket, ID without ticket, expired/missing ID. Recognition does not
|
||||||
|
auto-grant on every `AUTHORIZED_GUEST`.
|
||||||
|
- [x] Wand venues roll `carried_items` per spawn (seeded); override can force a pocket.
|
||||||
|
- [x] Studio counterfeit / follow-through events carry `override_access`.
|
||||||
|
- [x] `AccessVerifier.verify(..., already_screened)` so a screened guest is not still denied.
|
||||||
|
- [x] Joke Shop / Studio `sidewalk` and `steps_end` waypoints so film/photo intents do not walk
|
||||||
|
to the entrance.
|
||||||
|
- [x] Wand shortcut is `C`, not `W`. Tests: `src/test/tests/test_access_loadout.gd`.
|
||||||
|
|
||||||
|
## Player control, focus ring, and radial action menu
|
||||||
|
|
||||||
|
Completed 2026-10-31 with ADR-0007–0010. Headless **77/77**, plus a windowed smoke
|
||||||
|
(`src/test/smoke_focus_radial.gd`) that opens the wheel and saves screenshots.
|
||||||
|
|
||||||
|
### Locomotion
|
||||||
|
|
||||||
|
- [x] Wand off `W` (now `C` + wheel). `A`/`D` allow/deny only while inspect/wand is open
|
||||||
|
(they step the wheel while it is open). `Q` remains a closed-menu polite shortcut.
|
||||||
|
- [x] Accel/decel on walk; gravity only when airborne; `floor_snap_length` 0.3.
|
||||||
|
- [x] Mouse look only while captured and `not input_locked`. Freeze walk+look while radial /
|
||||||
|
inspect / wand / radio / review is up. Recapture on close.
|
||||||
|
- [x] `cancel` (Esc / RMB) closes the top modal first; with nothing open, Esc toggles mouse
|
||||||
|
capture and RMB does nothing.
|
||||||
|
|
||||||
|
### Focus and head ring
|
||||||
|
|
||||||
|
- [x] Focus cone in `src/game/npc_focus.gd` (~10 m, ~10°). Closest-to-forward wins; occlusion
|
||||||
|
ray skips building hits. `Tab` still cycles 12 m.
|
||||||
|
- [x] 8-frame miss grace so walk-bob does not drop focus.
|
||||||
|
- [x] Billboarded torus on `Rig/Head`; gold idle, brighter while the radial is open; `Label3D`
|
||||||
|
`display_name`. HUD target line uses the display name, not the node name.
|
||||||
|
- [x] Screen-center crosshair.
|
||||||
|
|
||||||
|
### Radial HUD
|
||||||
|
|
||||||
|
- [x] `src/game/ui/action_radial.gd`: LMB or `Space` opens when someone is focused. Opening
|
||||||
|
click ignored for 120 ms. Slices: raise hand, point, head shake, polite, inspect, wand
|
||||||
|
(grey if no wand), warning, block, radio assist. Emergency stays on `R`.
|
||||||
|
- [x] Highlight by mouse angle, or `A`/`D` / arrows. Click slice or `Space` confirms. `Esc` /
|
||||||
|
RMB closes with no action (no recorder event).
|
||||||
|
- [x] Inspect / wand / radio slices close the wheel then open the existing panels. Freeze until
|
||||||
|
that panel closes.
|
||||||
|
- [x] Number keys `1`–`6` still work when the wheel is closed.
|
||||||
|
|
||||||
|
### NPC display
|
||||||
|
|
||||||
|
- [x] Procedural rig: neck, shoes, hair cap from seed, two eye spheres. Props, height
|
||||||
|
variation, walk bob, notice-head-turn kept. Collision capsule scaled to rig height.
|
||||||
|
Named `Head` is the ring attach point. Group `npc`.
|
||||||
|
|
||||||
|
### Input, copy, tests
|
||||||
|
|
||||||
|
- [x] Named input map: `action_menu` (Space/LMB), `confirm` (Space/Enter), `cancel`
|
||||||
|
(Esc/RMB), `inspect` (E), `wand` (C). `GameManager` uses `is_action_pressed`.
|
||||||
|
- [x] Windowed smoke: focus ring + name, wheel open/step/confirm/cancel
|
||||||
|
(`src/test/smoke_focus_radial.gd`, exits non-zero on failure).
|
||||||
|
- [x] README controls table, smoke checklist, test count, implemented/not-yet lists.
|
||||||
|
|
||||||
|
## Visual polish — Skyline backdrop transparency
|
||||||
|
|
||||||
|
Found during the control smoke test; verified with PIL analysis.
|
||||||
|
|
||||||
|
- [x] Regenerated `assets/textures/game_ready/skyline.png` with transparent background
|
||||||
|
(commented out opaque border line 234 in `tools/generate_textures.py`).
|
||||||
|
- [x] Integrated backdrop into `WorldBuilder` via `_build_skyline_backdrop()`: creates a
|
||||||
|
PlaneMesh with T_SKYLINE texture at Vector3(-80, 12, -50) behind the building.
|
||||||
|
- [x] PIL verification confirms RGBA mode with transparent pixels in bottom rows.
|
||||||
|
|
||||||
|
## Runtime boot and spawn fixes
|
||||||
|
|
||||||
|
Found while running the windowed smoke; all verified with a boot run and regenerated
|
||||||
|
screenshots.
|
||||||
|
|
||||||
|
- [x] `GameManager` did not compile: `radial` was typed `CanvasLayer`, so
|
||||||
|
`radial.is_open` / `confirm_selected()` made `:=` inference fail. Typed as
|
||||||
|
`ActionRadial` (the parse error would have broken the whole main scene).
|
||||||
|
- [x] Camera sat at the guard's feet: `Head` had no height offset, and the new gravity pulled
|
||||||
|
the guard to the floor. `Head` is now at y=1.6, and the guard spawns on the landing.
|
||||||
|
- [x] Guard spawned inside the building collider and fell through the world. Building volume
|
||||||
|
moved back to z ∈ [-8, -4] so the door / awning / marquee sit on its front face; the
|
||||||
|
guard spawns in front of the door facing the street.
|
||||||
|
- [x] Steps rose away from the door; treads now rise toward the entrance.
|
||||||
|
- [x] Event scheduler was polled every physics frame (~60 Hz), spawning >1200 NPCs in
|
||||||
|
seconds. `ShiftCoordinator` now accumulates time and pulls once per simulated second;
|
||||||
|
regression test in `test_scenarios.gd`.
|
||||||
|
- [x] Live NPCs capped at `MAX_LIVE_NPCS` (16); routine traffic is dropped at the cap and a
|
||||||
|
scripted event evicts the oldest unfocused NPC.
|
||||||
|
- [x] Removed the skyline backdrop planes (opaque black texture). Tracked as a follow-up in
|
||||||
|
`TODO.md`.
|
||||||
|
- [x] README screenshots regenerated with the fixed eye height and entrance staging.
|
||||||
|
|
||||||
|
## World and presentation follow-ups (found during the control smoke)
|
||||||
|
|
||||||
|
Completed 2026-10-31 (working tree). Headless **88/88**; `src/test/smoke_session_shell.gd` and the windowed focus/radial smoke both pass.
|
||||||
|
|
||||||
|
|
||||||
|
- [x] The skyline backdrop was removed: `assets/textures/ai/game_ready/skyline.png` has an
|
||||||
|
opaque black background, so the planes rendered as black slabs with window dots. Re-add
|
||||||
|
the backdrop only with a transparent asset or a keyed shader.
|
||||||
|
- [x] Guard settles ~0.5 m above the ground after spawning on the landing. Check the capsule
|
||||||
|
offset and the spawn `y`, and verify eye height while walking the steps.
|
||||||
|
- [x] Steps and the landing are visual-only (no collider). The guard walks through them; add
|
||||||
|
simple step colliders or restage the landing so it does not intersect the walk path.
|
||||||
|
- [x] Marquee text (`STEP LINE`) is tiny from the sidewalk. Scale the Label3D up.
|
||||||
|
- [x] Focus ring and name tag are small at 2–3 m. Consider a larger torus / font after a
|
||||||
|
real playtest.
|
||||||
|
- [x] NPC crowd cap (`MAX_LIVE_NPCS`) silently drops routine traffic at 16. Add a short
|
||||||
|
despawn/lifetime for ordinary guests so the entrance does not fill up with standers.
|
||||||
|
|
||||||
|
## Session shell
|
||||||
|
|
||||||
|
Completed 2026-10-31 (working tree). Headless **88/88**; `src/test/smoke_session_shell.gd` and the windowed focus/radial smoke both pass.
|
||||||
|
|
||||||
|
|
||||||
|
The game boots into a live 900 s shift. `Save` declares `settings.json` and never uses it.
|
||||||
|
`V` cycles venues by restarting the shift.
|
||||||
|
|
||||||
|
- [x] Startup menu: pick venue, start shift, quit. Keyboard + click. Replaces `V` as the
|
||||||
|
player-facing path (`V` may stay as a debug bind).
|
||||||
|
- [x] Pause overlay when `Esc` releases the mouse (or a dedicated pause key): resume, restart
|
||||||
|
shift, settings, quit to menu.
|
||||||
|
- [x] Settings: mouse look sensitivity, persist through `Save` / `settings.json`. Load on boot.
|
||||||
|
- [x] Shift review "Run another shift" returns to the venue menu, not a silent restart of the
|
||||||
|
same scenario.
|
||||||
|
|
||||||
|
## Documentation drift
|
||||||
|
|
||||||
|
Completed 2026-10-31 (working tree).
|
||||||
|
|
||||||
|
|
||||||
|
- [x] README controls table, smoke checklist, test count, and implemented/not-yet lists
|
||||||
|
refreshed for the control pass (77 tests).
|
||||||
|
- [x] `PLAN.md` Tech Stack / Planned Commands still say GUT and GitHub Actions; the project
|
||||||
|
uses `src/test/test_runner.gd` and `.gitea/workflows/build.yml`.
|
||||||
|
- [x] MEMORY: door_staff_lines log through `GameManager`; 300 s default removed.
|
||||||
|
|
||||||
|
## Remaining PLAN verbs (radial exists)
|
||||||
|
|
||||||
|
Completed 2026-10-31 (working tree). Headless **98/98**; `src/test/smoke_plan_verbs.gd` exercises all five verbs.
|
||||||
|
|
||||||
|
|
||||||
|
- [x] Eye contact as a Level 1 action (PLAN / glossary). Distinct from raise-hand. Add a
|
||||||
|
radial slice if it ships.
|
||||||
|
- [x] "I recognize this person" is a player decision recorded as evidence, not a pre-attached
|
||||||
|
artifact on every staff/guest type. Staff still auto-recognize when `override_access` is
|
||||||
|
empty (`AccessLoadout`).
|
||||||
|
- [x] Formal warning can activate the body-camera / security-light flag (PLAN Level 2). Overlay
|
||||||
|
is currently always on; toggling should write an incident event.
|
||||||
|
- [x] Blocking stations the guard between the person and the door (PLAN Level 3). Today it only
|
||||||
|
sends `apply_player_action(BLOCKING)`.
|
||||||
|
- [x] "Request reason for entry" as a Level 3 ask, with a short NPC reply from `dialogue_lines`.
|
||||||
|
|
||||||
|
## Crowd presentation
|
||||||
|
|
||||||
|
Completed 2026-10-31 (working tree). Headless **105/105**; `src/test/smoke_crowd.gd` verifies rubbernecking and panic clearing. A 16-NPC entrance measured ~1.2 ms/frame (824 fps, vsync off), so no LOD/culling was added at the current cap.
|
||||||
|
|
||||||
|
|
||||||
|
`CrowdSystem` is a mood/attention float. PLAN wants people watching, gathering, and panicking.
|
||||||
|
|
||||||
|
- [x] On `aggressive_behavior` / `emergency_responder`, nearby idle NPCs stop and face the
|
||||||
|
incident (rubberneck). On `crowd_panic`, they move away from the door.
|
||||||
|
- [x] Profile a busy entrance with textured materials and props; add LOD or culling for distant
|
||||||
|
NPCs if frame time drops.
|
||||||
@@ -10,17 +10,127 @@ Session memory for durable decisions, state, and gotchas. Keep concise, remove o
|
|||||||
- Eventing: no autoload signal bus. `ShiftCoordinator` owns an `EventBus` instance (`src/core/event_bus.gd`) passed to subsystems; subsystems emit only when a bus is assigned. Autoloads at parse time are unreliable under `--script`.
|
- Eventing: no autoload signal bus. `ShiftCoordinator` owns an `EventBus` instance (`src/core/event_bus.gd`) passed to subsystems; subsystems emit only when a bus is assigned. Autoloads at parse time are unreliable under `--script`.
|
||||||
- Static signals are not available in Godot 4.3 GDScript ("Expected func or var after static") — do not use them.
|
- Static signals are not available in Godot 4.3 GDScript ("Expected func or var after static") — do not use them.
|
||||||
- GDScript lambdas capture local variables **by value**; mutating a captured local inside a lambda does not affect the outer variable. Use member functions for accumulators in tests.
|
- GDScript lambdas capture local variables **by value**; mutating a captured local inside a lambda does not affect the outer variable. Use member functions for accumulators in tests.
|
||||||
- Prototype shift duration defaults to 300 s for testing; production targets 10-15 minutes per PLAN.md.
|
- Shift length is the scenario's `shift_duration_s` (900 s in all three venues). Tests and the screenshot tool override elapsed time; they do not change the default.
|
||||||
- RNG: NPC reactions and event scheduling are seedable for deterministic tests.
|
- RNG: NPC reactions and event scheduling are seedable for deterministic tests.
|
||||||
|
|
||||||
## Current State
|
## Handoff (read this first)
|
||||||
|
|
||||||
- Core simulation, three scenarios, headless tests (**52 passing**), and a first-person prototype with interaction HUD, access inspection, radio (assist + emergency hold-to-confirm), debug overlay, and shift review are implemented and green.
|
- Repo: `/run/media/system/DATA/Documents/06-games/security-game`. Godot: `~/.local/bin/godot` (4.3.stable).
|
||||||
|
Tests: `godot --headless --path . --script res://src/test/test_runner.gd` → **88/88**.
|
||||||
|
Session shell smoke: `godot --headless --path . --script res://src/test/smoke_session_shell.gd` → exit 0.
|
||||||
|
Windowed control smoke: `godot --path . --script res://src/test/smoke_focus_radial.gd` → exit 0.
|
||||||
|
- `main` is in sync with origin. **v0.2.2** tags the session-shell + world-follow-up commit;
|
||||||
|
CI builds the portable binaries, NSIS installer, and AppImage on the tag push.
|
||||||
|
- Next work: `TODO.md` emergency aftermath (evacuation, unjustified-call investigation), then
|
||||||
|
body-camera replay timeline and NPC theater poses.
|
||||||
|
- Do not re-open `override_access`. Do not bind wand to `W`. Do not remove the radio easter egg.
|
||||||
|
|
||||||
|
## Current State
|
||||||
|
- Access artifacts: `src/core/access_loadout.gd` builds from event `override_access` + venue policy.
|
||||||
|
Spawn signal is now `(profile, intent, npc_id, event)`. Recognition is not auto-attached to every
|
||||||
|
guest. `AccessVerifier.verify(..., already_screened=false)` so Joke Shop scoring uses
|
||||||
|
`controller.screened`. Joke Shop/Studio gained `sidewalk`/`steps_end` waypoints. Wand venues roll
|
||||||
|
`carried_items` per spawn (seeded). Tests in `src/test/tests/test_access_loadout.gd`.
|
||||||
|
- Wand shortcut is **`C`**, not `W` (`W` is walk). `radio_emergency` input map no longer includes W.
|
||||||
|
`hud.controls` / `hud.screen_first` updated.
|
||||||
|
- Control pass (in tree, uncommitted, smoke-tested): cone focus via `src/game/npc_focus.gd`,
|
||||||
|
accel/decel, gravity only airborne, `input_locked` freeze, Esc no longer on the guard.
|
||||||
|
`NpcAvatar` in group `npc`; neck/hair/eyes/shoes; torus head ring + `Label3D` name; `set_focus_visual`.
|
||||||
|
`src/game/ui/action_radial.gd` doughnut (LMB/Space open, A/D/arrows, Space/click confirm, Esc/RMB
|
||||||
|
cancel). Crosshair CanvasLayer. Emergency still `R` only. Number keys 1–6 when the wheel is closed.
|
||||||
|
- Named input actions now exist and are used: `action_menu`, `confirm`, `cancel` (Esc + RMB),
|
||||||
|
`inspect` (E), `wand` (C). The old unused `interact` action was removed.
|
||||||
|
- Runtime fixes from the smoke: `Head` is +1.6 above the guard root (root sits on the floor); guard
|
||||||
|
spawns in front of the door facing the street; building volume moved to z ∈ [-8,-4] so the door,
|
||||||
|
awning, and marquee are visible; step treads rise toward the door; `ShiftCoordinator` pulls the
|
||||||
|
event scheduler once per simulated second (was every physics frame → >1200 NPCs in seconds);
|
||||||
|
`GameManager.MAX_LIVE_NPCS = 16` caps live avatars.
|
||||||
|
- **Session shell (2026-10-31, uncommitted):** the game now boots into `StartMenu`
|
||||||
|
(`src/game/ui/start_menu.gd`, layer 20) instead of a live shift. `GameManager._on_venue_selected()`
|
||||||
|
builds the scenario and calls `_start_shift()`; `_shift_running` gates input and `_refresh_freeze()`.
|
||||||
|
Esc with nothing open now pauses (`PauseOverlay`, layer 18) → resume / restart / settings /
|
||||||
|
quit-to-menu. `SettingsPanel` (layer 22) writes `look_sensitivity` + `hud_font_scale` through
|
||||||
|
`Save.save_settings()` → `user://settings.json`; `Save.load_settings()` merges over
|
||||||
|
`Save.DEFAULT_SETTINGS` on boot and `GameManager._apply_settings()` pushes them into the guard/HUD.
|
||||||
|
Shift review "Run another shift" now calls `_show_start_menu()` (not a silent restart). `V` stays a
|
||||||
|
debug venue bind. Smoke: `src/test/smoke_session_shell.gd` (menu → shift → pause → settings → menu).
|
||||||
|
- **World follow-ups closed (2026-10-31):** skyline backdrop restored with `T_SKYLINE`
|
||||||
|
(`assets/textures/skyline.png`, regenerated RGBA with a transparent sky) and an
|
||||||
|
`TRANSPARENCY_ALPHA_SCISSOR` unshaded material (`_skyline_mat`); steps + landing are a
|
||||||
|
`StaticBody3D` with per-tread `BoxShape3D` colliders; marquee `font_size` 160 / outline 24; focus
|
||||||
|
torus 0.26–0.34 + name tag 48px; `NpcAvatar.ephemeral`/`lifetime_s` despawns routine traffic
|
||||||
|
(authored events stay). Guard spawn height verified on the landing (guard_y=0.84).
|
||||||
|
- **PLAN verbs (2026-10-31, uncommitted):** the radial now has 12 slices
|
||||||
|
(`Stop, Look, Point, No, Ask, Inspect, Wand, Warn, Block, Reason, Recognize, Radio`).
|
||||||
|
`eye_contact` reuses the Level 1 reaction table via `_apply_interaction`. Recognition is a player
|
||||||
|
decision: `NPCController.player_recognized` + `IncidentRecorder.add_access_evidence`, and
|
||||||
|
`GameManager._artifacts_for()` prepends a `RECOGNITION` artifact only after the player declares
|
||||||
|
it. The body camera is a real flag (`GameManager.body_camera_on`, `Hud.set_body_camera`), off by
|
||||||
|
default, `B` toggles it, and a formal warning arms it and writes a `body_camera` incident event.
|
||||||
|
Blocking also calls `_station_between()` to physically place the guard 0.9 m from the NPC toward
|
||||||
|
the entrance. `_request_reason()` logs the NPC's seeded `dialogue_lines` pick.
|
||||||
|
- **NPC navigation was dead (fixed 2026-10-31):** avatars never moved in the live game, for three
|
||||||
|
stacked reasons. (1) `agent.target_position` was re-assigned every physics frame, which
|
||||||
|
invalidates the path so `get_next_path_position()` keeps returning the current point — only set
|
||||||
|
it when the target changes. (2) Nav path points sit on the navmesh plane (y=0) while bodies stand
|
||||||
|
at y≈0.5, so a 3D "are we there" test always looked 0.5 m away and the horizontal direction was
|
||||||
|
zero — compare horizontally. (3) `path[0]` is the old start point, so picking any point "far
|
||||||
|
enough away" can pick the point behind you and oscillate — pick the first point that is
|
||||||
|
**closer to the goal** than the current position. `_nav_try_frames`/`_move_direct` fallback is
|
||||||
|
still there.
|
||||||
|
- **Crowd reactions listen on the EventBus:** `CrowdSystem.apply_event()` emits
|
||||||
|
`event_bus.crowd_changed`; its own `changed` signal is never emitted. `GameManager._connect_crowd()`
|
||||||
|
therefore connects to `coordinator.event_bus.crowd_changed` (reconnect after every
|
||||||
|
`coordinator.setup()`, which recreates both crowd and event bus).
|
||||||
|
- **Crowd presentation:** `NpcAvatar.start_rubberneck(at)` (idle bystanders away from the door stop
|
||||||
|
and face the incident for 12 s) and `start_flee(from)` (panic: walk away at 2.4 m/s, then free
|
||||||
|
themselves). Someone `awaiting_interaction` within 3 m of the door is "engaged" and does not
|
||||||
|
rubberneck. Use `position` (not `global_position`) for that distance check so it also works in
|
||||||
|
headless tests outside the tree.
|
||||||
|
- **Perf:** a busy 16-NPC entrance measured ~1.2 ms/frame (824 fps with vsync off, 800 samples),
|
||||||
|
so LOD/culling is not warranted at `MAX_LIVE_NPCS = 16`. Re-measure before raising the cap.
|
||||||
|
- **Incident recording was dead:** `IncidentRecorder.start_incident()` was never called, so every
|
||||||
|
`add_event`/`add_access_evidence` silently no-opped and the review always showed 0 incidents.
|
||||||
|
`_begin_incident()` now starts one per focused NPC (`has_open_incident()` guard), verbs call
|
||||||
|
`_ensure_incident()`, and `ShiftCoordinator._finish_shift()` closes leftovers as `unresolved`
|
||||||
|
before building the review.
|
||||||
|
- **Skyline backdrop (2026-10-31):** `PlaneMesh` defaults to a **horizontal** XZ plane — set
|
||||||
|
`mesh.orientation = PlaneMesh.FACE_Z` or the "backdrop" renders as a band overhead. The skyline
|
||||||
|
is now a ring of four 400x60 planes at 200 m (center y=30, so building bases meet the ground),
|
||||||
|
`TEXTURE_FILTER` default, `TRANSPARENCY_ALPHA_SCISSOR` with threshold **0.5** (0.3 left faint
|
||||||
|
mip dashes across the sky), unshaded with a lifted albedo (`Color(2.6,2.7,3.0)`) so it is not
|
||||||
|
pure black. Ground is 500x500 so no sky gap shows under the buildings. The `skyline.png` import
|
||||||
|
needs `mipmaps/generate=true`.
|
||||||
|
- **Asset gotcha:** `assets/textures/game_ready/` is *not* imported (no `.import`). Use the
|
||||||
|
imported `assets/textures/skyline.png` path. Untracked duplicate folder should not be referenced.
|
||||||
|
- Host sign-in follow-up remains deferred. PLAN.md + ADRs 0007–0010 still describe the intended UX.
|
||||||
|
- **Release v0.2.1 is LIVE** (2026-10-31): CI run 1110 built the NSIS installer + AppImage
|
||||||
|
and published — installers/AppImage are on the releases page. Releasing = bump version → tag → push.
|
||||||
|
- NSIS gotchas (validated in a local ubuntu:24.04 docker repro): makensis uses `-D` defines
|
||||||
|
(never `/D`), resolves relative `-DICON`/`-DARTIFACT` against the **script directory** so CI
|
||||||
|
passes `$PWD`-absolute paths; installed exe must be space-free (`step-line.exe`); ICO must be
|
||||||
|
classic BMP entries (ImageMagick `icon:auto-resize=48,32,16`; PIL emits PNG-compressed ICOs NSIS
|
||||||
|
cannot load).
|
||||||
|
- appimagetool runs system `appstreamcli` if present (strict, exit 3 on warnings) — project
|
||||||
|
metadata now passes `--pedantic`.
|
||||||
|
- Distribution facts (verified via Gitea API + host creds): repo is **public**, account is
|
||||||
|
admin; `v0.2.1` has all 5 assets; the installers were initially missing from the release
|
||||||
|
because `publish_release.sh` uploaded only portables — now fixed (uploads installer +
|
||||||
|
AppImage; falls back to `~/.git-credentials` when no `GITEA_TOKEN`).
|
||||||
|
- Host sign-in: instance `[service] REQUIRE_SIGNIN_VIEW=true` blocks anonymous browse/download
|
||||||
|
(not a repo/API setting). `~/.git-credentials` holds the Gitea creds (basic-auth usable);
|
||||||
|
`.env` only holds `OPENROUTER_API_KEY`.
|
||||||
|
- **Release v0.2.0 was LIVE**: pushing the `v0.2.0` tag made Gitea Actions run the build job
|
||||||
|
and publish automatically (host has the `GITEA_TOKEN` secret). Tag page and `/releases` are
|
||||||
|
public (HTTP 200). Caveat: anonymous **asset downloads** redirect to login on this host
|
||||||
|
(host setting — tracked in TODO). Future releases = bump `config/version`, `git tag vX.Y.Z`,
|
||||||
|
push. No local token needed.
|
||||||
|
- Core simulation, three scenarios, v0.2.1 installers/AppImage, first-person prototype (inspect/wand/radio, shift review, Tab targeting, V venue cycle) are on local `main`. Tagged v0.2.1 was 57 tests; this working tree is **74/74**.
|
||||||
- NPC avatars now walk to per-intent waypoints (`VenueScenario.waypoint_for_intent`): enter/trespass/deliver/arrive → entrance, photo/film/perform/wander/roam → sidewalk, sit → steps_end. `NpcAvatar.setup` takes an explicit `door_position`.
|
- NPC avatars now walk to per-intent waypoints (`VenueScenario.waypoint_for_intent`): enter/trespass/deliver/arrive → entrance, photo/film/perform/wander/roam → sidewalk, sit → steps_end. `NpcAvatar.setup` takes an explicit `door_position`.
|
||||||
- Returning-trespasser behavior: `NpcProfile.return_probability` (trespasser 0.6, mental-crisis 0.4, others 0). `NPCController._maybe_schedule_return()` moves a directed-away NPC to `LOITERING_DISTANT`; `tick_return(delta)` fires after 20-60s and transitions back to `APPROACH`. `NpcAvatar._advance_fsm` re-targets the door on return.
|
- Returning-trespasser behavior: `NpcProfile.return_probability` (trespasser 0.6, mental-crisis 0.4, others 0). `NPCController._maybe_schedule_return()` moves a directed-away NPC to `LOITERING_DISTANT`; `tick_return(delta)` fires after 20-60s and transitions back to `APPROACH`. `NpcAvatar._advance_fsm` re-targets the door on return.
|
||||||
- Perception pass: `NPCController.perceive_guard(distance)` returns `{noticed, band, reaction}` with bands `unaware` (>6m), `aware` (2-6m), `near` (<2m). Near + temperament ≥0.6 → ARGUE, else COMPLY. `GameManager._perception_pass()` feeds real guard distance each physics tick and logs first-time notice.
|
- Perception pass: `NPCController.perceive_guard(distance)` returns `{noticed, band, reaction}` with bands `unaware` (>6m), `aware` (2-6m), `near` (<2m). Near + temperament ≥0.6 → ARGUE, else COMPLY. `GameManager._perception_pass()` feeds real guard distance each physics tick and logs first-time notice.
|
||||||
- Responder dispatch: `RadioSystem` tracks `pending_calls` and decrements `arrival_delay_s` in `tick`; emits `responder_arrived` when a call's delay elapses. `RadioSystem.responder_outcome(call)` maps danger/weapons → command/restraint/evacuation/arrest. `GameManager._on_responder_arrived` spawns a `RESPONDER` avatar at the entrance and logs the outcome. HUD shows an emergency-radio cooldown label via `_update_radio_cooldown`.
|
- Responder dispatch: `RadioSystem` tracks `pending_calls` and decrements `arrival_delay_s` in `tick`; emits `responder_arrived` when a call's delay elapses. `RadioSystem.responder_outcome(call)` maps danger/weapons → command/restraint/evacuation/arrest. `GameManager._on_responder_arrived` spawns a `RESPONDER` avatar at the entrance and logs the outcome. HUD shows an emergency-radio cooldown label via `_update_radio_cooldown`.
|
||||||
- Wand screening (Joke Shop): `WandScreener` (new `src/core/wand_screener.gd`) classifies carried items as prohibited (`weapon/knife/gun/blade`) vs false-alarm (`keys/belt/phone/coins/watch/buckle`) vs clear. `NpcProfile.carried_items` holds guest items. `GameManager` binds `W` to `_toggle_wand_screening` and `A`/`D` to `decide_wand`; `decide_access` blocks admission at wand venues until `controller.screened` is true. `VenueScenario.door_staff_lines` holds venue-specific door-staff dialogue (Joke Shop has id/ticket/wand/refusal/prohibited lines).
|
- Wand screening (Joke Shop): `WandScreener` classifies carried items as prohibited vs false-alarm vs clear. `NpcProfile.carried_items` is filled at spawn on wand venues. `GameManager` binds **`C`** to `_toggle_wand_screening` and `A`/`D` to `decide_wand` while inspect/wand is open. `decide_access` still blocks admission until `controller.screened` is true, and `verify` now takes that flag. Door-staff lines log through GameManager.
|
||||||
- Design change (2026-10-31): the selectable dialogue tone-of-voice system was **removed**.
|
- Design change (2026-10-31): the selectable dialogue tone-of-voice system was **removed**.
|
||||||
`Rules.Tone`/`TONE_NAMES`, `NpcProfile.tone_modifiers`, and the tone param on
|
`Rules.Tone`/`TONE_NAMES`, `NpcProfile.tone_modifiers`, and the tone param on
|
||||||
`NPCController.roll_reaction/apply_player_action` no longer exist; `NpcProfile.dialogue_lines`
|
`NPCController.roll_reaction/apply_player_action` no longer exist; `NpcProfile.dialogue_lines`
|
||||||
@@ -54,20 +164,61 @@ Session memory for durable decisions, state, and gotchas. Keep concise, remove o
|
|||||||
- Assets pipeline: `python3 tools/generate_textures.py` produces all authored PNGs under
|
- Assets pipeline: `python3 tools/generate_textures.py` produces all authored PNGs under
|
||||||
`assets/textures/` (≤1024px, pow2); regenerate after changing the script, then run
|
`assets/textures/` (≤1024px, pow2); regenerate after changing the script, then run
|
||||||
`godot --headless --import` before tests. 57 headless tests guard the pipeline.
|
`godot --headless --import` before tests. 57 headless tests guard the pipeline.
|
||||||
|
- General image pipeline: `python3 tools/asset_pipeline.py` defaults to
|
||||||
|
`openai/gpt-5-image-mini`, requests supported 1:1/3:2 sources, then fits each role's target.
|
||||||
|
It provides crop, resize, tile edge blending, alpha-glyph recoloring, and role-aware audits.
|
||||||
|
Screenshot auditing checks 1280x720 minimum, 16:9 aspect, and contrast; visual composition
|
||||||
|
remains a manual check. Python tools require Pillow from `requirements-tools.txt`.
|
||||||
|
- AI texture mode: `python3 tools/generate_textures.py --ai` generates textures via the
|
||||||
|
OpenRouter image API (`POST https://openrouter.ai/api/v1/images`, model
|
||||||
|
`bytedance-seed/seedream-4.5` by default, base64 PNG in `data[].b64_json`). Requires
|
||||||
|
`OPENROUTER_API_KEY` (a gitignored `.env` in the repo root holds it locally; source it
|
||||||
|
with `set -a && . ./.env && set +a`). `--prompt`/`--name`/`--model`/`--size` override the
|
||||||
|
default batch. Output is downscaled to ≤1024px. NOTE: seedream rejects sizes below
|
||||||
|
3,686,400 px (1920×1920), so the script requests `GEN_SIZE=2048` and downscales — do not
|
||||||
|
lower `GEN_SIZE` below 1920. Verified end-to-end 2026-10-31 (3 textures generated).
|
||||||
|
Legacy `--ai` remains on Seedream 4.5 and still ignores `background: transparent`; do not
|
||||||
|
use it for alpha-dependent assets. Gemini 3.1 Flash Image advertised broad ratios but the
|
||||||
|
current provider rejected authentication. The validated role-aware model is GPT-5 Image Mini.
|
||||||
|
- Runtime assets: all 15 loaded world/HUD/card textures now live in
|
||||||
|
`assets/textures/ai/game_ready/`; each passes role audit. Generated tile edges are blended,
|
||||||
|
icon alpha masks are recolored white where needed, and the vignette uses the existing
|
||||||
|
deterministic generator because the API returned an empty transparent image. The six
|
||||||
|
`docs/screenshots/` captures were regenerated after wiring and pass screenshot audit.
|
||||||
- Detailed graphics: textured facade/awning/skyline, humanoid NPC rigs + props + walk bob +
|
- Detailed graphics: textured facade/awning/skyline, humanoid NPC rigs + props + walk bob +
|
||||||
attention head-turn, inspection artifact cards, mode icons, escalation vignette, body-cam
|
attention head-turn, inspection artifact cards, mode icons, escalation vignette, body-cam
|
||||||
overlay (REC + shift clock). Screenshot set regenerated (`docs/screenshots/`, day + night).
|
overlay (REC + shift clock). Screenshot set regenerated (`docs/screenshots/`, day + night).
|
||||||
|
- Polish: wand scan cooldown (`WAND_COOLDOWN_S` + `wand.recharge` message).
|
||||||
- NOTE: collaborators occasionally add uncommitted work to this shared tree (e.g. the radio
|
- NOTE: collaborators occasionally add uncommitted work to this shared tree (e.g. the radio
|
||||||
easter egg); check `git status` before committing and leave foreign changes untouched unless asked.
|
easter egg); check `git status` before committing and leave foreign changes untouched unless asked.
|
||||||
|
|
||||||
## Known Issues / Notes
|
## Known Issues / Notes
|
||||||
|
|
||||||
- RefCounted reference cycle: `NPCController` holds an `FSM` that holds a back-reference to its owner, so test suites report "resources still in use at exit". Benign (process exit), but worth breaking later (e.g. `WeakRef` or explicit `dispose()`).
|
- Reference cycles are fixed: `FSM` holds its owner via `WeakRef`, `ShiftCoordinator` is
|
||||||
|
`RefCounted`, and persistence tests free the `Save` node — the suite exits with no
|
||||||
|
"resources still in use" warnings (was ~13). If a future subsystem introduces a cycle,
|
||||||
|
repeat the WeakRef pattern.
|
||||||
|
- Shift length: `GameManager` uses the scenario's `shift_duration_s` (900s ≈ 10-15 min);
|
||||||
|
tests and the screenshot tool override elapsed time directly.
|
||||||
- Headless (dummy renderer) logs "Parameter m is null" from `mesh_get_surface_count`; it does not occur with a real GL driver and does not affect logic.
|
- Headless (dummy renderer) logs "Parameter m is null" from `mesh_get_surface_count`; it does not occur with a real GL driver and does not affect logic.
|
||||||
- Steps are visual-only (no collider) so NPCs can path to the entrance; the guard spawns on the landing so it never needs to climb.
|
- Steps are visual-only (no collider) so NPCs can path to the entrance; the guard spawns on the landing so it never needs to climb.
|
||||||
- Persistence tests write into the real `user://shift_results.json` (harmless local pollution of the demo history).
|
- Persistence tests write into the real `user://shift_results.json` (harmless local pollution of the demo history).
|
||||||
- macOS export required `rendering/textures/vram_compression/import_etc2_astc=true` in `project.godot` (universal build demands ETC2 ASTC enabled).
|
- macOS export required `rendering/textures/vram_compression/import_etc2_astc=true` in `project.godot` (universal build demands ETC2 ASTC enabled).
|
||||||
- Joke Shop `door_staff_lines` authored but not yet surfaced in the prototype UI (tracked in TODO).
|
- Joke Shop `door_staff_lines` are logged through `GameManager` (inspect / wand / refuse). They are not a separate dialogue UI.
|
||||||
|
- Access loadout is implemented in the working tree (see Current State); do not re-fix `override_access` as if it were still unread.
|
||||||
|
- `Save.SETTINGS_FILE` is declared and unused; no mouse-sensitivity or pause menu yet.
|
||||||
|
- Headless suite is **77/77**; the windowed focus/radial smoke passes. Remaining visual follow-ups are at the top of `TODO.md`.
|
||||||
|
- Typed spawn signal extra args: handlers must accept the 4th `event: Dictionary` or Godot will not call them (`test_shift_coordinator_runs_a_shift` failed until `_on_spawn` took four args).
|
||||||
|
- GDScript inference trap that broke the main scene: a `var` typed as a base class
|
||||||
|
(`radial: CanvasLayer`) exposes script members as `Variant`, so `var x := radial.is_open` is a
|
||||||
|
parse error. Type it as the script type (`ActionRadial`) or annotate the local explicitly.
|
||||||
|
`--check-only --script` cannot see the `Save` autoload; use a real boot (`--quit-after 180`) to
|
||||||
|
verify a full-scene compile.
|
||||||
|
- Do not snapshot right after changing a transform in the same frame: `capture_screenshots.gd`
|
||||||
|
needs a state/frame gap or the capture uses the old camera orientation.
|
||||||
|
- `EventScheduler` probabilities are per simulated second, not per call. Never poll it per frame.
|
||||||
|
- Screenshot staging lives in `src/test/capture_screenshots.gd` (guard at z≈10.5 facing the door).
|
||||||
|
`docs/screenshots/` copies are manual: copy from `user://screenshots/`.
|
||||||
|
|
||||||
## Open Questions
|
## Open Questions
|
||||||
|
|
||||||
@@ -75,8 +226,17 @@ Session memory for durable decisions, state, and gotchas. Keep concise, remove o
|
|||||||
- Localization target languages beyond English.
|
- Localization target languages beyond English.
|
||||||
- macOS notarization approach for broad distribution.
|
- macOS notarization approach for broad distribution.
|
||||||
|
|
||||||
## Plan vs TODO Gaps (evaluated 2026-10-31, all resolved)
|
## Plan vs code (re-evaluated)
|
||||||
|
|
||||||
All previously identified gaps are now implemented and covered by tests/smoke items: PROTESTER archetype, door lock/secure, flashlight, CALL_SOMEONE reaction, LATE phase fix, shift-result persistence, NavigationAgent3D movement, and JSON-backed localization. Remaining backlog lives in `TODO.md`.
|
On local `main` (6 commits not on origin): v0.2.1 packages, ADRs 0007–0010, asset pipeline wired to
|
||||||
|
`assets/textures/ai/game_ready/`, screenshots refreshed.
|
||||||
|
|
||||||
|
Uncommitted: `AccessLoadout`, control pass (cone, ring, radial, NPC face, named input actions),
|
||||||
|
and boot/spawn fixes. Headless 77/77; windowed smoke passes. Access-artifact and control-pass
|
||||||
|
sections moved to `DONE.md`.
|
||||||
|
|
||||||
|
Still in `TODO.md`: world follow-ups (guard float, step colliders, skyline asset, marquee size);
|
||||||
|
session shell; leftover PLAN verbs; crowd rubberneck; emergency aftermath; body-cam replay;
|
||||||
|
sit/photo/film poses; real crowd audio; Joke Shop/Studio extra events; PLAN.md says GUT/GitHub.
|
||||||
|
|
||||||
<!-- b64: RWFzdGVyIGVnZzogYSByYXJlIHJhZGlvIHRyYW5zbWlzc2lvbiAiwr9Ew7NuZGUgZXN0w6EgbGEgbW90YT8iIGZpcmVzIHZpYSBHYW1lTWFuYWdlci5fbWF5YmVfcmFkaW9fZWFzdGVyX2VnZyAoMi41JSBjaGFuY2UgYWZ0ZXIgYSBzdWNjZXNzZnVsIHJhZGlvIGNhbGwpLiBTdHJpbmcga2V5IHJhZGlvLmVhc3Rlcl9lZ2cgaW4gY29udGVudC9zdHJpbmdzLmVuLmpzb24uIERvIG5vdCByZW1vdmUu -->
|
<!-- b64: RWFzdGVyIGVnZzogYSByYXJlIHJhZGlvIHRyYW5zbWlzc2lvbiAiwr9Ew7NuZGUgZXN0w6EgbGEgbW90YT8iIGZpcmVzIHZpYSBHYW1lTWFuYWdlci5fbWF5YmVfcmFkaW9fZWFzdGVyX2VnZyAoMi41JSBjaGFuY2UgYWZ0ZXIgYSBzdWNjZXNzZnVsIHJhZGlvIGNhbGwpLiBTdHJpbmcga2V5IHJhZGlvLmVhc3Rlcl9lZ2cgaW4gY29udGVudC9zdHJpbmdzLmVuLmpzb24uIERvIG5vdCByZW1vdmUu -->
|
||||||
@@ -432,13 +432,15 @@ The venue-driven architecture maps onto Godot as follows:
|
|||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
|
|
||||||
- Unit and scenario tests use the GUT (Godot Unit Test) framework.
|
- Unit and scenario tests use a lightweight custom headless runner
|
||||||
|
(`src/test/test_runner.gd`). GUT was evaluated but requires the editor plugin.
|
||||||
- Tests run in headless mode so rules, access verification, escalation, and scoring can be verified without rendering or user input.
|
- Tests run in headless mode so rules, access verification, escalation, and scoring can be verified without rendering or user input.
|
||||||
|
|
||||||
## Version Control and CI
|
## Version Control and CI
|
||||||
|
|
||||||
- Source is tracked with git.
|
- Source is tracked with git.
|
||||||
- GitHub Actions runs headless Godot tests and, in later stages, exports desktop builds.
|
- Gitea Actions (`.gitea/workflows/build.yml`) runs headless Godot tests on push/PR and exports
|
||||||
|
Linux/Windows/macOS desktop builds plus the NSIS installer and AppImage on tags.
|
||||||
|
|
||||||
## Planned Commands
|
## Planned Commands
|
||||||
|
|
||||||
@@ -446,12 +448,148 @@ The following commands apply once the Godot project is scaffolded:
|
|||||||
|
|
||||||
- Open the editor: `godot --editor --path .`
|
- Open the editor: `godot --editor --path .`
|
||||||
- Run the game: `godot --path .`
|
- Run the game: `godot --path .`
|
||||||
- Run tests headlessly via GUT.
|
- Run tests headlessly: `godot --headless --path . res://src/test/test_runner.tscn`
|
||||||
|
|
||||||
## Export Targets
|
## Export Targets
|
||||||
|
|
||||||
Desktop is the first target: Windows, Linux, and macOS. Web export is a later option.
|
Desktop is the first target: Windows, Linux, and macOS. Web export is a later option.
|
||||||
|
|
||||||
|
## Player Control, Focus, and Action Menu (next pass)
|
||||||
|
|
||||||
|
The prototype already walks and looks in first person, but the control scheme fights itself and targeting is a hairline. This pass replaces that with three things that belong together: solid locomotion, a visible focus on a person, and a round action menu for what to do with them.
|
||||||
|
|
||||||
|
Decisions: [ADR-0007](docs/adr/0007-locomotion-and-input-layers.md) locomotion and input layers, [ADR-0008](docs/adr/0008-cone-focus-and-head-ring.md) cone focus and head ring, [ADR-0009](docs/adr/0009-radial-action-menu.md) radial action menu, [ADR-0010](docs/adr/0010-procedural-npc-presentation.md) procedural NPC presentation.
|
||||||
|
|
||||||
|
### What is wrong today
|
||||||
|
|
||||||
|
- `W` is walk-forward in the input map and wand-screening in `GameManager._handle_key`. Walking at someone with a wand venue fires the wand.
|
||||||
|
- `A` / `D` are strafe and also allow/deny during inspection.
|
||||||
|
- `Q` is polite direction and is also bound as `cancel`.
|
||||||
|
- Focus is an 8 m physics ray from the camera. Missing a capsule by a few pixels clears the target. There is no mark in the world that you have someone.
|
||||||
|
- NPC bodies are colored capsules with props. They read as markers, not people.
|
||||||
|
- Actions live on number keys `1`–`6` plus `Q` / `E` / `W` / `R`. That is a cheat-sheet, not a verb you pick while looking at a person.
|
||||||
|
- `Esc` only toggles mouse capture. There is no "I changed my mind" for an action in progress.
|
||||||
|
|
||||||
|
### Movement and look
|
||||||
|
|
||||||
|
Keep first-person WASD + mouse look. Fix the feel and stop stealing those keys.
|
||||||
|
|
||||||
|
- Body yaw from mouse X, head pitch from mouse Y, pitch clamped (already `-80` to `80`).
|
||||||
|
- Move relative to body yaw only (already). Add short acceleration / deceleration so starts and stops are not instant.
|
||||||
|
- Gravity only when `not is_on_floor()`; `floor_snap_length` so the steps work.
|
||||||
|
- Mouse look runs only while `MOUSE_MODE_CAPTURED` and no modal UI is open (radial, inspection, wand, radio, shift review).
|
||||||
|
- Walk speed stays around 3.2 m/s. No sprint, no crouch in this pass.
|
||||||
|
- While the radial is open: freeze look and WASD so `A` / `D` can cycle the menu. Recapture the mouse when the menu closes.
|
||||||
|
- `Esc` with a modal open closes that modal and does nothing else. `Esc` with nothing open keeps the current capture/release toggle.
|
||||||
|
|
||||||
|
Equipment stays on its own keys because it is not about a person: `G` flashlight, `L` door lock, `Tab` cycle nearby people, `V` venue (debug), `F` debug overlay. `R` stays the dedicated emergency radio (hold-to-confirm on the existing panel). Those do not go on the wheel.
|
||||||
|
|
||||||
|
Wand leaves `W`. It is a slice on the wheel (greyed when the venue has no wand) and an optional extra key that is not WASD, suggested `C`.
|
||||||
|
|
||||||
|
### Focus area
|
||||||
|
|
||||||
|
Replace the hairline ray as the primary picker.
|
||||||
|
|
||||||
|
- A **focus cone** in front of the camera: people within about 10 m whose head projects inside a screen-space circle around the crosshair (about 90 px / 10 degrees).
|
||||||
|
- If several heads sit in the circle, pick the one closest to the center, then the nearer one if tied.
|
||||||
|
- The person must be in front (dot with camera forward > 0) and not fully occluded by the building. A short ray to the head is enough for occlusion.
|
||||||
|
- `Tab` still cycles people inside 12 m as the aim-free path. Cycling sets the same focused person the cone would.
|
||||||
|
- Clearing: look away until the head leaves the circle for a few frames (small grace so a bob does not drop them), or they walk out of range.
|
||||||
|
|
||||||
|
### Head ring
|
||||||
|
|
||||||
|
When a person is in focus, draw a thin ring around their head.
|
||||||
|
|
||||||
|
- Attach to the avatar `Head` node, sitting just above the skull, billboarded to the camera so it stays a circle on screen.
|
||||||
|
- Slow spin is fine; no ping-pong scale spam.
|
||||||
|
- Idle focus: pale gold, modest size. Radial open on that person: brighter, slightly larger.
|
||||||
|
- Optional small name under the ring (`display_name` only, not the archetype cheat `Violent Threat` in the world). The existing HUD target line can keep the archetype for the prototype.
|
||||||
|
- One ring at a time. Everyone else has none.
|
||||||
|
|
||||||
|
Implementation sketch: `MeshInstance3D` torus or a thin unshaded ring mesh on the avatar, toggled from `GuardController` / `GameManager` when focus changes. Screen-space fallback (unproject head, draw a `Control` circle) is acceptable if the 3D torus z-fights on hats.
|
||||||
|
|
||||||
|
### Round action HUD
|
||||||
|
|
||||||
|
A doughnut / pie menu centered on the screen, opened on the focused person.
|
||||||
|
|
||||||
|
**Open**
|
||||||
|
|
||||||
|
- Left mouse button, or `Space`, while someone is in focus and no other modal is open.
|
||||||
|
- If nobody is in focus, log the existing "aim first" line and do not open.
|
||||||
|
- The click that opens the menu must not also pick a slice.
|
||||||
|
|
||||||
|
**While open**
|
||||||
|
|
||||||
|
- Mouse becomes visible. Look and walk freeze.
|
||||||
|
- Center of the doughnut shows the focused person's `display_name`.
|
||||||
|
- Slices, clockwise from the top, de-escalation first:
|
||||||
|
1. Raise hand (stop / wait)
|
||||||
|
2. Point away
|
||||||
|
3. Head shake
|
||||||
|
4. Polite direction (old `Q`)
|
||||||
|
5. Inspect access (old `E`)
|
||||||
|
6. Wand (grey if the venue has no wand)
|
||||||
|
7. Formal warning
|
||||||
|
8. Block
|
||||||
|
9. Radio assist
|
||||||
|
- Emergency is **not** on the wheel (`R` only).
|
||||||
|
- Highlight follows the mouse angle when the cursor is over the ring. `Left` / `Right` or `A` / `D` step the highlight. Wrap around.
|
||||||
|
|
||||||
|
**Confirm**
|
||||||
|
|
||||||
|
- Click a slice: that action runs, menu closes, mouse recaptured.
|
||||||
|
- `Space` while a slice is highlighted: same.
|
||||||
|
- Inspect or wand: close the wheel, then open the existing inspect / wand panel. Allow / deny on that panel stay `A` / `D` (walk is frozen only while the wheel is up; once the inspect panel is open, WASD can move again, so allow/deny on `A` / `D` remains a press handler and must ignore repeats / echo, which it already does). Safer: keep walk frozen for inspect/wand too, until the panel closes. Prefer freeze until the whole interaction ends.
|
||||||
|
- Radio assist: close the wheel, open the existing radio panel.
|
||||||
|
|
||||||
|
**Cancel**
|
||||||
|
|
||||||
|
- `Esc` or right mouse button: hide the menu, no action, no recorder event, recapture mouse.
|
||||||
|
- Focus and the head ring stay as they were.
|
||||||
|
|
||||||
|
Number keys `1`–`6` may remain as shortcuts that skip the wheel so a smoke-test script still works. They must not fire while the wheel is open (the wheel owns `A` / `D` / `Space`). Document both in the README.
|
||||||
|
|
||||||
|
### NPC display
|
||||||
|
|
||||||
|
Stay on the procedural capsule rig (no Mixamo / GLB dependency this pass). Make them read as people at conversation distance.
|
||||||
|
|
||||||
|
- Neck between torso and head; shoes; simple hair cap (color from seed); two dark eye spheres on the face so a head has a front.
|
||||||
|
- Keep archetype props (camera, box, hat, sign, bag). Keep height / brightness variation from the visual seed.
|
||||||
|
- Collision capsule matches the scaled height so the focus ray / cone hits the body you see.
|
||||||
|
- `Head` stays a named node other systems can find (`get_node("Rig/Head")`) for the ring and the cone.
|
||||||
|
- Walk bob and the "look at the guard when noticed" cue stay.
|
||||||
|
- Do not put the internal type name (`Trespasser`, `Violent Threat`) on the body. The player should judge from clothes, props, and behavior. The debug overlay (`F`) can still print the type.
|
||||||
|
|
||||||
|
AI textures in `assets/textures/ai/` stay out of this pass unless a specific map (shirt, hair) is already the right size.
|
||||||
|
|
||||||
|
### Input map (target)
|
||||||
|
|
||||||
|
| Action | Bind |
|
||||||
|
| --- | --- |
|
||||||
|
| Walk | WASD / arrows (arrows **do not** walk while the wheel is open; they step the highlight) |
|
||||||
|
| Look | Mouse, captured |
|
||||||
|
| Open / confirm action menu | LMB, `Space` |
|
||||||
|
| Cancel menu | RMB, `Esc` |
|
||||||
|
| Step highlight | `A` / `D`, left / right arrows |
|
||||||
|
| Emergency radio | `R` |
|
||||||
|
| Flashlight | `G` |
|
||||||
|
| Door lock | `L` |
|
||||||
|
| Cycle nearby people | `Tab` |
|
||||||
|
| Wand shortcut | `C` (not `W`) |
|
||||||
|
| Inspect shortcut | `E` still allowed when the wheel is closed |
|
||||||
|
|
||||||
|
### Files this pass is expected to touch
|
||||||
|
|
||||||
|
- `src/game/guard_controller.gd` — cone focus, no look while modal, accel, floor snap.
|
||||||
|
- `src/game/npc_avatar.gd` — face / hair / neck, head marker, ring toggle.
|
||||||
|
- `src/game/ui/action_radial.gd` — new Control, `_draw` doughnut, slice pick.
|
||||||
|
- `src/game/ui/hud.gd` — host the radial; stop teaching number-key verbs as the only path.
|
||||||
|
- `src/game/game_manager.gd` — input routing, freeze flags, open/confirm/cancel.
|
||||||
|
- `project.godot` — input map.
|
||||||
|
- `src/core/strings.gd` — controls line, aim-first, no new tone-of-voice.
|
||||||
|
- `src/test/tests/test_focus_and_radial.gd` — cone pick, wrap, cancel emits nothing, `W` is not wand.
|
||||||
|
- README controls table and smoke checklist.
|
||||||
|
|
||||||
## Design Direction
|
## Design Direction
|
||||||
|
|
||||||
The game should feel like a tense workplace simulation with occasional crisis moments. The most satisfying outcome is not overpowering an NPC; it is recognizing the situation early and resolving it calmly.
|
The game should feel like a tense workplace simulation with occasional crisis moments. The most satisfying outcome is not overpowering an NPC; it is recognizing the situation early and resolving it calmly.
|
||||||
|
|||||||
@@ -20,15 +20,23 @@ The central design goal is simple:
|
|||||||
|
|
||||||
| Platform | Package |
|
| Platform | Package |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| **Windows** | [`step-line-windows.exe`](https://git.allucanget.biz/zwitschi/security-game/releases) · 64-bit, no install needed |
|
| **Windows — installer** | [`step-line-setup-<ver>.exe`](https://git.allucanget.biz/zwitschi/security-game/releases) · contains all game data, shortcuts + uninstaller |
|
||||||
| **Linux** | [`step-line-linux.x86_64`](https://git.allucanget.biz/zwitschi/security-game/releases) · 64-bit, `chmod +x` and run |
|
| **Windows — portable** | [`step-line-windows-<ver>.exe`](https://git.allucanget.biz/zwitschi/security-game/releases) · 64-bit, no install needed |
|
||||||
| **macOS** | [`step-line-macos.zip`](https://git.allucanget.biz/zwitschi/security-game/releases) · unsigned build, quarantine note below |
|
| **Linux — AppImage** | [`step-line-<ver>-x86_64.AppImage`](https://git.allucanget.biz/zwitschi/security-game/releases) · single file, `chmod +x` and run |
|
||||||
|
| **Linux — portable** | [`step-line-linux-<ver>.x86_64`](https://git.allucanget.biz/zwitschi/security-game/releases) · 64-bit, `chmod +x` and run |
|
||||||
|
| **macOS** | [`step-line-macos-<ver>.zip`](https://git.allucanget.biz/zwitschi/security-game/releases) · unsigned build, quarantine note below |
|
||||||
|
|
||||||
**All releases:** <https://git.allucanget.biz/zwitschi/security-game/releases>
|
**All releases:** <https://git.allucanget.biz/zwitschi/security-game/releases>
|
||||||
|
|
||||||
> Releases are built automatically by Gitea Actions when a `vX.Y.Z` tag is
|
> **Latest: v0.2.4** — crowd presentation (rubbernecking and panic), the distant skyline ring,
|
||||||
> pushed (see [`docs/RELEASING.md`](docs/RELEASING.md)). Manual builds are
|
> working NPC navigation, and a refreshed screenshot gallery.
|
||||||
> produced with `./tools/build_releases.sh`.
|
> 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
|
||||||
|
> (NSIS + appimagetool) and uploads with the portable binaries.
|
||||||
|
>
|
||||||
|
> Note: on this host, downloading release files currently requires sign-in;
|
||||||
|
> the page and tag URLs are public.
|
||||||
>
|
>
|
||||||
> macOS builds are unsigned: right-click → Open, or clear the quarantine with
|
> macOS builds are unsigned: right-click → Open, or clear the quarantine with
|
||||||
> `xattr -dr com.apple.quarantine step-line-macos.zip`. Build instructions and
|
> `xattr -dr com.apple.quarantine step-line-macos.zip`. Build instructions and
|
||||||
@@ -129,11 +137,49 @@ The architecture maps onto Godot 4 nodes, scenes, and custom resources as descri
|
|||||||
- **Navigation:** `NavigationRegion3D` and `NavigationAgent3D`
|
- **Navigation:** `NavigationRegion3D` and `NavigationAgent3D`
|
||||||
- **NPC behavior:** Custom lightweight finite state machines driven by `NpcProfile` resources
|
- **NPC behavior:** Custom lightweight finite state machines driven by `NpcProfile` resources
|
||||||
- **UI and audio:** Godot `Control` nodes, themes, audio buses, and `AudioStreamPlayer` nodes
|
- **UI and audio:** Godot `Control` nodes, themes, audio buses, and `AudioStreamPlayer` nodes
|
||||||
- **Art assets:** authored PNGs in `assets/textures/` (≤1024px, power-of-two) produced by `tools/generate_textures.py` and imported by Godot; structural geometry stays procedural (`WorldBuilder`)
|
- **Art assets:** authored PNGs and the in-game generated set in `assets/textures/ai/game_ready/`; structural geometry stays procedural (`WorldBuilder`). The legacy `tools/generate_textures.py --ai` batch remains available.
|
||||||
|
- **Asset tooling:** `tools/asset_pipeline.py` generates role-aware assets through OpenRouter and provides crop, resize, seamless-tile, and image-audit commands, including gameplay screenshot checks.
|
||||||
- **Testing:** GUT (Godot Unit Test) in headless mode
|
- **Testing:** GUT (Godot Unit Test) in headless mode
|
||||||
- **Source control:** git on a Gitea host with Gitea Actions (`.gitea/workflows/build.yml`) for headless tests and desktop release builds
|
- **Source control:** git on a Gitea host with Gitea Actions (`.gitea/workflows/build.yml`) for headless tests and desktop release builds
|
||||||
- **Targets:** Windows, Linux, and macOS desktop first; web later
|
- **Targets:** Windows, Linux, and macOS desktop first; web later
|
||||||
|
|
||||||
|
### Image Asset Tools
|
||||||
|
|
||||||
|
Install the Pillow dependency used by the existing texture generator and the asset tools:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python3 -m pip install -r requirements-tools.txt
|
||||||
|
```
|
||||||
|
|
||||||
|
Generate a role-sized image (generation requires `OPENROUTER_API_KEY`):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python3 tools/asset_pipeline.py generate --prompt "weathered red brick" --role tile --output assets/textures/brick_extra.png
|
||||||
|
```
|
||||||
|
|
||||||
|
Generated images are resized to the selected role profile. Non-square requests use
|
||||||
|
the validated `openai/gpt-5-image-mini` source ratio and crop to the final role dimensions.
|
||||||
|
Transparent glyphs can be recolored while preserving their alpha mask with
|
||||||
|
`--foreground '#ffffff'`.
|
||||||
|
|
||||||
|
Crop uses the image center by default; `--x` and `--y` select an explicit crop origin. Resize defaults to aspect-preserving `contain`; use `--fit cover` to crop or `--fit stretch` to distort to the exact dimensions.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python3 tools/asset_pipeline.py crop assets/textures/source.png assets/textures/crop.png --width 256 --height 128
|
||||||
|
python3 tools/asset_pipeline.py resize assets/textures/source.png assets/images/backgrounds/scene.png --width 1920 --height 1080 --fit cover
|
||||||
|
python3 tools/asset_pipeline.py seamless assets/textures/rough_tile.png assets/textures/tile.png
|
||||||
|
```
|
||||||
|
|
||||||
|
Audit accepts image files or directories. `--role auto` infers common roles from paths and filenames; explicit roles include `tile`, `texture`, `icon`, `card`, `banner`, `backdrop`, `background`, `overlay`, `app_icon`, and `screenshot`.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python3 tools/asset_pipeline.py audit assets/textures
|
||||||
|
python3 tools/asset_pipeline.py audit assets/images/backgrounds --role background --json
|
||||||
|
python3 -m unittest discover -s tools -p 'test_*.py'
|
||||||
|
```
|
||||||
|
|
||||||
|
The audit classifies measurable fit issues as `good` or `bad` based on role-specific dimensions, aspect ratio, alpha requirements, and tile-edge continuity. It lists perspective/projection as a visual review item because image semantics cannot be judged reliably by these deterministic checks.
|
||||||
|
|
||||||
### Setup
|
### Setup
|
||||||
|
|
||||||
1. Download the Godot 4.3 editor (official build) and put `godot` on your PATH.
|
1. Download the Godot 4.3 editor (official build) and put `godot` on your PATH.
|
||||||
@@ -156,6 +202,18 @@ godot --headless --path . --script res://src/test/test_runner.gd
|
|||||||
|
|
||||||
# Save a screenshot to user:// (windowed)
|
# Save a screenshot to user:// (windowed)
|
||||||
godot --path . --script res://src/test/take_screenshot.gd
|
godot --path . --script res://src/test/take_screenshot.gd
|
||||||
|
|
||||||
|
# Windowed control smoke: focus ring + action wheel, saves PNGs, exits 1 on failure
|
||||||
|
godot --path . --script res://src/test/smoke_focus_radial.gd
|
||||||
|
|
||||||
|
# Session-shell smoke: menu → shift → pause → settings → menu (headless or windowed)
|
||||||
|
godot --headless --path . --script res://src/test/smoke_session_shell.gd
|
||||||
|
|
||||||
|
# PLAN-verb smoke: recognize, request reason, body camera, warning, blocking
|
||||||
|
godot --headless --path . --script res://src/test/smoke_plan_verbs.gd
|
||||||
|
|
||||||
|
# Crowd smoke: rubbernecking on aggression, panic clearing the entrance
|
||||||
|
godot --headless --path . --script res://src/test/smoke_crowd.gd
|
||||||
```
|
```
|
||||||
|
|
||||||
The unit test runner is the project's own lightweight harness (no editor plugin required) so CI can run it without the editor.
|
The unit test runner is the project's own lightweight harness (no editor plugin required) so CI can run it without the editor.
|
||||||
@@ -165,19 +223,25 @@ The unit test runner is the project's own lightweight harness (no editor plugin
|
|||||||
| Input | Action |
|
| Input | Action |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| W/A/S/D + mouse | Move and look |
|
| W/A/S/D + mouse | Move and look |
|
||||||
| Esc | Release / capture mouse |
|
| Space / left click | Action wheel for the focused person (Stop, Look, Point, No, Ask, Inspect, Wand, Warn, Block, Reason, Recognize, Radio) |
|
||||||
|
| A / D or ←/→ | Step through the action wheel (while it is open) |
|
||||||
|
| Space / left click | Confirm the highlighted action (while the wheel is open) |
|
||||||
|
| Esc / right click | Close the top panel; Esc with nothing open pauses the shift (Esc again resumes) |
|
||||||
|
| ← / → or ↑ / ↓ | Navigate the venue menu and the pause / settings panels |
|
||||||
|
| Enter | Start the highlighted venue from the menu, or confirm in a panel |
|
||||||
|
| 1 / 2 / 3 | Quick gestures without the wheel: raise hand, point, head shake (Level 1) |
|
||||||
| Q | Polite direction (Level 1) |
|
| Q | Polite direction (Level 1) |
|
||||||
| 1 / 2 / 3 | Simple gestures: raise hand, point, head shake (Level 1) |
|
|
||||||
| 4 | Formal warning (Level 2) |
|
| 4 | Formal warning (Level 2) |
|
||||||
| 5 | Blocking and positioning (Level 3) |
|
| 5 | Blocking and positioning (Level 3) |
|
||||||
| 6 | Security assistance radio (Level 4) |
|
| 6 | Security assistance radio (Level 4) |
|
||||||
| R | Emergency radio, hold on-screen button ~1.6s (Level 5) |
|
| R | Emergency radio, hold on-screen button ~1.6s (Level 5) |
|
||||||
| E | Inspect access artifacts / close inspection |
|
| E | Inspect access artifacts / close inspection |
|
||||||
| W | Handheld wand screening (wand venues only) |
|
| C | Handheld wand screening (wand venues only) |
|
||||||
| A / D | Allow / deny entry during inspection or wand check |
|
| A / D | Allow / deny entry during inspection or wand check |
|
||||||
| V | Cycle venue: Hollywood Blvd → The Joke Shop → TV Studio (restarts shift) |
|
| V | Cycle venue (debug shortcut; restart via V restarts the current shift) |
|
||||||
| Tab | Cycle target among nearby NPCs (aim-free alternative) |
|
| Tab | Cycle target among nearby NPCs (aim-free alternative) |
|
||||||
| G | Toggle flashlight (widens NPC perception at night) |
|
| G | Toggle flashlight (widens NPC perception at night) |
|
||||||
|
| B | Toggle the body camera; a formal warning switches it on automatically |
|
||||||
| L | Lock / unlock the restricted door (thwarts forced entry) |
|
| L | Lock / unlock the restricted door (thwarts forced entry) |
|
||||||
| F | Toggle debug overlay |
|
| F | Toggle debug overlay |
|
||||||
|
|
||||||
@@ -202,28 +266,53 @@ Implemented so far:
|
|||||||
- Godot 4.3 project scaffold, input map, procedural world builder
|
- 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`
|
- 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
|
- Three authored scenarios (Hollywood Boulevard building, The Joke Shop, Late Night TV Studio) with access policies, NPC archetypes, and event pools
|
||||||
- Headless unit tests: **52 passing** (access rules, escalation, radio cooldown/battery, NPC reaction determinism, door lock, flashlight perception, persistence round-trip, navmesh, scenario data, full-shift simulation, wand screening, responder dispatch, localization strings)
|
- Headless unit tests: **105 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, 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)
|
||||||
- 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
|
- 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
|
- 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 gold ring 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`)
|
||||||
|
- Session shell: venue start menu (keyboard + mouse), Esc pause overlay (resume / restart / settings / quit to menu), settings panel with mouse-look sensitivity and HUD font scale persisted to `user://settings.json`, and "Run another shift" returning to the venue menu
|
||||||
|
- World presentation: skyline backdrop rendered with an alpha material, walkable step and landing colliders, larger marquee text, and larger focus ring / name tag
|
||||||
|
- Routine traffic despawns after a while at its waypoint so the crowd cap no longer fills with idle standers
|
||||||
|
- PLAN verbs: eye contact (distinct Level 1 cue), recognizing a person as a player decision recorded as access evidence, a body-camera flag that a formal warning arms (and `B` toggles), blocking that physically stations the guard between the person and the door, and a Level 3 request-reason ask answered from the NPC's `dialogue_lines`
|
||||||
|
- Incidents are now actually opened on focus and closed at shift end, so player actions, access evidence, escalation levels, and unresolved interactions reach the review (previously every recorded event was dropped)
|
||||||
|
- Crowd presentation: aggressive behavior and responder arrivals make idle bystanders stop and face the incident; panic sends people away from the door (and they leave the scene). A busy 16-NPC entrance measured ~1.2 ms/frame, so no LOD/culling was needed at the current cap
|
||||||
|
- Distant skyline ring: four alpha-scissored planes at 200 m read as a hazy city on the horizon (the baked backdrop used to show as a black slab), with a larger ground plane so the buildings meet the street
|
||||||
|
- Flashlight aims straight ahead and lights the person/door being checked instead of the ground in front of the guard
|
||||||
- Visual polish pass (v0.2.0): phase-based lighting (sun/sky/ambient per shift phase), street lamps with night-mode bulbs and omni lights, glowing marquee signage, crosswalk, planters and low-poly street trees, NPC height/brightness variety, denser routine traffic — day and late-night screenshot sets
|
- Visual polish pass (v0.2.0): phase-based lighting (sun/sky/ambient per shift phase), street lamps with night-mode bulbs and omni lights, glowing marquee signage, crosswalk, planters and low-poly street trees, NPC height/brightness variety, denser routine traffic — day and late-night screenshot sets
|
||||||
- Assets pass: authored textures in `assets/textures/` (brick facade, concrete, asphalt, awning, skyline, vignette, HUD icons, access-card art) generated by `tools/generate_textures.py`, soft sun shadows, humanoid NPC rigs with archetype props + procedural walk bob and attention head-turn, inspection artifact cards, escalation vignette, mode icons, and a body-camera overlay (REC + shift clock)
|
- Assets pass: authored textures in `assets/textures/` (brick facade, concrete, asphalt, awning, skyline, vignette, HUD icons, access-card art) generated by `tools/generate_textures.py`, soft sun shadows, humanoid NPC rigs with archetype props + procedural walk bob and attention head-turn, inspection artifact cards, escalation vignette, mode icons, and a body-camera overlay (REC + shift clock)
|
||||||
|
|
||||||
Not yet implemented: body-camera replay timeline, full 10-15 minute shift lengths, venue selection startup menu, editor-based GUT integration, RefCounted cycle cleanup, and crowd performance profiling/LOD (see `TODO.md`).
|
Not yet implemented: body-camera replay timeline, emergency aftermath, editor-based GUT integration, and crowd performance profiling/LOD (see `TODO.md`).
|
||||||
|
|
||||||
### Smoke Test Checklist
|
### Smoke Test Checklist
|
||||||
|
|
||||||
1. `godot --path .` starts the game without script errors.
|
1. `godot --path .` starts the game on the venue menu without script errors.
|
||||||
2. The guard moves and looks around; the building, steps, and sidewalk are visible.
|
2. Choosing a venue (click or ↑/↓ + Enter) starts that venue's shift and hides the menu.
|
||||||
3. NPCs spawn and approach the entrance during the first minutes.
|
3. The guard moves and looks around; the building, steps, and sidewalk are visible.
|
||||||
4. Aiming at an NPC shows its archetype and intent in the HUD.
|
4. The guard's camera sits at eye height and the guard stands on the landing, not inside the building.
|
||||||
5. Pressing `Q` produces a reaction log entry and reputation feedback.
|
5. Walking into the steps carries the guard up onto the landing (steps have colliders).
|
||||||
6. `E` opens access inspection showing artifacts and policy result; `A`/`D` record a decision.
|
6. The skyline backdrop shows silhouettes against the sky, not an opaque black slab.
|
||||||
7. `6` opens the assistance form; submitting shows dispatch feedback.
|
7. The `STEP LINE` marquee is readable from the sidewalk.
|
||||||
8. `R` opens the emergency form; the button must be held ~1.6s or the call cancels.
|
8. NPCs spawn and approach the entrance during the first minutes.
|
||||||
9. `G` toggles the flashlight (indicator appears in the HUD); `L` toggles the door lock (indicator turns red when locked).
|
9. Looking at an NPC inside the focus cone shows a gold head ring, the person's name, and the HUD target line.
|
||||||
10. `F` toggles the debug overlay with NPC states and shift stats.
|
10. `Space` or left click opens the action wheel; `A`/`D` highlight a slice, `Space` confirms it, `Esc`/right click cancels without a log entry.
|
||||||
11. NPCs route around the building using the navigation mesh (no stuck-at-wall behavior during a smoke run).
|
11. `E`/`C` open the inspection/wand panels from the wheel and freeze movement until they close; walking never fires the wand.
|
||||||
12. When the shift timer reaches 0, the shift review screen shows grade, incident summary, and persisted shift history.
|
12. Pressing `Q` produces a reaction log entry and reputation feedback.
|
||||||
|
13. `E` opens access inspection showing venue-correct artifacts and policy result; `A`/`D` record a decision.
|
||||||
|
14. `6` opens the assistance form; submitting shows dispatch feedback.
|
||||||
|
15. `R` opens the emergency form; the button must be held ~1.6s or the call cancels.
|
||||||
|
16. `G` toggles the flashlight (indicator appears in the HUD); `L` toggles the door lock (indicator turns red when locked).
|
||||||
|
17. `F` toggles the debug overlay with NPC states and shift stats.
|
||||||
|
18. The wheel's `Look` slice is eye contact (Level 1) and logs as its own action.
|
||||||
|
19. `Reason` asks why the person is there and logs their `dialogue_lines` reply.
|
||||||
|
20. `Recognize` records the guard's recognition as access evidence; pressing it twice says so.
|
||||||
|
21. `Warn` turns the body camera on (REC overlay appears); `B` toggles it manually.
|
||||||
|
22. `Block` moves the guard between the person and the door.
|
||||||
|
23. The shift review reports the incident count, including interactions left unresolved.
|
||||||
|
24. Escalating on someone (or a responder arriving) makes idle bystanders stop and face the incident.
|
||||||
|
25. Repeated alarms panic the crowd and nearby people clear away from the door instead of standing around.
|
||||||
|
26. `Esc` with nothing open pauses the shift; resume / restart / settings / quit-to-menu all work, and settings changes persist across a restart.
|
||||||
|
27. NPCs route around the building using the navigation mesh (no stuck-at-wall behavior during a smoke run).
|
||||||
|
28. When the shift timer reaches 0, the shift review screen shows grade, incident summary, and persisted shift history; "Run another shift" returns to the venue menu.
|
||||||
|
|
||||||
## Development Workflow
|
## Development Workflow
|
||||||
|
|
||||||
|
|||||||
@@ -1,38 +1,72 @@
|
|||||||
# TODO
|
# TODO
|
||||||
|
|
||||||
## 🔴 PRIORITY — Ship downloadable builds (so the README Downloads links work)
|
Godot 4.3 prototype. Release **v0.2.4** is tagged; CI builds the installers and AppImage.
|
||||||
|
Headless suite **105/105**, plus `smoke_session_shell.gd`, `smoke_plan_verbs.gd`,
|
||||||
|
`smoke_crowd.gd`, and the windowed focus/radial smoke.
|
||||||
|
|
||||||
Goal: users hitting the README **Downloads** section can download a playable version from
|
Host `REQUIRE_SIGNIN_VIEW` stays deferred.
|
||||||
`https://git.allucanget.biz/zwitschi/security-game/releases`.
|
|
||||||
|
|
||||||
- [x] Install Godot 4.3 export templates locally.
|
## Emergency aftermath
|
||||||
- [x] `./tools/build_releases.sh` produces Linux/Windows/macOS artifacts (built for 0.2.0).
|
|
||||||
- [x] Linux binary smoke-tested (headless, 0 script errors).
|
|
||||||
- [ ] Publish the release — **blocked on `GITEA_TOKEN`**: once the token is available run
|
|
||||||
`GITEA_TOKEN=... ./tools/publish_release.sh 0.2.0`, or (if the repo secret is already set
|
|
||||||
on the host) push the `v0.2.0` tag and let CI publish via `.gitea/workflows/build.yml`.
|
|
||||||
- [ ] Confirm the README Downloads links resolve: check
|
|
||||||
`https://git.allucanget.biz/zwitschi/security-game/releases` and download one artifact.
|
|
||||||
|
|
||||||
## Future Systems (design-level backlog)
|
Responder outcomes (`command` / `restraint` / `evacuation` / `arrest`) are log lines. PLAN also
|
||||||
|
wants evacuation, a closed street, and an investigation when the call was unjustified.
|
||||||
|
|
||||||
- [ ] Body-camera replay timeline in the shift review.
|
- [ ] `evacuation` outcome actually clears the entrance (NPCs leave, door stays locked).
|
||||||
- [ ] Long (10-15 minute) shift lengths (phase lighting already implemented).
|
- [ ] Unjustified emergency (low danger, no weapon) writes an investigation note on the shift
|
||||||
- [ ] Venue selection startup menu (keyboard cycling with `V` is implemented).
|
review and applies the existing false-report / reputation hit.
|
||||||
- [ ] IDE/editor-based GUT integration when a Godot editor workflow is introduced.
|
- [ ] Review copy names the responder outcome, not only battery and crowd %.
|
||||||
- [ ] Reduce RefCounted reference cycles (NPCController <-> FSM) noted in `MEMORY.md`.
|
|
||||||
|
## Body-camera replay
|
||||||
|
|
||||||
|
- [ ] Shift review: a timeline of recorded incident events (ADR-0005 already stores them).
|
||||||
|
Scrub or step through; no live 3D replay required in the first version.
|
||||||
|
|
||||||
|
## NPC theater
|
||||||
|
|
||||||
|
Intents `sit` / `photo` / `film` / `perform` already pick waypoints. ADR-0010 rig (face/hair)
|
||||||
|
is in the working tree. Bodies still idle-stand at those spots.
|
||||||
|
|
||||||
|
- [ ] Sit pose at `steps_end`. Photo: brief raise of the influencer/tourist prop. Performer
|
||||||
|
stays put and plays the hat/sign.
|
||||||
|
|
||||||
|
## Audio
|
||||||
|
|
||||||
|
`AudioFeedback` is sine beeps. DONE called that "crowd ambience"; it is not.
|
||||||
|
|
||||||
|
- [ ] Loop a low crowd bed that rises with `CrowdSystem.mood`.
|
||||||
|
- [ ] Radio open/close crackle on the existing radio panel, still headless-safe (no-op without
|
||||||
|
an audio server).
|
||||||
|
|
||||||
|
## Accessibility
|
||||||
|
|
||||||
|
- [ ] Escalation colors that still read in grayscale (shape or label, not hue alone).
|
||||||
|
- [ ] HUD font scale in settings.
|
||||||
|
|
||||||
|
## Scenario content still missing vs PLAN lists
|
||||||
|
|
||||||
|
- [ ] Joke Shop: guest on the reservation list without ID; borrowed/mismatched ID; guest
|
||||||
|
refuses wand screening; late arrival during a performance.
|
||||||
|
- [ ] Studio: filming-boundary repeat (influencer ignores a posted line); celebrity-arrival
|
||||||
|
crowd spike (more rubberneckers, not only one `arrive` spawn).
|
||||||
|
- [ ] Building: "activate body camera" and "request reason" once those verbs exist, used in
|
||||||
|
at least one authored event.
|
||||||
|
|
||||||
|
## Distribution follow-up (host config, deferred)
|
||||||
|
|
||||||
|
Verified via API+host credentials (2026-10-31):
|
||||||
|
|
||||||
|
- [x] Repo is **public** (`private:false`) and account has admin rights.
|
||||||
|
- [x] Release `v0.2.1` now carries all five artifacts (portable binaries + NSIS installer +
|
||||||
|
AppImage).
|
||||||
|
- [ ] **Remaining host setting**: instance-wide `[service] REQUIRE_SIGNIN_VIEW=true` makes
|
||||||
|
anonymous browsing/downloads redirect to login. Host admin: `REQUIRE_SIGNIN_VIEW = false`
|
||||||
|
under `[service]` in `app.ini`, restart Gitea. Alternative: mirror downloads.
|
||||||
|
|
||||||
## Open Polish
|
## Open Polish
|
||||||
|
|
||||||
- [ ] Add a body/wand cooldown feel: wand screening currently has no reuse penalty; consider a
|
|
||||||
short per-guest scan animation.
|
|
||||||
- [ ] Keep `%` placeholders stable in `Strings.fmt` when adding keys (positional formatting).
|
- [ ] Keep `%` placeholders stable in `Strings.fmt` when adding keys (positional formatting).
|
||||||
|
|
||||||
## Detailed Graphics — remaining performance items
|
## Tooling (when an editor workflow exists)
|
||||||
|
|
||||||
The visual pass is done (textures, rigs, HUD feedback — see `DONE.md`). Remaining work is
|
- [ ] IDE/editor-based GUT integration. Until then the custom headless runner stays.
|
||||||
performance hardening only.
|
- [ ] Optional later: author venues as `.tres` resources instead of `ScenarioFactory` functions.
|
||||||
|
|
||||||
- [ ] Profile the crowd: ensure textured materials and props hold target frame rate around a
|
|
||||||
busy entrance.
|
|
||||||
- [ ] Add LOD or culling for distant NPCs/props if the crowd grows.
|
|
||||||
|
After Width: | Height: | Size: 2.1 MiB |
|
After Width: | Height: | Size: 856 KiB |
|
After Width: | Height: | Size: 2.0 MiB |
|
After Width: | Height: | Size: 436 KiB |
|
After Width: | Height: | Size: 929 KiB |
|
After Width: | Height: | Size: 671 KiB |
|
After Width: | Height: | Size: 1.2 MiB |
|
After Width: | Height: | Size: 578 KiB |
|
After Width: | Height: | Size: 1.4 MiB |
|
After Width: | Height: | Size: 597 KiB |
|
After Width: | Height: | Size: 398 KiB |
|
After Width: | Height: | Size: 503 KiB |
|
After Width: | Height: | Size: 28 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 521 KiB |
|
After Width: | Height: | Size: 927 B |
|
After Width: | Height: | Size: 921 B |
|
After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 982 B |
|
After Width: | Height: | Size: 90 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 568 KiB |
|
After Width: | Height: | Size: 360 KiB |
|
After Width: | Height: | Size: 675 KiB |
|
After Width: | Height: | Size: 343 KiB |
|
After Width: | Height: | Size: 441 KiB |
|
After Width: | Height: | Size: 801 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.7 KiB |
@@ -1,12 +1,24 @@
|
|||||||
{
|
{
|
||||||
"hud.controls": "Q polite direction · 1-3 simple gestures · 4 warning · 5 block · 6 assist · R emergency · E inspect / close · W wand · A allow · D deny · V venue · G flashlight · L lock door · F debug",
|
"hud.controls": "LMB/Space wheel · A/D step · Space confirm · Esc cancel · R emergency · E inspect · C wand · Q polite · B camera · Tab cycle · G light · L lock · F debug",
|
||||||
|
"radial.raise_hand": "Stop",
|
||||||
|
"radial.eye_contact": "Look",
|
||||||
|
"radial.point": "Point",
|
||||||
|
"radial.head_shake": "No",
|
||||||
|
"radial.polite": "Ask",
|
||||||
|
"radial.inspect": "Inspect",
|
||||||
|
"radial.wand": "Wand",
|
||||||
|
"radial.warning": "Warn",
|
||||||
|
"radial.block": "Block",
|
||||||
|
"radial.reason": "Reason",
|
||||||
|
"radial.recognize": "Recognize",
|
||||||
|
"radial.radio": "Radio",
|
||||||
"hud.escalation_prefix": "Escalation: %s",
|
"hud.escalation_prefix": "Escalation: %s",
|
||||||
"hud.cooldown": "EMERGENCY RADIO COOLDOWN: %.0fs",
|
"hud.cooldown": "EMERGENCY RADIO COOLDOWN: %.0fs",
|
||||||
"hud.aim_first": "Aim at someone first.",
|
"hud.aim_first": "Aim at someone first.",
|
||||||
"hud.no_one_nearby": "No one nearby.",
|
"hud.no_one_nearby": "No one nearby.",
|
||||||
"hud.targeting": "Targeting %s (Tab to cycle).",
|
"hud.targeting": "Targeting %s (Tab to cycle).",
|
||||||
"hud.no_wand": "No wand at this venue.",
|
"hud.no_wand": "No wand at this venue.",
|
||||||
"hud.screen_first": "Screen this guest with the wand (W) before admitting them.",
|
"hud.screen_first": "Screen this guest with the wand (C) before admitting them.",
|
||||||
"access.granted": "Entry granted: %s",
|
"access.granted": "Entry granted: %s",
|
||||||
"access.denied": "Entry denied: %s",
|
"access.denied": "Entry denied: %s",
|
||||||
"access.policy_satisfied": "policy satisfied",
|
"access.policy_satisfied": "policy satisfied",
|
||||||
@@ -33,6 +45,15 @@
|
|||||||
"react.return_later": "%s leaves but may come back.",
|
"react.return_later": "%s leaves but may come back.",
|
||||||
"react.call_someone": "%s calls someone for help.",
|
"react.call_someone": "%s calls someone for help.",
|
||||||
"react.none": "No reaction (yet).",
|
"react.none": "No reaction (yet).",
|
||||||
|
"bodycam.on": "Body camera on.",
|
||||||
|
"bodycam.off": "Body camera off.",
|
||||||
|
"bodycam.warning": "Formal warning recorded on the body camera.",
|
||||||
|
"recognition.declared": "You tell %s you recognize them. Logged as evidence.",
|
||||||
|
"recognition.already": "You have already recognized %s this shift.",
|
||||||
|
"reason.ask": "You ask %s why they are here.",
|
||||||
|
"reason.reply": "%s: \"%s\"",
|
||||||
|
"reason.silent": "%s says nothing and looks away.",
|
||||||
|
"station.blocking": "You step between %s and the door.",
|
||||||
"perception.near": "%s notices you standing close.",
|
"perception.near": "%s notices you standing close.",
|
||||||
"perception.aware": "%s notices you watching.",
|
"perception.aware": "%s notices you watching.",
|
||||||
"door.locked": "The door is now locked.",
|
"door.locked": "The door is now locked.",
|
||||||
@@ -40,5 +61,6 @@
|
|||||||
"door.thwarted": "%s tries the locked door and fails.",
|
"door.thwarted": "%s tries the locked door and fails.",
|
||||||
"flashlight.on": "Flashlight on.",
|
"flashlight.on": "Flashlight on.",
|
||||||
"flashlight.off": "Flashlight off.",
|
"flashlight.off": "Flashlight off.",
|
||||||
"hud.venue_switched": "Venue: %s"
|
"hud.venue_switched": "Venue: %s",
|
||||||
|
"wand.recharge": "Wand scanner is recharging…"
|
||||||
}
|
}
|
||||||
@@ -57,12 +57,22 @@ godot --headless --path . --quit-after 120 # boot smoke t
|
|||||||
./tools/build_releases.sh
|
./tools/build_releases.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
Artifacts are written to `build/`:
|
Artifacts are written to `build/` (all exports embed the PCK — single files):
|
||||||
|
|
||||||
- `build/step-line-linux-<version>.x86_64`
|
- `build/step-line-linux-<version>.x86_64`
|
||||||
- `build/step-line-windows-<version>.exe`
|
- `build/step-line-windows-<version>.exe`
|
||||||
- `build/step-line-macos-<version>.zip`
|
- `build/step-line-macos-<version>.zip`
|
||||||
|
|
||||||
|
When run in CI (tags/dispatch), the build job also packages:
|
||||||
|
|
||||||
|
- `build/step-line-setup-<version>.exe` — Windows installer (NSIS, incl. shortcuts +
|
||||||
|
uninstaller; apt `nsis` on the runner)
|
||||||
|
- `build/step-line-<version>-x86_64.AppImage` — Linux AppImage (`packaging/linux/build_appimage.sh`,
|
||||||
|
appimagetool via `APPIMAGE_EXTRACT_AND_RUN`)
|
||||||
|
|
||||||
|
Locally you can build the AppImage with `bash packaging/linux/build_appimage.sh <version>`;
|
||||||
|
the NSIS installer requires `makensis` (covered by CI).
|
||||||
|
|
||||||
> macOS builds are unsigned and will need `xattr -dr com.apple.quarantine`
|
> macOS builds are unsigned and will need `xattr -dr com.apple.quarantine`
|
||||||
> guidance or notarization for production releases.
|
> guidance or notarization for production releases.
|
||||||
|
|
||||||
@@ -70,15 +80,22 @@ Artifacts are written to `build/`:
|
|||||||
|
|
||||||
The repository lives at `https://git.allucanget.biz/zwitschi/security-game`.
|
The repository lives at `https://git.allucanget.biz/zwitschi/security-game`.
|
||||||
|
|
||||||
Preferred path — use the helper script with a token:
|
Preferred path — use the helper script. It needs either a token or the same
|
||||||
|
credentials used by `git push` (it falls back to `~/.git-credentials`):
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
GITEA_TOKEN=your_api_token ./tools/publish_release.sh 0.1.0
|
GITEA_TOKEN=your_api_token ./tools/publish_release.sh 0.2.1
|
||||||
|
# or simply: ./tools/publish_release.sh 0.2.1 (uses ~/.git-credentials)
|
||||||
```
|
```
|
||||||
|
|
||||||
The script creates the release from `project.godot`'s `config/version`, uploads
|
The script creates (or reuses) the release from `project.godot`'s
|
||||||
all three `build/` artifacts, and prints the release URL. The token needs only
|
`config/version`, uploads the three portable artifacts **plus** the NSIS
|
||||||
`write:repository` scope on the Gitea host.
|
installer and AppImage when present, and prints the release URL. If CI already
|
||||||
|
published the release, re-running the script only adds missing assets.
|
||||||
|
|
||||||
|
> **Host note**: the release is fully built by CI, but anonymous users can only
|
||||||
|
> browse and download when the instance sets `[service] REQUIRE_SIGNIN_VIEW=false`
|
||||||
|
> in `app.ini` (the repo itself is public). See the TODO for the exact steps.
|
||||||
|
|
||||||
Manual alternative:
|
Manual alternative:
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
# ADR-0007: Locomotion and input layers
|
||||||
|
|
||||||
|
- **Status:** Accepted
|
||||||
|
- **Date:** TBD
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
The prototype is first-person: WASD walks, mouse looks, `Esc` toggles capture. Action keys were then bound on the same letters. `W` is walk-forward in the input map and wand screening in `GameManager._handle_key`. `A` / `D` strafe and also allow or deny during inspection. `Q` is polite direction and is also bound as `cancel`.
|
||||||
|
|
||||||
|
A player who walks toward a guest on a wand venue therefore fires the wand. A player who strafes during an inspection can admit or refuse by accident. The mouse cannot click UI while it is captured, and `Esc` cannot mean both "release the mouse" and "I changed my mind."
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
Treat input as layers, only one of which owns a key at a time.
|
||||||
|
|
||||||
|
1. **Locomotion** (default): WASD walk relative to body yaw, mouse look on the captured cursor, pitch clamped. Short acceleration and deceleration. Gravity only when airborne; snap to the floor so the steps work. Walk speed stays around 3.2 m/s. No sprint or crouch in this pass.
|
||||||
|
2. **Modal UI** (radial, inspect, wand, radio, shift review): freeze walk and look. Recapture the mouse when the modal closes. `A` / `D` and arrows belong to the modal while it is open.
|
||||||
|
3. **Equipment and global keys** stay off the person-verb set: `G` flashlight, `L` door lock, `Tab` cycle nearby people, `R` emergency radio, `F` debug, `V` venue (debug). Wand leaves `W`; the optional shortcut is `C`.
|
||||||
|
|
||||||
|
`Esc` closes the top modal first and does nothing else. With no modal open it keeps the capture/release toggle.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
### Positive
|
||||||
|
|
||||||
|
- Walking cannot fire wand, inspect, or admission.
|
||||||
|
- The mouse can click the action menu because capture is released while it is open.
|
||||||
|
- Cancel has one meaning when a menu is up.
|
||||||
|
- Locomotion stays first-person, which matches the body-camera framing.
|
||||||
|
|
||||||
|
### Negative
|
||||||
|
|
||||||
|
- Freeze-while-modal means the player cannot sidestep during an inspect. That is accepted for this pass.
|
||||||
|
- Power users lose `W` as wand. The wheel and `C` replace it.
|
||||||
|
- The input map and `_unhandled_input` must agree, or the conflict returns.
|
||||||
|
|
||||||
|
## Alternatives considered
|
||||||
|
|
||||||
|
- **Keep letter-key verbs on WASD:** Rejected because walk and wand already collide in the prototype.
|
||||||
|
- **Third-person or click-to-move:** Rejected; the body-camera overlay and the "you are the guard" framing depend on first person.
|
||||||
|
- **Hold-right-mouse-to-look, free cursor otherwise:** Rejected for this pass. Constant look is the default security-sim stance; the menu is the exception.
|
||||||
|
- **Never freeze walk:** Rejected because `A` / `D` cannot both strafe and step a menu highlight.
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
# ADR-0008: Cone focus and head ring
|
||||||
|
|
||||||
|
- **Status:** Accepted
|
||||||
|
- **Date:** TBD
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
The prototype picks a person with an 8 m physics ray from the camera. The collider is a capsule. A few pixels off the body, or a bob during a walk, clears the target. The HUD then prints a name and hint, but nothing in the world shows who is selected. `Tab` already cycles people within 12 m as an aim-free path.
|
||||||
|
|
||||||
|
The next pass needs the player to look at a person, know they have them, and only then open an action menu. A hairline ray is too brittle for that, and a HUD line is easy to miss in a crowd.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
Focus is a **cone**, not a ray.
|
||||||
|
|
||||||
|
- People within about 10 m whose **head** projects inside a screen-space circle around the crosshair (about 90 px / 10 degrees) are candidates.
|
||||||
|
- If several heads sit in the circle, pick the one closest to the center; if tied, the nearer one.
|
||||||
|
- The person must be in front of the camera. A short ray to the head skips people fully hidden by the building.
|
||||||
|
- A few frames of grace keep walk-bob from dropping focus.
|
||||||
|
- `Tab` still cycles people inside 12 m and sets the same focused person.
|
||||||
|
|
||||||
|
When someone is in focus, draw a **thin ring** around their head, attached to the avatar `Head` node, billboarded so it stays a circle on screen. Pale gold while idle; brighter and slightly larger while the action menu is open on that person. Optional `display_name` under the ring. One ring at a time.
|
||||||
|
|
||||||
|
The world must not show the internal type name (`Trespasser`, `Violent Threat`). The debug overlay (`F`) can still print it.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
### Positive
|
||||||
|
|
||||||
|
- Looking near a person is enough; the player does not have to pin a capsule.
|
||||||
|
- The ring is visible in the scene, so the HUD is not the only focus cue.
|
||||||
|
- `Tab` remains the accessibility path and shares the same focused person.
|
||||||
|
- The action menu (ADR-0009) has a clear subject.
|
||||||
|
|
||||||
|
### Negative
|
||||||
|
|
||||||
|
- Two heads in the same circle can steal focus; center-distance is a heuristic, not a lock-on.
|
||||||
|
- Hats and protester signs can z-fight a 3D torus. A screen-space circle unprojected from the head is an allowed fallback.
|
||||||
|
- Occlusion rays can fail on unusual geometry; grace frames hide some of that.
|
||||||
|
|
||||||
|
## Alternatives considered
|
||||||
|
|
||||||
|
- **Keep the hairline ray:** Rejected because it drops people too easily and has no world mark.
|
||||||
|
- **Sticky lock-on until cancelled:** Rejected because the job is to watch a crowd, not duel one person.
|
||||||
|
- **Screen reticle only, no world ring:** Rejected; in a crowd the player needs a mark on the head, not only a HUD line.
|
||||||
|
- **Click a person to select, then act:** Rejected for default play. The mouse is captured for look (ADR-0007). Click opens the action menu on whoever is already in the cone.
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
# ADR-0009: Radial action menu
|
||||||
|
|
||||||
|
- **Status:** Accepted
|
||||||
|
- **Date:** TBD
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
NPC verbs in the prototype live on `Q`, `E`, `W`, `1`–`6`, and `R`. That is a cheat sheet. It also collides with walk keys (ADR-0007). The design wants the player to look at a person (ADR-0008) and then choose the lowest useful action, not memorize a number row.
|
||||||
|
|
||||||
|
Inspection, wand screening, and radio already have their own panels. Emergency radio already has a hold-to-confirm on `R` because a misclick is costly. Those panels should stay. What is missing is a single, visible way to pick the verb.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
When someone is in focus, **left mouse button** or **Space** opens a round doughnut menu in the center of the screen. The click that opens it does not pick a slice. If nobody is in focus, do not open; keep the existing "aim first" log line.
|
||||||
|
|
||||||
|
Slices, clockwise from the top, lowest escalation first:
|
||||||
|
|
||||||
|
1. Raise hand (stop / wait)
|
||||||
|
2. Point away
|
||||||
|
3. Head shake
|
||||||
|
4. Polite direction
|
||||||
|
5. Inspect access
|
||||||
|
6. Wand (grey if the venue has no wand)
|
||||||
|
7. Formal warning
|
||||||
|
8. Block
|
||||||
|
9. Radio assist
|
||||||
|
|
||||||
|
Emergency is **not** on the wheel. It stays on `R` with the existing hold-to-confirm panel.
|
||||||
|
|
||||||
|
While the menu is open, walk and look freeze (ADR-0007) and the cursor is visible. Highlight follows the mouse angle over the ring, or steps with `A` / `D` or the left / right arrows, wrapping around. The center shows the focused person's `display_name`.
|
||||||
|
|
||||||
|
**Confirm:** click a slice, or `Space` on the highlighted slice. The menu closes, the mouse is recaptured, and that action runs. Inspect, wand, and radio assist close the wheel and then open the existing panels. Walk and look stay frozen until that panel closes.
|
||||||
|
|
||||||
|
**Cancel:** `Esc` or right mouse button. The menu hides. No action runs. No recorder event. Focus and the head ring stay. The mouse is recaptured.
|
||||||
|
|
||||||
|
Number keys `1`–`6` may remain as shortcuts when the wheel is closed, so existing smoke tests still work. They must not fire while the wheel is open.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
### Positive
|
||||||
|
|
||||||
|
- The player sees the verbs in de-escalation order instead of recalling a number row.
|
||||||
|
- Mouse and keyboard both work (click, or arrows / `A`/`D` then Space).
|
||||||
|
- Cancel is explicit and leaves no incident noise.
|
||||||
|
- Emergency cannot be picked by a bad slice click.
|
||||||
|
- Inspect, wand, and radio keep the panels already tested.
|
||||||
|
|
||||||
|
### Negative
|
||||||
|
|
||||||
|
- Nine slices is dense on a 1280×720 view. Labels must stay short.
|
||||||
|
- Freeze-until-panel-closes stops the player sidestepping during an ID check.
|
||||||
|
- Keeping `1`–`6` as hidden shortcuts can confuse if the README leads with them. Document the wheel first.
|
||||||
|
|
||||||
|
## Alternatives considered
|
||||||
|
|
||||||
|
- **Hold-to-open, release-to-confirm (GTA / Destiny):** Rejected. The requested input is click or Space to open, then click or Space to confirm, with Esc / RMB to abort. That is a toggle, not a hold.
|
||||||
|
- **Vertical list / command menu:** Rejected because a round layout around a focused person matches the head ring and reads faster in a crowd.
|
||||||
|
- **One context-sensitive Use key:** Rejected; the game is about choosing among levels, not a single default verb.
|
||||||
|
- **Emergency on the wheel:** Rejected because a misclick would dispatch armed response. ADR-0002 already keeps that path rare and confirmed.
|
||||||
|
- **Drop number-key shortcuts immediately:** Deferred. They remain as a closed-menu fallback until the wheel is proven in play.
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
# ADR-0010: Procedural NPC presentation
|
||||||
|
|
||||||
|
- **Status:** Accepted
|
||||||
|
- **Date:** TBD
|
||||||
|
|
||||||
|
## Context
|
||||||
|
|
||||||
|
Avatars are `CharacterBody3D` capsules color-coded by `NpcType`, with a few props (camera, box, hat, sign, bag), height and brightness variation from a seed, a walk bob, and a head turn toward the guard when noticed. They work as markers. At conversation distance they do not read as people: no neck, no face direction, no shoes, no hair.
|
||||||
|
|
||||||
|
The player is supposed to judge from clothes, props, and behavior, not from a label. The HUD currently prints the internal type (`Violent Threat`, `Trespasser`) next to the name. Putting that name on the body would make the judgment for them.
|
||||||
|
|
||||||
|
A full Mixamo / GLB pipeline would also add animation imports, licenses, and a skeleton the rest of the sim does not need yet. AI textures in `assets/textures/ai/` are not sized or wired for clothing.
|
||||||
|
|
||||||
|
## Decision
|
||||||
|
|
||||||
|
Keep the procedural capsule rig for this pass. Do not add skinned meshes or Mixamo.
|
||||||
|
|
||||||
|
Make the body read as a person at conversation distance:
|
||||||
|
|
||||||
|
- Neck between torso and head.
|
||||||
|
- Shoes.
|
||||||
|
- Hair cap whose color comes from the visual seed.
|
||||||
|
- Two dark eye spheres so the head has a front.
|
||||||
|
- Named `Head` node (`Rig/Head`) as the attach point for the focus ring (ADR-0008) and the focus cone.
|
||||||
|
- Collision capsule scaled to the visible height so the cone hits the body the player sees.
|
||||||
|
|
||||||
|
Keep archetype props, height / brightness variation, walk bob, and the notice head-turn.
|
||||||
|
|
||||||
|
Do **not** put the internal type name on the body or as a world nametag. A focused `display_name` under the ring is allowed. The debug overlay (`F`) may still print type, intent, and FSM state. The HUD target line can keep the type during the prototype; removing it from the HUD is a later readability pass, not this one.
|
||||||
|
|
||||||
|
AI clothing textures stay out unless a map is already the right size and is wired on purpose.
|
||||||
|
|
||||||
|
## Consequences
|
||||||
|
|
||||||
|
### Positive
|
||||||
|
|
||||||
|
- People have a face direction the ring and the "noticed the guard" cue can use.
|
||||||
|
- No new asset toolchain, licenses, or animation retargeting.
|
||||||
|
- Head is a stable node other systems can find.
|
||||||
|
- The player is not told `Violent Threat` by a floating label.
|
||||||
|
|
||||||
|
### Negative
|
||||||
|
|
||||||
|
- Capsule people still look like a prototype at cinematic camera distance.
|
||||||
|
- Hair and eyes are spheres; they will not survive a close-up trailer.
|
||||||
|
- A later skinned-mesh pass will replace this rig and must keep the `Head` contract.
|
||||||
|
|
||||||
|
## Alternatives considered
|
||||||
|
|
||||||
|
- **Skinned Mixamo / GLB characters now:** Rejected. Cost and pipeline exceed this pass; the sim only needs a readable body and a head node.
|
||||||
|
- **Billboard sprites:** Rejected; first-person movement walks around people, and sprites fail at profile views.
|
||||||
|
- **Keep colored capsules as-is:** Rejected; the head ring and cone need a real head, and capsules do not read as people at two metres.
|
||||||
|
- **World labels with archetype names:** Rejected because they leak sim truth and skip observation.
|
||||||
@@ -152,6 +152,10 @@ Architecture decisions are recorded as ADRs:
|
|||||||
- [ADR-0004: Local single-player first](adr/0004-local-single-player-first.md)
|
- [ADR-0004: Local single-player first](adr/0004-local-single-player-first.md)
|
||||||
- [ADR-0005: Event-based incident recording](adr/0005-event-based-incident-recording.md)
|
- [ADR-0005: Event-based incident recording](adr/0005-event-based-incident-recording.md)
|
||||||
- [ADR-0006: Godot 4 with GDScript](adr/0006-godot-4-gdscript.md)
|
- [ADR-0006: Godot 4 with GDScript](adr/0006-godot-4-gdscript.md)
|
||||||
|
- [ADR-0007: Locomotion and input layers](adr/0007-locomotion-and-input-layers.md)
|
||||||
|
- [ADR-0008: Cone focus and head ring](adr/0008-cone-focus-and-head-ring.md)
|
||||||
|
- [ADR-0009: Radial action menu](adr/0009-radial-action-menu.md)
|
||||||
|
- [ADR-0010: Procedural NPC presentation](adr/0010-procedural-npc-presentation.md)
|
||||||
|
|
||||||
## 10. Quality Requirements
|
## 10. Quality Requirements
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 225 KiB After Width: | Height: | Size: 1.4 MiB |
|
Before Width: | Height: | Size: 233 KiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 242 KiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 219 KiB After Width: | Height: | Size: 986 KiB |
|
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 85 KiB After Width: | Height: | Size: 1.2 MiB |
@@ -23,7 +23,7 @@ script_export_mode=2
|
|||||||
custom_template/debug=""
|
custom_template/debug=""
|
||||||
custom_template/release=""
|
custom_template/release=""
|
||||||
debug/export_console_wrapper=1
|
debug/export_console_wrapper=1
|
||||||
binary_format/embed_pck=false
|
binary_format/embed_pck=true
|
||||||
texture_format/s3tc_bptc=true
|
texture_format/s3tc_bptc=true
|
||||||
texture_format/etc2_astc=false
|
texture_format/etc2_astc=false
|
||||||
binary_format/architecture="x86_64"
|
binary_format/architecture="x86_64"
|
||||||
@@ -54,7 +54,7 @@ script_export_mode=2
|
|||||||
custom_template/debug=""
|
custom_template/debug=""
|
||||||
custom_template/release=""
|
custom_template/release=""
|
||||||
debug/export_console_wrapper=0
|
debug/export_console_wrapper=0
|
||||||
binary_format/embed_pck=false
|
binary_format/embed_pck=true
|
||||||
texture_format/s3tc_bptc=true
|
texture_format/s3tc_bptc=true
|
||||||
texture_format/etc2_astc=false
|
texture_format/etc2_astc=false
|
||||||
codesign/enable=false
|
codesign/enable=false
|
||||||
@@ -90,7 +90,7 @@ script_export_mode=2
|
|||||||
custom_template/debug=""
|
custom_template/debug=""
|
||||||
custom_template/release=""
|
custom_template/release=""
|
||||||
debug/export_console_wrapper=0
|
debug/export_console_wrapper=0
|
||||||
binary_format/embed_pck=false
|
binary_format/embed_pck=true
|
||||||
texture_format/s3tc_bptc=true
|
texture_format/s3tc_bptc=true
|
||||||
texture_format/etc2_astc=true
|
texture_format/etc2_astc=true
|
||||||
codesign/enable=false
|
codesign/enable=false
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# AppImage entry point: launch the bundled game binary.
|
||||||
|
SELF="$(readlink -f "$0")"
|
||||||
|
HERE="$(dirname "$SELF")"
|
||||||
|
exec "${HERE}/usr/bin/step-line" "$@"
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Build a self-contained Step Line AppImage (all game data included).
|
||||||
|
#
|
||||||
|
# Prereqs: exported Linux binary in build/ (embed_pck=true), curl.
|
||||||
|
# Usage: bash packaging/linux/build_appimage.sh [version]
|
||||||
|
# Output: build/step-line-<version>-x86_64.AppImage
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
ROOT="$(cd "$HERE/../.." && pwd)"
|
||||||
|
VERSION="${1:-$(sed -n 's/.*config\/version="\([^"]*\)".*/\1/p' "$ROOT/project.godot")}"
|
||||||
|
SRC_BIN="$ROOT/build/step-line-linux-${VERSION}.x86_64"
|
||||||
|
|
||||||
|
if [[ ! -f "$SRC_BIN" ]]; then
|
||||||
|
echo "error: missing $SRC_BIN — run ./tools/build_releases.sh first" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
WORK="$(mktemp -d)"
|
||||||
|
trap 'rm -rf "$WORK"' EXIT
|
||||||
|
APPDIR="$WORK/StepLine.AppDir"
|
||||||
|
mkdir -p "$APPDIR/usr/bin"
|
||||||
|
cp "$SRC_BIN" "$APPDIR/usr/bin/step-line"
|
||||||
|
# The export embeds the PCK (embed_pck=true), so no extra data files are needed.
|
||||||
|
|
||||||
|
cp "$HERE/step-line.desktop" "$APPDIR/step-line.desktop"
|
||||||
|
cp "$HERE/AppRun" "$APPDIR/AppRun"
|
||||||
|
chmod +x "$APPDIR/AppRun"
|
||||||
|
cp "$HERE/step-line.png" "$APPDIR/step-line.png"
|
||||||
|
# Desktop entry + metainfo in standard locations (AppStream validation requires
|
||||||
|
# the metainfo filename to match the component id, and the .desktop discoverable).
|
||||||
|
mkdir -p "$APPDIR/usr/share/applications" "$APPDIR/usr/share/metainfo"
|
||||||
|
cp "$HERE/step-line.desktop" "$APPDIR/usr/share/applications/step-line.desktop"
|
||||||
|
cp "$HERE/step-line.appdata.xml" "$APPDIR/usr/share/metainfo/net.stepline.game.appdata.xml"
|
||||||
|
|
||||||
|
TOOL="${APPIMAGE_TOOL:-/tmp/appimagetool-x86_64.AppImage}"
|
||||||
|
if [[ ! -f "$TOOL" ]]; then
|
||||||
|
echo "==> Downloading appimagetool"
|
||||||
|
curl -sL -o "$TOOL" \
|
||||||
|
https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
|
||||||
|
chmod +x "$TOOL"
|
||||||
|
fi
|
||||||
|
|
||||||
|
OUT="$ROOT/build/step-line-${VERSION}-x86_64.AppImage"
|
||||||
|
echo "==> Building AppImage -> $OUT"
|
||||||
|
# Extract-and-run avoids a FUSE dependency on the build host.
|
||||||
|
APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" "$APPDIR" "$OUT"
|
||||||
|
echo "AppImage ready: $(ls -la "$OUT" | awk '{print $5}') bytes"
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<component type="desktop-application">
|
||||||
|
<id>net.stepline.game</id>
|
||||||
|
<name>Step Line</name>
|
||||||
|
<summary>Workplace security simulation on Hollywood Boulevard</summary>
|
||||||
|
<url type="homepage">https://git.allucanget.biz/zwitschi/security-game</url>
|
||||||
|
<developer id="net.stepline"><name>Step Line Team</name></developer>
|
||||||
|
<description>
|
||||||
|
<p>
|
||||||
|
Step Line is a workplace security simulation about observation, communication,
|
||||||
|
access verification, and proportionate escalation. Guard the steps and entrance
|
||||||
|
of venues around Hollywood Boulevard: direct tourists, verify wristbands and IDs,
|
||||||
|
screen guests, and escalate only when you have to.
|
||||||
|
</p>
|
||||||
|
</description>
|
||||||
|
<launchable type="desktop-id">step-line.desktop</launchable>
|
||||||
|
<metadata_license>CC0-1.0</metadata_license>
|
||||||
|
<project_license>MIT</project_license>
|
||||||
|
<content_rating type="oars-1.1" />
|
||||||
|
<releases>
|
||||||
|
<release version="0.2.0" date="2026-10-31"/>
|
||||||
|
</releases>
|
||||||
|
</component>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=Step Line
|
||||||
|
Comment=Workplace security simulation on Hollywood Boulevard
|
||||||
|
Exec=step-line
|
||||||
|
Icon=step-line
|
||||||
|
Terminal=false
|
||||||
|
Categories=Game;Simulation;
|
||||||
|
Keywords=security;simulation;hollywood;
|
||||||
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 15 KiB |
@@ -0,0 +1,74 @@
|
|||||||
|
; Step Line Windows installer (NSIS 3).
|
||||||
|
; Build from the repo root with the exported self-contained exe:
|
||||||
|
; makensis /DVERSION=0.2.0 /DARTIFACT=build/step-line-windows-0.2.0.exe \
|
||||||
|
; /DICON=packaging/windows/step-line.ico packaging/windows/step-line.nsi
|
||||||
|
; Outputs: build/step-line-setup-<VERSION>.exe
|
||||||
|
|
||||||
|
!ifndef VERSION
|
||||||
|
!define VERSION "0.0.0"
|
||||||
|
!endif
|
||||||
|
!ifndef ARTIFACT
|
||||||
|
!error "ARTIFACT define required (path to exported windows exe)"
|
||||||
|
!endif
|
||||||
|
!ifndef ICON
|
||||||
|
!define ICON "packaging\windows\step-line.ico"
|
||||||
|
!endif
|
||||||
|
|
||||||
|
; The installed executable uses this clean name (no spaces — NSIS /oname tokens
|
||||||
|
; on whitespace, so a spaced name breaks the File directive).
|
||||||
|
!define INSTALLED_EXE "step-line.exe"
|
||||||
|
!ifndef OUT
|
||||||
|
!define OUT "build\step-line-setup-${VERSION}.exe"
|
||||||
|
!endif
|
||||||
|
!define COMPANY "Step Line Project"
|
||||||
|
!define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\Step Line"
|
||||||
|
|
||||||
|
Unicode true
|
||||||
|
ManifestDPIAware true
|
||||||
|
Icon "${ICON}"
|
||||||
|
UninstallIcon "${ICON}"
|
||||||
|
|
||||||
|
Name "Step Line ${VERSION}"
|
||||||
|
OutFile "${OUT}"
|
||||||
|
InstallDir "$PROGRAMFILES64\Step Line"
|
||||||
|
RequestExecutionLevel admin
|
||||||
|
|
||||||
|
Page directory
|
||||||
|
Page instfiles
|
||||||
|
UninstPage uninstConfirm
|
||||||
|
UninstPage instfiles
|
||||||
|
|
||||||
|
Section "Install"
|
||||||
|
SetOutPath "$INSTDIR"
|
||||||
|
|
||||||
|
; The self-contained executable contains ALL game data (embedded PCK).
|
||||||
|
File "/oname=${INSTALLED_EXE}" "${ARTIFACT}"
|
||||||
|
|
||||||
|
WriteUninstaller "$INSTDIR\uninstall.exe"
|
||||||
|
|
||||||
|
; Shortcuts
|
||||||
|
CreateDirectory "$SMPROGRAMS\Step Line"
|
||||||
|
CreateShortCut "$SMPROGRAMS\Step Line\Step Line.lnk" "$INSTDIR\${INSTALLED_EXE}"
|
||||||
|
CreateShortCut "$SMPROGRAMS\Step Line\Uninstall.lnk" "$INSTDIR\uninstall.exe"
|
||||||
|
CreateShortCut "$DESKTOP\Step Line.lnk" "$INSTDIR\${INSTALLED_EXE}"
|
||||||
|
|
||||||
|
; Registry (Add/Remove Programs)
|
||||||
|
WriteRegStr HKLM "${UNINST_KEY}" "DisplayName" "Step Line"
|
||||||
|
WriteRegStr HKLM "${UNINST_KEY}" "DisplayVersion" "${VERSION}"
|
||||||
|
WriteRegStr HKLM "${UNINST_KEY}" "Publisher" "${COMPANY}"
|
||||||
|
WriteRegStr HKLM "${UNINST_KEY}" "DisplayIcon" "$INSTDIR\${INSTALLED_EXE}"
|
||||||
|
WriteRegStr HKLM "${UNINST_KEY}" "UninstallString" '"$INSTDIR\uninstall.exe"'
|
||||||
|
WriteRegDWORD HKLM "${UNINST_KEY}" "NoModify" 1
|
||||||
|
WriteRegDWORD HKLM "${UNINST_KEY}" "NoRepair" 1
|
||||||
|
SectionEnd
|
||||||
|
|
||||||
|
Section "Uninstall"
|
||||||
|
Delete "$INSTDIR\${INSTALLED_EXE}"
|
||||||
|
Delete "$INSTDIR\uninstall.exe"
|
||||||
|
RMDir "$INSTDIR"
|
||||||
|
Delete "$SMPROGRAMS\Step Line\Step Line.lnk"
|
||||||
|
Delete "$SMPROGRAMS\Step Line\Uninstall.lnk"
|
||||||
|
RMDir "$SMPROGRAMS\Step Line"
|
||||||
|
Delete "$DESKTOP\Step Line.lnk"
|
||||||
|
DeleteRegKey HKLM "${UNINST_KEY}"
|
||||||
|
SectionEnd
|
||||||
@@ -8,7 +8,7 @@ config_version=5
|
|||||||
|
|
||||||
config/name="Step Line"
|
config/name="Step Line"
|
||||||
config/description="Workplace security simulation about observation, access verification, and proportionate escalation."
|
config/description="Workplace security simulation about observation, access verification, and proportionate escalation."
|
||||||
config/version="0.2.0"
|
config/version="0.2.4"
|
||||||
run/main_scene="res://scenes/main.tscn"
|
run/main_scene="res://scenes/main.tscn"
|
||||||
config/features=PackedStringArray("4.3", "GL Compatibility")
|
config/features=PackedStringArray("4.3", "GL Compatibility")
|
||||||
|
|
||||||
@@ -47,18 +47,6 @@ move_right={
|
|||||||
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
|
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
interact={
|
|
||||||
"deadzone": 0.5,
|
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
|
|
||||||
, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null)
|
|
||||||
]
|
|
||||||
}
|
|
||||||
cancel={
|
|
||||||
"deadzone": 0.5,
|
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null)
|
|
||||||
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
|
|
||||||
]
|
|
||||||
}
|
|
||||||
gesture_raise_hand={
|
gesture_raise_hand={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"location":0,"echo":false,"script":null)
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"location":0,"echo":false,"script":null)
|
||||||
@@ -91,8 +79,35 @@ radio_assist={
|
|||||||
}
|
}
|
||||||
radio_emergency={
|
radio_emergency={
|
||||||
"deadzone": 0.5,
|
"deadzone": 0.5,
|
||||||
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":87,"location":0,"echo":false,"script":null)
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null)
|
||||||
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null)
|
]
|
||||||
|
}
|
||||||
|
action_menu={
|
||||||
|
"deadzone": 0.5,
|
||||||
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
|
||||||
|
, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null)
|
||||||
|
]
|
||||||
|
}
|
||||||
|
confirm={
|
||||||
|
"deadzone": 0.5,
|
||||||
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null)
|
||||||
|
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
|
||||||
|
]
|
||||||
|
}
|
||||||
|
cancel={
|
||||||
|
"deadzone": 0.5,
|
||||||
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
|
||||||
|
, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null)
|
||||||
|
]
|
||||||
|
}
|
||||||
|
inspect={
|
||||||
|
"deadzone": 0.5,
|
||||||
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
|
||||||
|
]
|
||||||
|
}
|
||||||
|
wand={
|
||||||
|
"deadzone": 0.5,
|
||||||
|
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"location":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
print_debug={
|
print_debug={
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
Pillow>=9.2
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
appimagetool.png
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
this_dir="$(dirname -- "$(readlink -f -- "$0")")"
|
||||||
|
|
||||||
|
# make appimagetool prefer the bundled mksquashfs
|
||||||
|
export PATH="$this_dir"/usr/bin:"$PATH"
|
||||||
|
|
||||||
|
exec "$this_dir"/usr/bin/appimagetool "$@"
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
usr/share/applications/appimagetool.desktop
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
usr/share/icons/hicolor/128x128/apps/appimagetool.png
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=appimagetool
|
||||||
|
Exec=appimagetool
|
||||||
|
Comment=Tool to generate AppImages from AppDirs
|
||||||
|
Icon=appimagetool
|
||||||
|
Categories=Development;
|
||||||
|
Terminal=true
|
||||||
|
|
||||||
|
After Width: | Height: | Size: 9.5 KiB |
@@ -0,0 +1,31 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<component type="desktop">
|
||||||
|
<id>appimagetool.desktop</id>
|
||||||
|
<metadata_license>MIT</metadata_license>
|
||||||
|
<project_license>MIT</project_license>
|
||||||
|
<name>appimagetool</name>
|
||||||
|
<summary>Create AppImage files</summary>
|
||||||
|
<description>
|
||||||
|
<p>
|
||||||
|
appimagetool is a tool that lets you generate AppImage files. An AppImage
|
||||||
|
is a self-running bundle that contains an application and everything
|
||||||
|
it needs to run that cannot reasonably expected to be part of each target system.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
This can include libraries that are not commonly available on target systems,
|
||||||
|
resources such as translations, icons, fonts, and other auxiliary files.
|
||||||
|
appimagetool makes it easy to take an AppDir (e.g., generated by linuxdeployqt)
|
||||||
|
and turn it into an AppImage.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
You can also embed update information so that your users can update the AppImage
|
||||||
|
using binary delta updates with the AppImageUpdate tool.
|
||||||
|
You can also sign the AppImage with GPG.
|
||||||
|
</p>
|
||||||
|
</description>
|
||||||
|
<url type="homepage">https://github.com/AppImage/AppImageKit</url>
|
||||||
|
<project_group>AppImage</project_group>
|
||||||
|
<provides>
|
||||||
|
<binary>appimagetool</binary>
|
||||||
|
</provides>
|
||||||
|
</component>
|
||||||
@@ -37,3 +37,29 @@ func save_shift_result(result: Dictionary) -> Error:
|
|||||||
var results := load_shift_results()
|
var results := load_shift_results()
|
||||||
results.append(result)
|
results.append(result)
|
||||||
return _save_json(SHIFT_RESULTS_FILE, results)
|
return _save_json(SHIFT_RESULTS_FILE, results)
|
||||||
|
|
||||||
|
## Defaults for player settings. Kept in code so a missing or partial
|
||||||
|
## settings.json still produces a usable config.
|
||||||
|
const DEFAULT_SETTINGS := {
|
||||||
|
"look_sensitivity": 0.0022,
|
||||||
|
"hud_font_scale": 1.0,
|
||||||
|
"ai_difficulty": "normal",
|
||||||
|
}
|
||||||
|
|
||||||
|
## Load player settings, merged over the defaults. Returns a Dictionary.
|
||||||
|
func load_settings() -> Dictionary:
|
||||||
|
var merged: Dictionary = DEFAULT_SETTINGS.duplicate(true)
|
||||||
|
var data = _load_json(SETTINGS_FILE)
|
||||||
|
if data is Dictionary:
|
||||||
|
for key in data.keys():
|
||||||
|
if merged.has(key):
|
||||||
|
merged[key] = data[key]
|
||||||
|
return merged
|
||||||
|
|
||||||
|
## Persist player settings. Returns Error.
|
||||||
|
func save_settings(settings: Dictionary) -> Error:
|
||||||
|
var merged: Dictionary = DEFAULT_SETTINGS.duplicate(true)
|
||||||
|
for key in settings.keys():
|
||||||
|
if merged.has(key):
|
||||||
|
merged[key] = settings[key]
|
||||||
|
return _save_json(SETTINGS_FILE, merged)
|
||||||
@@ -393,6 +393,8 @@ static func joke_shop() -> VenueScenario:
|
|||||||
"guard_post": Vector3(0, 0, -3),
|
"guard_post": Vector3(0, 0, -3),
|
||||||
"entrance": Vector3(0, 0, 1.0),
|
"entrance": Vector3(0, 0, 1.0),
|
||||||
"door_area": Vector3(0, 0, 3),
|
"door_area": Vector3(0, 0, 3),
|
||||||
|
"steps_end": Vector3(0, 0, 3),
|
||||||
|
"sidewalk": Vector3(0, 0, 9),
|
||||||
"queue_area": Vector3(0, 0, 9),
|
"queue_area": Vector3(0, 0, 9),
|
||||||
}
|
}
|
||||||
scenario.door_staff_lines = {
|
scenario.door_staff_lines = {
|
||||||
@@ -433,7 +435,7 @@ static func joke_shop() -> VenueScenario:
|
|||||||
scenario.event_pool = [
|
scenario.event_pool = [
|
||||||
_joke_guest("guest_valid", true, true, Vector2(0, 900), 0.30),
|
_joke_guest("guest_valid", true, true, Vector2(0, 900), 0.30),
|
||||||
_joke_guest("guest_no_ticket", false, true, Vector2(0, 900), 0.18),
|
_joke_guest("guest_no_ticket", false, true, Vector2(0, 900), 0.18),
|
||||||
_joke_guest("guest_expired_id", true, true, Vector2(0, 900), 0.12),
|
_joke_guest("guest_expired_id", true, true, Vector2(0, 900), 0.12, {"id_status": Rules.ArtifactStatus.EXPIRED}),
|
||||||
_joke_guest("guest_no_id", true, false, Vector2(0, 900), 0.12),
|
_joke_guest("guest_no_id", true, false, Vector2(0, 900), 0.12),
|
||||||
_joke_staff_entry(Vector2(0, 900), 0.25),
|
_joke_staff_entry(Vector2(0, 900), 0.25),
|
||||||
_joke_routine("performer_show", Rules.NpcType.PERFORMER, "perform", Vector2(300, 800), 0.15),
|
_joke_routine("performer_show", Rules.NpcType.PERFORMER, "perform", Vector2(300, 800), 0.15),
|
||||||
@@ -475,6 +477,8 @@ static func tv_studio() -> VenueScenario:
|
|||||||
"guard_post": Vector3(0, 0, -3),
|
"guard_post": Vector3(0, 0, -3),
|
||||||
"entrance": Vector3(0, 0, 1.0),
|
"entrance": Vector3(0, 0, 1.0),
|
||||||
"stage_door": Vector3(6, 0, -2),
|
"stage_door": Vector3(6, 0, -2),
|
||||||
|
"steps_end": Vector3(0, 0, 3),
|
||||||
|
"sidewalk": Vector3(0, 0, 9),
|
||||||
"queue_area": Vector3(0, 0, 9),
|
"queue_area": Vector3(0, 0, 9),
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -492,9 +496,9 @@ static func tv_studio() -> VenueScenario:
|
|||||||
])
|
])
|
||||||
|
|
||||||
scenario.event_pool = [
|
scenario.event_pool = [
|
||||||
_studio_routine("audience_ticket", Rules.NpcType.AUTHORIZED_GUEST, "enter", Vector2(0, 900), 0.35),
|
_studio_guest("audience_ticket", {"has_ticket": true}, Vector2(0, 900), 0.35),
|
||||||
_studio_routine("protest_outside", Rules.NpcType.PROTESTER, "protest", Vector2(300, 900), 0.18),
|
_studio_routine("protest_outside", Rules.NpcType.PROTESTER, "protest", Vector2(300, 900), 0.18),
|
||||||
_studio_routine("celebrity_arrival", Rules.NpcType.AUTHORIZED_GUEST, "arrive", Vector2(300, 700), 0.20),
|
_studio_guest("celebrity_arrival", {"has_guest_list": true}, Vector2(300, 700), 0.20, "arrive"),
|
||||||
_studio_routine("crew_shift", Rules.NpcType.AUTHORIZED_STAFF, "enter", Vector2(0, 700), 0.30),
|
_studio_routine("crew_shift", Rules.NpcType.AUTHORIZED_STAFF, "enter", Vector2(0, 700), 0.30),
|
||||||
_studio_routine("tourist_photo", Rules.NpcType.TOURIST, "photo", Vector2(0, 900), 0.35),
|
_studio_routine("tourist_photo", Rules.NpcType.TOURIST, "photo", Vector2(0, 900), 0.35),
|
||||||
_studio_routine("confused_enter", Rules.NpcType.CONFUSED_VISITOR, "enter", Vector2(0, 900), 0.25),
|
_studio_routine("confused_enter", Rules.NpcType.CONFUSED_VISITOR, "enter", Vector2(0, 900), 0.25),
|
||||||
@@ -509,6 +513,7 @@ static func tv_studio() -> VenueScenario:
|
|||||||
"time_range_s": Vector2(620, 780),
|
"time_range_s": Vector2(620, 780),
|
||||||
"probability": 0.55,
|
"probability": 0.55,
|
||||||
"base_weight": 1.0,
|
"base_weight": 1.0,
|
||||||
|
"override_access": {"wristband_status": Rules.ArtifactStatus.COUNTERFEIT, "credential_status": Rules.ArtifactStatus.COUNTERFEIT},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "studio_follow_through",
|
"id": "studio_follow_through",
|
||||||
@@ -516,6 +521,7 @@ static func tv_studio() -> VenueScenario:
|
|||||||
"kind": "scripted",
|
"kind": "scripted",
|
||||||
"npc_type": Rules.NpcType.TRESPASSER,
|
"npc_type": Rules.NpcType.TRESPASSER,
|
||||||
"intent": "follow_authorized",
|
"intent": "follow_authorized",
|
||||||
|
"override_access": {"has_ticket": false, "has_wristband": false, "has_credential": false, "has_guest_list": false},
|
||||||
"time_range_s": Vector2(700, 860),
|
"time_range_s": Vector2(700, 860),
|
||||||
"probability": 0.45,
|
"probability": 0.45,
|
||||||
"base_weight": 1.0,
|
"base_weight": 1.0,
|
||||||
@@ -549,12 +555,23 @@ static func _building_routine(id: String, npc_type: int, intent: String, time_ra
|
|||||||
"time_range_s": time_range, "probability": prob, "base_weight": 1.0,
|
"time_range_s": time_range, "probability": prob, "base_weight": 1.0,
|
||||||
}
|
}
|
||||||
|
|
||||||
static func _joke_guest(id: String, has_ticket: bool, has_id: bool, time_range: Vector2, prob: float) -> Dictionary:
|
static func _joke_guest(id: String, has_ticket: bool, has_id: bool, time_range: Vector2, prob: float, extra: Dictionary = {}) -> Dictionary:
|
||||||
|
var override := {"has_ticket": has_ticket, "has_id": has_id}
|
||||||
|
for key in extra.keys():
|
||||||
|
override[key] = extra[key]
|
||||||
return {
|
return {
|
||||||
"id": id, "phase": _phase_for_range(time_range, 900.0),
|
"id": id, "phase": _phase_for_range(time_range, 900.0),
|
||||||
"kind": "routine", "npc_type": Rules.NpcType.AUTHORIZED_GUEST, "intent": "enter",
|
"kind": "routine", "npc_type": Rules.NpcType.AUTHORIZED_GUEST, "intent": "enter",
|
||||||
"time_range_s": time_range, "probability": prob, "base_weight": 1.0,
|
"time_range_s": time_range, "probability": prob, "base_weight": 1.0,
|
||||||
"override_access": {"has_ticket": has_ticket, "has_id": has_id},
|
"override_access": override,
|
||||||
|
}
|
||||||
|
|
||||||
|
static func _studio_guest(id: String, override_access: Dictionary, time_range: Vector2, prob: float, intent: String = "enter") -> Dictionary:
|
||||||
|
return {
|
||||||
|
"id": id, "phase": _phase_for_range(time_range, 900.0),
|
||||||
|
"kind": "routine", "npc_type": Rules.NpcType.AUTHORIZED_GUEST, "intent": intent,
|
||||||
|
"time_range_s": time_range, "probability": prob, "base_weight": 1.0,
|
||||||
|
"override_access": override_access,
|
||||||
}
|
}
|
||||||
|
|
||||||
static func _joke_staff_entry(time_range: Vector2, prob: float) -> Dictionary:
|
static func _joke_staff_entry(time_range: Vector2, prob: float) -> Dictionary:
|
||||||
|
|||||||
@@ -0,0 +1,134 @@
|
|||||||
|
extends RefCounted
|
||||||
|
## Builds the access artifacts a person actually presents.
|
||||||
|
## Event `override_access` wins; otherwise a venue-appropriate default from
|
||||||
|
## type + policy. Recognition is never attached to every guest.
|
||||||
|
|
||||||
|
const Rules := preload("res://src/core/rules.gd")
|
||||||
|
const AccessArtifact := preload("res://src/core/access_artifact.gd")
|
||||||
|
const AccessPolicy := preload("res://src/core/access_policy.gd")
|
||||||
|
const NpcProfile := preload("res://src/core/npc_profile.gd")
|
||||||
|
|
||||||
|
static func build(profile: NpcProfile, policy: AccessPolicy, override: Dictionary = {}) -> Array:
|
||||||
|
var npc_type: int = profile.npc_type if profile else Rules.NpcType.TOURIST
|
||||||
|
var out: Array = []
|
||||||
|
if override.get("recognized", false) or (override.is_empty() and npc_type == Rules.NpcType.AUTHORIZED_STAFF):
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.RECOGNITION, Rules.ArtifactStatus.VALID, {"known": true}))
|
||||||
|
if not override.is_empty():
|
||||||
|
_append_override(out, profile, override)
|
||||||
|
return out
|
||||||
|
if policy != null and (policy.require_id or policy.requires(Rules.AccessKind.ID)):
|
||||||
|
_append_id_ticket_defaults(out, profile, npc_type, policy)
|
||||||
|
return out
|
||||||
|
if policy != null and policy.grant_if_any_required:
|
||||||
|
_append_or_defaults(out, npc_type)
|
||||||
|
return out
|
||||||
|
_append_wristband_defaults(out, npc_type)
|
||||||
|
return out
|
||||||
|
|
||||||
|
static func roll_carried_items(seed_value: int, override: Dictionary = {}) -> Array:
|
||||||
|
if override.has("carried_items"):
|
||||||
|
return override["carried_items"]
|
||||||
|
var rng := RandomNumberGenerator.new()
|
||||||
|
rng.seed = seed_value if seed_value != 0 else 1
|
||||||
|
var roll := rng.randf()
|
||||||
|
if roll < 0.08:
|
||||||
|
return ["keys", "knife"]
|
||||||
|
if roll < 0.40:
|
||||||
|
return ["keys"]
|
||||||
|
if roll < 0.62:
|
||||||
|
return ["phone"]
|
||||||
|
if roll < 0.80:
|
||||||
|
return ["belt"]
|
||||||
|
return []
|
||||||
|
|
||||||
|
static func _append_override(out: Array, profile: NpcProfile, override: Dictionary) -> void:
|
||||||
|
if override.has("has_id") or override.has("id_status"):
|
||||||
|
var has_id := bool(override.get("has_id", true))
|
||||||
|
var status: int = int(override.get("id_status", Rules.ArtifactStatus.VALID if has_id else Rules.ArtifactStatus.MISSING))
|
||||||
|
if not has_id:
|
||||||
|
status = Rules.ArtifactStatus.MISSING
|
||||||
|
var attrs := {}
|
||||||
|
if status != Rules.ArtifactStatus.MISSING:
|
||||||
|
attrs["age"] = int(override.get("age", 24))
|
||||||
|
attrs["name"] = profile.display_name if profile else "Guest"
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.ID, status, attrs))
|
||||||
|
if override.has("has_ticket") or override.has("ticket_status"):
|
||||||
|
var has_ticket := bool(override.get("has_ticket", true))
|
||||||
|
var status: int = int(override.get("ticket_status", Rules.ArtifactStatus.VALID if has_ticket else Rules.ArtifactStatus.MISSING))
|
||||||
|
if not has_ticket:
|
||||||
|
status = Rules.ArtifactStatus.MISSING
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.TICKET, status, {}))
|
||||||
|
if override.has("has_wristband") or override.has("wristband_status"):
|
||||||
|
var status := _present_status(override, "has_wristband", "wristband_status")
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, status, _band_attrs(status)))
|
||||||
|
if override.has("has_credential") or override.has("credential_status"):
|
||||||
|
var status := _present_status(override, "has_credential", "credential_status")
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.CREDENTIAL, status, {"role": "staff"}))
|
||||||
|
if override.has("has_guest_list") or override.has("guest_list_status"):
|
||||||
|
var status := _present_status(override, "has_guest_list", "guest_list_status")
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.GUEST_LIST, status, {}))
|
||||||
|
|
||||||
|
static func _present_status(override: Dictionary, has_key: String, status_key: String) -> int:
|
||||||
|
if override.has(status_key):
|
||||||
|
return int(override[status_key])
|
||||||
|
return Rules.ArtifactStatus.VALID if bool(override.get(has_key, false)) else Rules.ArtifactStatus.MISSING
|
||||||
|
|
||||||
|
static func _append_id_ticket_defaults(out: Array, profile: NpcProfile, npc_type: int, policy: AccessPolicy) -> void:
|
||||||
|
if npc_type == Rules.NpcType.AUTHORIZED_STAFF:
|
||||||
|
return
|
||||||
|
if npc_type == Rules.NpcType.AUTHORIZED_GUEST:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.ID, Rules.ArtifactStatus.VALID, {
|
||||||
|
"age": 24, "name": profile.display_name if profile else "Guest",
|
||||||
|
}))
|
||||||
|
if policy.requires(Rules.AccessKind.TICKET):
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.TICKET, Rules.ArtifactStatus.VALID, {}))
|
||||||
|
return
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.ID, Rules.ArtifactStatus.MISSING, {}))
|
||||||
|
if policy.requires(Rules.AccessKind.TICKET):
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.TICKET, Rules.ArtifactStatus.MISSING, {}))
|
||||||
|
|
||||||
|
static func _append_or_defaults(out: Array, npc_type: int) -> void:
|
||||||
|
match npc_type:
|
||||||
|
Rules.NpcType.AUTHORIZED_STAFF, Rules.NpcType.DELIVERY:
|
||||||
|
if not _has_kind(out, Rules.AccessKind.RECOGNITION):
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.CREDENTIAL, Rules.ArtifactStatus.VALID, {"role": "staff"}))
|
||||||
|
Rules.NpcType.AUTHORIZED_GUEST:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.TICKET, Rules.ArtifactStatus.VALID, {}))
|
||||||
|
Rules.NpcType.TRESPASSER:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.COUNTERFEIT, _band_attrs(Rules.ArtifactStatus.COUNTERFEIT)))
|
||||||
|
Rules.NpcType.CONFUSED_VISITOR:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.AMBIGUOUS, _band_attrs(Rules.ArtifactStatus.AMBIGUOUS)))
|
||||||
|
_:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.MISSING, {}))
|
||||||
|
|
||||||
|
static func _append_wristband_defaults(out: Array, npc_type: int) -> void:
|
||||||
|
match npc_type:
|
||||||
|
Rules.NpcType.AUTHORIZED_STAFF:
|
||||||
|
pass
|
||||||
|
Rules.NpcType.AUTHORIZED_GUEST, Rules.NpcType.DELIVERY:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.VALID, _band_attrs(Rules.ArtifactStatus.VALID)))
|
||||||
|
if npc_type == Rules.NpcType.DELIVERY:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.CREDENTIAL, Rules.ArtifactStatus.VALID, {"role": "delivery"}))
|
||||||
|
Rules.NpcType.TRESPASSER:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.COUNTERFEIT, _band_attrs(Rules.ArtifactStatus.COUNTERFEIT)))
|
||||||
|
Rules.NpcType.CONFUSED_VISITOR:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.AMBIGUOUS, _band_attrs(Rules.ArtifactStatus.AMBIGUOUS)))
|
||||||
|
_:
|
||||||
|
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.MISSING, {}))
|
||||||
|
|
||||||
|
static func _band_attrs(status: int) -> Dictionary:
|
||||||
|
match status:
|
||||||
|
Rules.ArtifactStatus.VALID:
|
||||||
|
return {"color": "red", "date": "2026-02-13", "event": "gala"}
|
||||||
|
Rules.ArtifactStatus.COUNTERFEIT:
|
||||||
|
return {"color": "red", "date": "2024-01-01"}
|
||||||
|
Rules.ArtifactStatus.AMBIGUOUS:
|
||||||
|
return {"color": "gold"}
|
||||||
|
_:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
static func _has_kind(artifacts: Array, kind: int) -> bool:
|
||||||
|
for artifact in artifacts:
|
||||||
|
if artifact is AccessArtifact and artifact.kind == kind:
|
||||||
|
return true
|
||||||
|
return false
|
||||||
@@ -15,7 +15,7 @@ func _init() -> void:
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
## Verify a single person's set of artifacts (person_artifacts: Array[AccessArtifact]).
|
## Verify a single person's set of artifacts (person_artifacts: Array[AccessArtifact]).
|
||||||
func verify(person_artifacts: Array, policy: AccessPolicy) -> Dictionary:
|
func verify(person_artifacts: Array, policy: AccessPolicy, already_screened: bool = false) -> Dictionary:
|
||||||
var reasons: Array[String] = []
|
var reasons: Array[String] = []
|
||||||
var issues: Array[String] = []
|
var issues: Array[String] = []
|
||||||
var checked: Array[String] = []
|
var checked: Array[String] = []
|
||||||
@@ -48,7 +48,7 @@ func verify(person_artifacts: Array, policy: AccessPolicy) -> Dictionary:
|
|||||||
|
|
||||||
# Wand screening is processed by the interaction layer (false alarms), but a
|
# Wand screening is processed by the interaction layer (false alarms), but a
|
||||||
# policy can hard-require it; a refused screen blocks entry.
|
# policy can hard-require it; a refused screen blocks entry.
|
||||||
if policy.wand_screening_required and not person_screened(person_artifacts):
|
if policy.wand_screening_required and not already_screened and not person_screened(person_artifacts):
|
||||||
issues.append("Screening required")
|
issues.append("Screening required")
|
||||||
return _result(false, reasons, issues, checked)
|
return _result(false, reasons, issues, checked)
|
||||||
|
|
||||||
|
|||||||
@@ -45,6 +45,20 @@ func apply_event(event_type: String) -> void:
|
|||||||
"event": event_type,
|
"event": event_type,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
## Presentation cue for the avatars after a crowd event (PLAN: Public Crowd
|
||||||
|
## Reaction). "watch" = rubberneck at the incident, "flee" = move away from the
|
||||||
|
## door, "" = no reaction. Pure so it is headless-testable.
|
||||||
|
static func reaction_for_event(event_type: String) -> String:
|
||||||
|
match event_type:
|
||||||
|
"aggressive_behavior", "visible_weapon", "emergency_responder":
|
||||||
|
return "watch"
|
||||||
|
_:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
## True once the crowd is panicking hard enough that people should clear out.
|
||||||
|
func should_flee() -> bool:
|
||||||
|
return crowd_panic
|
||||||
|
|
||||||
func summary() -> Dictionary:
|
func summary() -> Dictionary:
|
||||||
return {
|
return {
|
||||||
"mood": mood,
|
"mood": mood,
|
||||||
|
|||||||
@@ -2,15 +2,26 @@ class_name FSM
|
|||||||
extends RefCounted
|
extends RefCounted
|
||||||
## Minimal generic finite state machine used by NPCController and ShiftCoordinator.
|
## Minimal generic finite state machine used by NPCController and ShiftCoordinator.
|
||||||
## Deterministic and headless-testable.
|
## Deterministic and headless-testable.
|
||||||
|
##
|
||||||
|
## The owner is held through a WeakRef so long-lived owners do not create a
|
||||||
|
## reference cycle (FSM <-> owner), which previously leaked RefCounted objects
|
||||||
|
## at process exit (see MEMORY.md).
|
||||||
|
|
||||||
signal state_changed(node: Object, from_state: String, to_state: String)
|
signal state_changed(node: Object, from_state: String, to_state: String)
|
||||||
|
|
||||||
var current_state: String = ""
|
var current_state: String = ""
|
||||||
var _transitions: Dictionary = {} # state_name -> Array[{to, guard: Callable}]
|
var _transitions: Dictionary = {} # state_name -> Array[{to, guard: Callable}]
|
||||||
var _owner_node: Object = null
|
var _owner_ref: WeakRef = null
|
||||||
|
|
||||||
func _init(owner_node: Object = null) -> void:
|
func _init(owner_node: Object = null) -> void:
|
||||||
_owner_node = owner_node
|
if owner_node != null:
|
||||||
|
_owner_ref = weakref(owner_node)
|
||||||
|
|
||||||
|
## The live owner object, or null if it was freed.
|
||||||
|
func _owner() -> Object:
|
||||||
|
if _owner_ref == null:
|
||||||
|
return null
|
||||||
|
return _owner_ref.get_ref() as Object
|
||||||
|
|
||||||
## Register a transition. guard is an optional Callable(node) -> bool.
|
## Register a transition. guard is an optional Callable(node) -> bool.
|
||||||
func add_transition(from_state: String, to_state: String, guard: Callable = Callable()) -> void:
|
func add_transition(from_state: String, to_state: String, guard: Callable = Callable()) -> void:
|
||||||
@@ -20,7 +31,7 @@ func add_transition(from_state: String, to_state: String, guard: Callable = Call
|
|||||||
|
|
||||||
func start(initial_state: String) -> void:
|
func start(initial_state: String) -> void:
|
||||||
current_state = initial_state
|
current_state = initial_state
|
||||||
state_changed.emit(_owner_node, "", initial_state)
|
state_changed.emit(_owner(), "", initial_state)
|
||||||
|
|
||||||
## Attempt to move to `to_state`. Returns true when executed.
|
## Attempt to move to `to_state`. Returns true when executed.
|
||||||
func transition_to(to_state: String) -> bool:
|
func transition_to(to_state: String) -> bool:
|
||||||
@@ -31,10 +42,10 @@ func transition_to(to_state: String) -> bool:
|
|||||||
if t["to"] != to_state:
|
if t["to"] != to_state:
|
||||||
continue
|
continue
|
||||||
var guard: Callable = t["guard"]
|
var guard: Callable = t["guard"]
|
||||||
if not guard.is_valid() or guard.call(_owner_node):
|
if not guard.is_valid() or guard.call(_owner()):
|
||||||
var from := current_state
|
var from := current_state
|
||||||
current_state = to_state
|
current_state = to_state
|
||||||
state_changed.emit(_owner_node, from, to_state)
|
state_changed.emit(_owner(), from, to_state)
|
||||||
return true
|
return true
|
||||||
return false
|
return false
|
||||||
|
|
||||||
@@ -42,6 +53,6 @@ func can_transition_to(to_state: String) -> bool:
|
|||||||
for t in _transitions.get(current_state, []):
|
for t in _transitions.get(current_state, []):
|
||||||
if t["to"] == to_state:
|
if t["to"] == to_state:
|
||||||
var guard: Callable = t["guard"]
|
var guard: Callable = t["guard"]
|
||||||
if not guard.is_valid() or guard.call(_owner_node):
|
if not guard.is_valid() or guard.call(_owner()):
|
||||||
return true
|
return true
|
||||||
return false
|
return false
|
||||||
@@ -78,6 +78,19 @@ func close_incident(npc_id: String, outcome: String) -> Dictionary:
|
|||||||
func open_incidents_count() -> int:
|
func open_incidents_count() -> int:
|
||||||
return _open_incidents.size()
|
return _open_incidents.size()
|
||||||
|
|
||||||
|
## True when an incident is already open for this NPC (avoids duplicating one
|
||||||
|
## incident every time the player re-focuses the same person).
|
||||||
|
func has_open_incident(npc_id: String) -> bool:
|
||||||
|
return _open_incidents.has(npc_id)
|
||||||
|
|
||||||
|
## Close every still-open incident at shift end so the review does not silently
|
||||||
|
## drop interactions the player never resolved. Returns how many were closed.
|
||||||
|
func close_all_open(outcome: String = "unresolved") -> int:
|
||||||
|
var ids: Array = _open_incidents.keys()
|
||||||
|
for npc_id in ids:
|
||||||
|
close_incident(str(npc_id), outcome)
|
||||||
|
return ids.size()
|
||||||
|
|
||||||
func to_dict() -> Dictionary:
|
func to_dict() -> Dictionary:
|
||||||
return {
|
return {
|
||||||
"incidents": incidents.duplicate(true),
|
"incidents": incidents.duplicate(true),
|
||||||
|
|||||||
@@ -34,6 +34,14 @@ var guard_noticed := false
|
|||||||
|
|
||||||
## Whether this NPC has passed the handheld wand screening (The Joke Shop).
|
## Whether this NPC has passed the handheld wand screening (The Joke Shop).
|
||||||
var screened := false
|
var screened := false
|
||||||
|
## Whether the guard has declared they recognize this person (a player decision
|
||||||
|
## recorded as evidence, PLAN.md: Authorized Access).
|
||||||
|
var player_recognized := false
|
||||||
|
## Last reply the NPC gave when asked for their reason for entry.
|
||||||
|
var last_reason_reply := ""
|
||||||
|
## Event-level access payload (`has_id`, `has_ticket`, statuses). Empty means
|
||||||
|
## venue/type defaults from AccessLoadout.
|
||||||
|
var access_override: Dictionary = {}
|
||||||
|
|
||||||
func _init() -> void:
|
func _init() -> void:
|
||||||
fsm = FSM.new(self)
|
fsm = FSM.new(self)
|
||||||
@@ -147,6 +155,16 @@ func tick_return(delta: float) -> bool:
|
|||||||
func decide_leave() -> bool:
|
func decide_leave() -> bool:
|
||||||
return leave_requested
|
return leave_requested
|
||||||
|
|
||||||
|
## Level 3 ask: request the person's reason for entry (PLAN.md). Pure and
|
||||||
|
## headless-testable; returns the line this NPC answers with ("" if silent).
|
||||||
|
func request_reason() -> String:
|
||||||
|
var lines: Array[String] = profile.dialogue_lines if profile else []
|
||||||
|
if lines.is_empty():
|
||||||
|
last_reason_reply = ""
|
||||||
|
return ""
|
||||||
|
last_reason_reply = lines[rng.randi_range(0, lines.size() - 1)]
|
||||||
|
return last_reason_reply
|
||||||
|
|
||||||
## Perception pass: given the guard's distance (meters), return a perception
|
## Perception pass: given the guard's distance (meters), return a perception
|
||||||
## result describing how the NPC reacts to the guard's presence. Pure and
|
## result describing how the NPC reacts to the guard's presence. Pure and
|
||||||
## headless-testable; the presentation layer feeds it the real distance.
|
## headless-testable; the presentation layer feeds it the real distance.
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
class_name ShiftCoordinator
|
class_name ShiftCoordinator
|
||||||
extends Node
|
extends RefCounted
|
||||||
|
|
||||||
const Rules := preload("res://src/core/rules.gd")
|
const Rules := preload("res://src/core/rules.gd")
|
||||||
const EventBus := preload("res://src/core/event_bus.gd")
|
const EventBus := preload("res://src/core/event_bus.gd")
|
||||||
@@ -13,7 +13,7 @@ const EventScheduler := preload("res://src/core/event_scheduler.gd")
|
|||||||
## Drives one shift: advances time, schedules events, owns the shared systems
|
## Drives one shift: advances time, schedules events, owns the shared systems
|
||||||
## (recorder, reputation, radio, crowd), and produces the shift review.
|
## (recorder, reputation, radio, crowd), and produces the shift review.
|
||||||
|
|
||||||
signal npc_spawn_requested(profile: NpcProfile, intent: String, npc_id: String)
|
signal npc_spawn_requested(profile: NpcProfile, intent: String, npc_id: String, event: Dictionary)
|
||||||
signal shift_started(payload: Dictionary)
|
signal shift_started(payload: Dictionary)
|
||||||
signal shift_ended(review: Dictionary)
|
signal shift_ended(review: Dictionary)
|
||||||
signal phase_changed(phase: int)
|
signal phase_changed(phase: int)
|
||||||
@@ -34,6 +34,10 @@ var scheduler := EventScheduler.new()
|
|||||||
var spawned_count := 0
|
var spawned_count := 0
|
||||||
var spawn_seed := 0
|
var spawn_seed := 0
|
||||||
var _shift_finished := false
|
var _shift_finished := false
|
||||||
|
## The scheduler rolls once per simulated second. `tick()` runs at physics rate,
|
||||||
|
## so accumulate time and only pull due events on whole-second boundaries.
|
||||||
|
const SPAWN_INTERVAL_S := 1.0
|
||||||
|
var _spawn_accum_s := 0.0
|
||||||
|
|
||||||
func setup(p_scenario: VenueScenario, p_duration_s: float = 900.0, p_seed: int = 0) -> void:
|
func setup(p_scenario: VenueScenario, p_duration_s: float = 900.0, p_seed: int = 0) -> void:
|
||||||
scenario = p_scenario
|
scenario = p_scenario
|
||||||
@@ -56,6 +60,7 @@ func start() -> void:
|
|||||||
running = true
|
running = true
|
||||||
_shift_finished = false
|
_shift_finished = false
|
||||||
elapsed_s = 0.0
|
elapsed_s = 0.0
|
||||||
|
_spawn_accum_s = 0.0
|
||||||
current_phase = _phase_for_time(0.0)
|
current_phase = _phase_for_time(0.0)
|
||||||
event_bus.shift_state_changed.emit({"running": true, "elapsed_s": elapsed_s, "phase": current_phase})
|
event_bus.shift_state_changed.emit({"running": true, "elapsed_s": elapsed_s, "phase": current_phase})
|
||||||
shift_started.emit({"scenario_id": scenario.id, "duration_s": duration_s})
|
shift_started.emit({"scenario_id": scenario.id, "duration_s": duration_s})
|
||||||
@@ -77,7 +82,12 @@ func tick(delta: float) -> void:
|
|||||||
if elapsed_s >= duration_s:
|
if elapsed_s >= duration_s:
|
||||||
_finish_shift()
|
_finish_shift()
|
||||||
return
|
return
|
||||||
_spawn_due(delta)
|
_spawn_accum_s += delta
|
||||||
|
if _spawn_accum_s >= SPAWN_INTERVAL_S:
|
||||||
|
_spawn_accum_s -= SPAWN_INTERVAL_S
|
||||||
|
if _spawn_accum_s > SPAWN_INTERVAL_S:
|
||||||
|
_spawn_accum_s = 0.0
|
||||||
|
_spawn_due(SPAWN_INTERVAL_S)
|
||||||
|
|
||||||
func _phase_for_time(t: float) -> int:
|
func _phase_for_time(t: float) -> int:
|
||||||
if scenario == null or scenario.shift_phases.is_empty():
|
if scenario == null or scenario.shift_phases.is_empty():
|
||||||
@@ -102,13 +112,15 @@ func _spawn_due(delta: float) -> void:
|
|||||||
var profile := scenario.profile_for(event.get("npc_type", Rules.NpcType.TOURIST))
|
var profile := scenario.profile_for(event.get("npc_type", Rules.NpcType.TOURIST))
|
||||||
if profile == null:
|
if profile == null:
|
||||||
continue
|
continue
|
||||||
npc_spawn_requested.emit(profile, event.get("intent", "roam"), npc_id)
|
npc_spawn_requested.emit(profile, event.get("intent", "roam"), npc_id, event)
|
||||||
|
|
||||||
func _finish_shift() -> void:
|
func _finish_shift() -> void:
|
||||||
if _shift_finished:
|
if _shift_finished:
|
||||||
return
|
return
|
||||||
_shift_finished = true
|
_shift_finished = true
|
||||||
running = false
|
running = false
|
||||||
|
# Interactions the player never resolved still belong in this shift's review.
|
||||||
|
recorder.close_all_open("unresolved")
|
||||||
var review := build_review()
|
var review := build_review()
|
||||||
event_bus.shift_state_changed.emit({"running": false, "review": review})
|
event_bus.shift_state_changed.emit({"running": false, "review": review})
|
||||||
shift_ended.emit(review)
|
shift_ended.emit(review)
|
||||||
|
|||||||
@@ -6,8 +6,10 @@ extends Node
|
|||||||
const Rules := preload("res://src/core/rules.gd")
|
const Rules := preload("res://src/core/rules.gd")
|
||||||
const Strings := preload("res://src/core/strings.gd")
|
const Strings := preload("res://src/core/strings.gd")
|
||||||
const AccessArtifact := preload("res://src/core/access_artifact.gd")
|
const AccessArtifact := preload("res://src/core/access_artifact.gd")
|
||||||
|
const AccessLoadout := preload("res://src/core/access_loadout.gd")
|
||||||
const AccessVerifier := preload("res://src/core/access_verifier.gd")
|
const AccessVerifier := preload("res://src/core/access_verifier.gd")
|
||||||
const DoorState := preload("res://src/core/door_state.gd")
|
const DoorState := preload("res://src/core/door_state.gd")
|
||||||
|
const CrowdSystem := preload("res://src/core/crowd_system.gd")
|
||||||
const WandScreener := preload("res://src/core/wand_screener.gd")
|
const WandScreener := preload("res://src/core/wand_screener.gd")
|
||||||
const RadioSystem := preload("res://src/core/radio_system.gd")
|
const RadioSystem := preload("res://src/core/radio_system.gd")
|
||||||
const ScenarioFactory := preload("res://src/content/scenario_factory.gd")
|
const ScenarioFactory := preload("res://src/content/scenario_factory.gd")
|
||||||
@@ -19,12 +21,17 @@ const NpcAvatar := preload("res://src/game/npc_avatar.gd")
|
|||||||
const NpcProfile := preload("res://src/core/npc_profile.gd")
|
const NpcProfile := preload("res://src/core/npc_profile.gd")
|
||||||
const AudioFeedback := preload("res://src/game/audio_feedback.gd")
|
const AudioFeedback := preload("res://src/game/audio_feedback.gd")
|
||||||
const Hud := preload("res://src/game/ui/hud.gd")
|
const Hud := preload("res://src/game/ui/hud.gd")
|
||||||
|
const ActionRadial := preload("res://src/game/ui/action_radial.gd")
|
||||||
const RadioPanel := preload("res://src/game/ui/radio_panel.gd")
|
const RadioPanel := preload("res://src/game/ui/radio_panel.gd")
|
||||||
const ShiftReview := preload("res://src/game/ui/shift_review.gd")
|
const ShiftReview := preload("res://src/game/ui/shift_review.gd")
|
||||||
|
const StartMenu := preload("res://src/game/ui/start_menu.gd")
|
||||||
|
const PauseOverlay := preload("res://src/game/ui/pause_overlay.gd")
|
||||||
|
const SettingsPanel := preload("res://src/game/ui/settings_panel.gd")
|
||||||
|
|
||||||
var world_builder: WorldBuilder = null
|
var world_builder: WorldBuilder = null
|
||||||
var door := DoorState.new()
|
var door := DoorState.new()
|
||||||
var flashlight_on := false
|
var flashlight_on := false
|
||||||
|
var body_camera_on := false
|
||||||
var coordinator: ShiftCoordinator = null
|
var coordinator: ShiftCoordinator = null
|
||||||
var guard: GuardController = null
|
var guard: GuardController = null
|
||||||
var _sun: DirectionalLight3D = null
|
var _sun: DirectionalLight3D = null
|
||||||
@@ -57,14 +64,25 @@ const PHASE_LIGHTING := {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
var hud: Hud = null
|
var hud: Hud = null
|
||||||
|
var radial: ActionRadial = null
|
||||||
var radio_panel: RadioPanel = null
|
var radio_panel: RadioPanel = null
|
||||||
var shift_review_panel: ShiftReview = null
|
var shift_review_panel: ShiftReview = null
|
||||||
|
var start_menu: StartMenu = null
|
||||||
|
var pause_overlay: PauseOverlay = null
|
||||||
|
var settings_panel: SettingsPanel = null
|
||||||
|
var _shift_running := false
|
||||||
|
var player_settings: Dictionary = {}
|
||||||
|
var _focused_avatar: Node3D = null
|
||||||
var audio: AudioFeedback = null
|
var audio: AudioFeedback = null
|
||||||
var verifier := AccessVerifier.new()
|
var verifier := AccessVerifier.new()
|
||||||
var wand_screener := WandScreener.new()
|
var wand_screener := WandScreener.new()
|
||||||
|
|
||||||
var active_scenario_id := "hollywood_building"
|
var active_scenario_id := "hollywood_building"
|
||||||
var scenario_duration_s: float = 300.0 # shortened prototype duration for testing
|
## Shift length mirrors the scenario default (900s / 10-15 min per PLAN.md) unless
|
||||||
|
## overridden for a test or debug build.
|
||||||
|
var scenario_duration_s: float = 900.0
|
||||||
|
var _wand_cooldown := 0.0
|
||||||
|
const WAND_COOLDOWN_S := 0.8
|
||||||
var scene_root: Node3D = null
|
var scene_root: Node3D = null
|
||||||
var npcs: Array = []
|
var npcs: Array = []
|
||||||
var npc_counter := 0
|
var npc_counter := 0
|
||||||
@@ -84,10 +102,14 @@ var _door_rng := RandomNumberGenerator.new()
|
|||||||
|
|
||||||
## Aim-free targeting: cycle through nearby NPCs with Tab (accessibility).
|
## Aim-free targeting: cycle through nearby NPCs with Tab (accessibility).
|
||||||
const NEARBY_RADIUS := 12.0
|
const NEARBY_RADIUS := 12.0
|
||||||
|
## Upper bound on live avatars. Routine traffic is dropped at the cap; scripted
|
||||||
|
## events evict the oldest unfocused NPC so authored moments still spawn.
|
||||||
|
const MAX_LIVE_NPCS := 16
|
||||||
var _nearby_index := -1
|
var _nearby_index := -1
|
||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
_door_rng.randomize()
|
_door_rng.randomize()
|
||||||
|
player_settings = Save.load_settings() if Save else {}
|
||||||
scene_root = Node3D.new()
|
scene_root = Node3D.new()
|
||||||
scene_root.name = "SceneRoot"
|
scene_root.name = "SceneRoot"
|
||||||
add_child(scene_root)
|
add_child(scene_root)
|
||||||
@@ -98,21 +120,28 @@ func _ready() -> void:
|
|||||||
|
|
||||||
guard = _build_guard()
|
guard = _build_guard()
|
||||||
scene_root.add_child(guard)
|
scene_root.add_child(guard)
|
||||||
guard.global_position = Vector3(0, 1.6, -2.5)
|
# Stand on the landing in front of the door, facing the street where guests
|
||||||
|
# arrive. The building volume now starts behind the door (world_builder).
|
||||||
|
guard.global_position = Vector3(0, 0.1, -2.0)
|
||||||
|
guard.rotation.y = PI
|
||||||
guard.picked_target.connect(_on_guard_target)
|
guard.picked_target.connect(_on_guard_target)
|
||||||
guard.cleared_target.connect(_on_guard_clear)
|
guard.cleared_target.connect(_on_guard_clear)
|
||||||
|
_apply_settings(player_settings)
|
||||||
|
|
||||||
selected_scenario = _build_scenario(active_scenario_id)
|
selected_scenario = _build_scenario(active_scenario_id)
|
||||||
|
scenario_duration_s = selected_scenario.shift_duration_s
|
||||||
coordinator = ShiftCoordinator.new()
|
coordinator = ShiftCoordinator.new()
|
||||||
coordinator.setup(selected_scenario, scenario_duration_s, 4242)
|
coordinator.setup(selected_scenario, scenario_duration_s, 4242)
|
||||||
coordinator.npc_spawn_requested.connect(_spawn_npc)
|
coordinator.npc_spawn_requested.connect(_spawn_npc)
|
||||||
coordinator.shift_ended.connect(_on_shift_ended)
|
coordinator.shift_ended.connect(_on_shift_ended)
|
||||||
coordinator.radio.responder_arrived.connect(_on_responder_arrived)
|
coordinator.radio.responder_arrived.connect(_on_responder_arrived)
|
||||||
|
_connect_crowd()
|
||||||
|
|
||||||
_build_ui()
|
_build_ui()
|
||||||
coordinator.start()
|
|
||||||
_last_phase = -1
|
_last_phase = -1
|
||||||
_apply_phase_lighting()
|
_apply_phase_lighting()
|
||||||
|
# Boot into the venue menu; the shift starts when the player picks a venue.
|
||||||
|
_show_start_menu()
|
||||||
|
|
||||||
var selected_scenario: VenueScenario = null
|
var selected_scenario: VenueScenario = null
|
||||||
|
|
||||||
@@ -121,6 +150,9 @@ func _build_guard() -> GuardController:
|
|||||||
g.name = "Guard"
|
g.name = "Guard"
|
||||||
var head := Node3D.new()
|
var head := Node3D.new()
|
||||||
head.name = "Head"
|
head.name = "Head"
|
||||||
|
# Eye height. The guard root sits on the floor, so this keeps the camera at
|
||||||
|
# ~1.7 m while gravity/floor snapping handles the steps (ADR-0007).
|
||||||
|
head.position = Vector3(0, 1.6, 0)
|
||||||
g.add_child(head)
|
g.add_child(head)
|
||||||
var camera := Camera3D.new()
|
var camera := Camera3D.new()
|
||||||
camera.name = "Camera3D"
|
camera.name = "Camera3D"
|
||||||
@@ -130,10 +162,13 @@ func _build_guard() -> GuardController:
|
|||||||
flashlight.name = "Flashlight"
|
flashlight.name = "Flashlight"
|
||||||
flashlight.visible = false
|
flashlight.visible = false
|
||||||
flashlight.position = Vector3(0, -0.15, -0.4)
|
flashlight.position = Vector3(0, -0.15, -0.4)
|
||||||
flashlight.rotation_degrees = Vector3(-10, 0, 0)
|
# Aim straight ahead: tilting it down made the cone hit the ground right in
|
||||||
flashlight.spot_range = 18.0
|
# front of the guard instead of the person or door being checked.
|
||||||
flashlight.spot_angle = 28.0
|
flashlight.rotation_degrees = Vector3.ZERO
|
||||||
flashlight.light_energy = 2.5
|
flashlight.spot_range = 22.0
|
||||||
|
flashlight.spot_angle = 30.0
|
||||||
|
flashlight.light_energy = 4.0
|
||||||
|
flashlight.spot_attenuation = 0.6
|
||||||
head.add_child(flashlight)
|
head.add_child(flashlight)
|
||||||
var collider := CollisionShape3D.new()
|
var collider := CollisionShape3D.new()
|
||||||
var shape := CapsuleShape3D.new()
|
var shape := CapsuleShape3D.new()
|
||||||
@@ -161,37 +196,185 @@ func switch_scenario(id: String) -> void:
|
|||||||
restart_shift()
|
restart_shift()
|
||||||
|
|
||||||
func restart_shift() -> void:
|
func restart_shift() -> void:
|
||||||
shift_review_panel.hide()
|
if shift_review_panel:
|
||||||
|
shift_review_panel.hide()
|
||||||
|
_reset_shift_state()
|
||||||
|
_start_shift()
|
||||||
|
|
||||||
|
## Clear all per-shift runtime state (NPCs, incidents, timers).
|
||||||
|
func _reset_shift_state() -> void:
|
||||||
for n in npcs:
|
for n in npcs:
|
||||||
n.queue_free()
|
if is_instance_valid(n):
|
||||||
|
n.queue_free()
|
||||||
npcs.clear()
|
npcs.clear()
|
||||||
npc_counter = 0
|
npc_counter = 0
|
||||||
inspector_current_events = []
|
inspector_current_events = []
|
||||||
current_incident_active = false
|
current_incident_active = false
|
||||||
current_incident_npc_id = ""
|
current_incident_npc_id = ""
|
||||||
|
targeted_npc = null
|
||||||
|
_focused_avatar = null
|
||||||
|
_nearby_index = -1
|
||||||
|
inspection_open = false
|
||||||
|
wand_open = false
|
||||||
|
_wand_cooldown = 0.0
|
||||||
|
body_camera_on = false
|
||||||
|
if hud:
|
||||||
|
hud.set_body_camera(false)
|
||||||
|
scenario_duration_s = selected_scenario.shift_duration_s
|
||||||
coordinator.setup(selected_scenario, scenario_duration_s, 4242)
|
coordinator.setup(selected_scenario, scenario_duration_s, 4242)
|
||||||
coordinator.start()
|
_connect_crowd()
|
||||||
_last_phase = -1
|
_last_phase = -1
|
||||||
_apply_phase_lighting()
|
_apply_phase_lighting()
|
||||||
|
|
||||||
|
## Begin (or resume) the shift clock and recapture the mouse.
|
||||||
|
func _start_shift() -> void:
|
||||||
|
_shift_running = true
|
||||||
|
coordinator.start()
|
||||||
|
if hud:
|
||||||
|
hud.set_shift_state(coordinator, selected_scenario)
|
||||||
|
_refresh_freeze()
|
||||||
|
|
||||||
|
func _show_start_menu() -> void:
|
||||||
|
_shift_running = false
|
||||||
|
if pause_overlay:
|
||||||
|
pause_overlay.close()
|
||||||
|
if shift_review_panel:
|
||||||
|
shift_review_panel.hide()
|
||||||
|
if guard:
|
||||||
|
guard.input_locked = true
|
||||||
|
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||||
|
if start_menu:
|
||||||
|
start_menu.open()
|
||||||
|
|
||||||
|
func _on_venue_selected(scenario_id: String) -> void:
|
||||||
|
if start_menu and start_menu.visible:
|
||||||
|
start_menu.close()
|
||||||
|
active_scenario_id = scenario_id
|
||||||
|
_venue_index = maxi(0, VENUE_ORDER.find(scenario_id))
|
||||||
|
selected_scenario = _build_scenario(scenario_id)
|
||||||
|
if hud:
|
||||||
|
hud.set_wand_icon(false)
|
||||||
|
_reset_shift_state()
|
||||||
|
_start_shift()
|
||||||
|
|
||||||
|
## Apply loaded settings to the guard and HUD.
|
||||||
|
func _apply_settings(settings: Dictionary) -> void:
|
||||||
|
player_settings = settings
|
||||||
|
if guard:
|
||||||
|
guard.look_sensitivity = float(settings.get("look_sensitivity", 0.0022))
|
||||||
|
if hud and hud.has_method("set_font_scale"):
|
||||||
|
hud.set_font_scale(float(settings.get("hud_font_scale", 1.0)))
|
||||||
|
|
||||||
|
func _on_settings_applied(settings: Dictionary) -> void:
|
||||||
|
_apply_settings(settings)
|
||||||
|
if start_menu and start_menu.visible:
|
||||||
|
start_menu.open()
|
||||||
|
elif _shift_running:
|
||||||
|
_open_pause()
|
||||||
|
|
||||||
|
func _open_settings() -> void:
|
||||||
|
if start_menu:
|
||||||
|
start_menu.close()
|
||||||
|
if pause_overlay:
|
||||||
|
pause_overlay.close()
|
||||||
|
if settings_panel:
|
||||||
|
settings_panel.open(player_settings)
|
||||||
|
|
||||||
|
func _open_pause() -> void:
|
||||||
|
if pause_overlay == null or not _shift_running:
|
||||||
|
return
|
||||||
|
if _close_top_modal():
|
||||||
|
pass
|
||||||
|
pause_overlay.open()
|
||||||
|
if guard:
|
||||||
|
guard.input_locked = true
|
||||||
|
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||||
|
|
||||||
|
func _close_pause() -> void:
|
||||||
|
if pause_overlay:
|
||||||
|
pause_overlay.close()
|
||||||
|
_refresh_freeze()
|
||||||
|
|
||||||
|
func _quit_to_menu() -> void:
|
||||||
|
if pause_overlay:
|
||||||
|
pause_overlay.close()
|
||||||
|
_show_start_menu()
|
||||||
|
|
||||||
var inspector_current_events: Array = []
|
var inspector_current_events: Array = []
|
||||||
|
|
||||||
func _build_ui() -> void:
|
func _build_ui() -> void:
|
||||||
hud = Hud.new()
|
hud = Hud.new()
|
||||||
add_child(hud)
|
add_child(hud)
|
||||||
|
_add_crosshair()
|
||||||
audio = AudioFeedback.new()
|
audio = AudioFeedback.new()
|
||||||
add_child(audio)
|
add_child(audio)
|
||||||
|
radial = ActionRadial.new()
|
||||||
|
add_child(radial)
|
||||||
|
radial.confirmed.connect(_on_radial_confirmed)
|
||||||
|
radial.cancelled.connect(_cancel_radial)
|
||||||
radio_panel = RadioPanel.new()
|
radio_panel = RadioPanel.new()
|
||||||
add_child(radio_panel)
|
add_child(radio_panel)
|
||||||
radio_panel.hide()
|
radio_panel.hide()
|
||||||
radio_panel.submitted.connect(_on_radio_submitted)
|
radio_panel.submitted.connect(_on_radio_submitted)
|
||||||
radio_panel.cancelled.connect(func():
|
radio_panel.cancelled.connect(func():
|
||||||
radio_panel.hide()
|
radio_panel.hide()
|
||||||
hud.set_action_hint(""))
|
hud.set_action_hint("")
|
||||||
|
_refresh_freeze())
|
||||||
shift_review_panel = ShiftReview.new()
|
shift_review_panel = ShiftReview.new()
|
||||||
add_child(shift_review_panel)
|
add_child(shift_review_panel)
|
||||||
shift_review_panel.hide()
|
shift_review_panel.hide()
|
||||||
shift_review_panel.restart_requested.connect(restart_shift)
|
shift_review_panel.restart_requested.connect(_on_review_restart)
|
||||||
|
shift_review_panel.visible = false
|
||||||
|
|
||||||
|
pause_overlay = PauseOverlay.new()
|
||||||
|
add_child(pause_overlay)
|
||||||
|
pause_overlay.hide()
|
||||||
|
pause_overlay.resume_requested.connect(_close_pause)
|
||||||
|
pause_overlay.restart_requested.connect(restart_shift)
|
||||||
|
pause_overlay.settings_requested.connect(_open_settings)
|
||||||
|
pause_overlay.quit_to_menu_requested.connect(_quit_to_menu)
|
||||||
|
|
||||||
|
settings_panel = SettingsPanel.new()
|
||||||
|
add_child(settings_panel)
|
||||||
|
settings_panel.hide()
|
||||||
|
settings_panel.applied.connect(_on_settings_applied)
|
||||||
|
|
||||||
|
start_menu = StartMenu.new()
|
||||||
|
add_child(start_menu)
|
||||||
|
start_menu.hide()
|
||||||
|
start_menu.venue_selected.connect(_on_venue_selected)
|
||||||
|
start_menu.settings_requested.connect(_open_settings)
|
||||||
|
start_menu.quit_requested.connect(func(): get_tree().quit())
|
||||||
|
|
||||||
|
## "Run another shift" on the review screen returns to the venue menu.
|
||||||
|
func _on_review_restart() -> void:
|
||||||
|
_show_start_menu()
|
||||||
|
|
||||||
|
func _add_crosshair() -> void:
|
||||||
|
var layer := CanvasLayer.new()
|
||||||
|
layer.layer = 9
|
||||||
|
layer.name = "Crosshair"
|
||||||
|
var center := CenterContainer.new()
|
||||||
|
center.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
center.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
layer.add_child(center)
|
||||||
|
var box := Control.new()
|
||||||
|
box.custom_minimum_size = Vector2(16, 16)
|
||||||
|
box.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
center.add_child(box)
|
||||||
|
var h := ColorRect.new()
|
||||||
|
h.color = Color(1, 1, 1, 0.75)
|
||||||
|
h.size = Vector2(12, 2)
|
||||||
|
h.position = Vector2(2, 7)
|
||||||
|
h.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
box.add_child(h)
|
||||||
|
var v := ColorRect.new()
|
||||||
|
v.color = Color(1, 1, 1, 0.75)
|
||||||
|
v.size = Vector2(2, 12)
|
||||||
|
v.position = Vector2(7, 2)
|
||||||
|
v.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
box.add_child(v)
|
||||||
|
add_child(layer)
|
||||||
|
|
||||||
func _ensure_lighting() -> void:
|
func _ensure_lighting() -> void:
|
||||||
_sun = DirectionalLight3D.new()
|
_sun = DirectionalLight3D.new()
|
||||||
@@ -233,7 +416,12 @@ func _apply_phase_lighting() -> void:
|
|||||||
if world_builder:
|
if world_builder:
|
||||||
world_builder.set_night_mode(cfg.get("night", false))
|
world_builder.set_night_mode(cfg.get("night", false))
|
||||||
|
|
||||||
func _spawn_npc(profile: NpcProfile, intent: String, _npc_id: String) -> void:
|
func _spawn_npc(profile: NpcProfile, intent: String, npc_id: String, event: Dictionary = {}) -> void:
|
||||||
|
_purge_npcs()
|
||||||
|
if npcs.size() >= MAX_LIVE_NPCS and event.get("kind", "routine") == "routine":
|
||||||
|
return
|
||||||
|
if npcs.size() >= MAX_LIVE_NPCS:
|
||||||
|
_evict_oldest_npc()
|
||||||
npc_counter += 1
|
npc_counter += 1
|
||||||
var avatar := NpcAvatar.new()
|
var avatar := NpcAvatar.new()
|
||||||
avatar.name = "Npc_%d" % npc_counter
|
avatar.name = "Npc_%d" % npc_counter
|
||||||
@@ -244,10 +432,38 @@ func _spawn_npc(profile: NpcProfile, intent: String, _npc_id: String) -> void:
|
|||||||
# of every NPC walking to the entrance (TODO: Core Simulation — NPC Perception).
|
# of every NPC walking to the entrance (TODO: Core Simulation — NPC Perception).
|
||||||
var target_pos: Vector3 = selected_scenario.waypoint_for_intent(intent)
|
var target_pos: Vector3 = selected_scenario.waypoint_for_intent(intent)
|
||||||
var door_pos: Vector3 = selected_scenario._location_or_default("entrance", Vector3(0, 0.5, 1.2))
|
var door_pos: Vector3 = selected_scenario._location_or_default("entrance", Vector3(0, 0.5, 1.2))
|
||||||
avatar.setup(profile, intent, npc_counter * 991 + 17, spawn_pos, target_pos, door_pos)
|
var spawn_profile: NpcProfile = profile.duplicate(true) if profile else profile
|
||||||
|
var override: Dictionary = event.get("override_access", {})
|
||||||
|
var seed_value := npc_counter * 991 + 17
|
||||||
|
if spawn_profile and selected_scenario.access_policy.wand_screening_required:
|
||||||
|
var items: Array[String] = []
|
||||||
|
for item in AccessLoadout.roll_carried_items(seed_value, override):
|
||||||
|
items.append(str(item))
|
||||||
|
spawn_profile.carried_items = items
|
||||||
|
avatar.setup(spawn_profile, intent, seed_value, spawn_pos, target_pos, door_pos, npc_id, override)
|
||||||
|
# Authored events stay for the whole shift; routine traffic cycles out.
|
||||||
|
avatar.ephemeral = event.get("kind", "routine") == "routine"
|
||||||
|
avatar.lifetime_s = 45.0 + float((npc_counter * 17) % 60)
|
||||||
scene_root.add_child(avatar)
|
scene_root.add_child(avatar)
|
||||||
npcs.append(avatar)
|
npcs.append(avatar)
|
||||||
|
|
||||||
|
## Drop references to freed avatars so the cap and Tab cycling stay accurate.
|
||||||
|
func _purge_npcs() -> void:
|
||||||
|
for i in range(npcs.size() - 1, -1, -1):
|
||||||
|
if not is_instance_valid(npcs[i]):
|
||||||
|
npcs.remove_at(i)
|
||||||
|
|
||||||
|
## Make room for a scripted event by removing the oldest NPC the player is not
|
||||||
|
## currently focused on.
|
||||||
|
func _evict_oldest_npc() -> void:
|
||||||
|
for i in npcs.size():
|
||||||
|
var npc: Node = npcs[i]
|
||||||
|
if npc == targeted_npc or npc == _focused_avatar:
|
||||||
|
continue
|
||||||
|
npcs.remove_at(i)
|
||||||
|
npc.queue_free()
|
||||||
|
return
|
||||||
|
|
||||||
## Spawn a dispatched responder avatar when a radio call's arrival delay elapses
|
## Spawn a dispatched responder avatar when a radio call's arrival delay elapses
|
||||||
## (TODO: Escalation and Radio — Responder Dispatch). The responder walks to the
|
## (TODO: Escalation and Radio — Responder Dispatch). The responder walks to the
|
||||||
## entrance and resolves the incident with command/restraint/evacuation/arrest.
|
## entrance and resolves the incident with command/restraint/evacuation/arrest.
|
||||||
@@ -271,6 +487,51 @@ func _on_responder_arrived(call: Dictionary) -> void:
|
|||||||
})
|
})
|
||||||
coordinator.crowd.apply_event("emergency_responder" if call.get("type", "") == "emergency" else "calm_professionalism")
|
coordinator.crowd.apply_event("emergency_responder" if call.get("type", "") == "emergency" else "calm_professionalism")
|
||||||
|
|
||||||
|
## Crowd presentation (PLAN: Public Crowd Reaction). The crowd system is a
|
||||||
|
## mood/attention float; this turns its events into avatar behavior.
|
||||||
|
func _connect_crowd() -> void:
|
||||||
|
# CrowdSystem routes its updates through the EventBus (`event_bus.crowd_changed`);
|
||||||
|
# its own `changed` signal is not emitted by apply_event().
|
||||||
|
if coordinator == null or coordinator.event_bus == null:
|
||||||
|
return
|
||||||
|
if not coordinator.event_bus.crowd_changed.is_connected(_on_crowd_changed):
|
||||||
|
coordinator.event_bus.crowd_changed.connect(_on_crowd_changed)
|
||||||
|
|
||||||
|
func _on_crowd_changed(payload: Dictionary) -> void:
|
||||||
|
var event_type := str(payload.get("event", ""))
|
||||||
|
var panic := bool(payload.get("panic", false))
|
||||||
|
# Panic wins: people clear away from the entrance.
|
||||||
|
if panic or event_type == "crowd_panic":
|
||||||
|
_flee_crowd()
|
||||||
|
return
|
||||||
|
if CrowdSystem.reaction_for_event(event_type) == "watch":
|
||||||
|
_rubberneck_crowd()
|
||||||
|
|
||||||
|
func _incident_point() -> Vector3:
|
||||||
|
if targeted_npc is Node3D and is_instance_valid(targeted_npc):
|
||||||
|
return (targeted_npc as Node3D).global_position
|
||||||
|
if guard:
|
||||||
|
return guard.global_position
|
||||||
|
return Vector3(0, 0, 1.2)
|
||||||
|
|
||||||
|
## Idle bystanders stop and face the incident instead of walking on.
|
||||||
|
func _rubberneck_crowd() -> void:
|
||||||
|
var point := _incident_point()
|
||||||
|
for npc in npcs:
|
||||||
|
if not is_instance_valid(npc) or not npc.has_method("start_rubberneck"):
|
||||||
|
continue
|
||||||
|
if npc == targeted_npc:
|
||||||
|
continue
|
||||||
|
npc.start_rubberneck(point)
|
||||||
|
|
||||||
|
## Panic: everyone nearby moves away from the door.
|
||||||
|
func _flee_crowd() -> void:
|
||||||
|
var door_pos: Vector3 = selected_scenario._location_or_default("entrance", Vector3(0, 0.5, 1.2))
|
||||||
|
for npc in npcs:
|
||||||
|
if not is_instance_valid(npc) or not npc.has_method("start_flee"):
|
||||||
|
continue
|
||||||
|
npc.start_flee(door_pos)
|
||||||
|
|
||||||
func _responder_profile() -> NpcProfile:
|
func _responder_profile() -> NpcProfile:
|
||||||
var p := NpcProfile.new()
|
var p := NpcProfile.new()
|
||||||
p.id = "responder"
|
p.id = "responder"
|
||||||
@@ -281,20 +542,32 @@ func _responder_profile() -> NpcProfile:
|
|||||||
return p
|
return p
|
||||||
|
|
||||||
func _on_shift_ended(review: Dictionary) -> void:
|
func _on_shift_ended(review: Dictionary) -> void:
|
||||||
|
_shift_running = false
|
||||||
# Persist the finished shift locally (Save autoload, user:// JSON).
|
# Persist the finished shift locally (Save autoload, user:// JSON).
|
||||||
if Save:
|
if Save:
|
||||||
Save.save_shift_result(review)
|
Save.save_shift_result(review)
|
||||||
shift_review_panel.show_review(review, selected_scenario, Save.load_shift_results() if Save else [])
|
shift_review_panel.show_review(review, selected_scenario, Save.load_shift_results() if Save else [])
|
||||||
|
_refresh_freeze()
|
||||||
|
|
||||||
func _on_guard_target(target: Node3D) -> void:
|
func _on_guard_target(target: Node3D) -> void:
|
||||||
targeted_npc = target
|
targeted_npc = target
|
||||||
|
_set_focused_avatar(target)
|
||||||
_begin_incident(target)
|
_begin_incident(target)
|
||||||
|
|
||||||
func _on_guard_clear() -> void:
|
func _on_guard_clear() -> void:
|
||||||
targeted_npc = null
|
targeted_npc = null
|
||||||
|
_set_focused_avatar(null)
|
||||||
hud.set_target_label("")
|
hud.set_target_label("")
|
||||||
hud.set_action_hint("")
|
hud.set_action_hint("")
|
||||||
|
|
||||||
|
func _set_focused_avatar(avatar: Node3D) -> void:
|
||||||
|
if _focused_avatar and is_instance_valid(_focused_avatar) and _focused_avatar.has_method("set_focus_visual"):
|
||||||
|
_focused_avatar.set_focus_visual(false, false)
|
||||||
|
_focused_avatar = avatar
|
||||||
|
var menu_open := radial != null and radial.is_open
|
||||||
|
if avatar and avatar.has_method("set_focus_visual"):
|
||||||
|
avatar.set_focus_visual(true, menu_open)
|
||||||
|
|
||||||
func _begin_incident(avatar: Node3D) -> void:
|
func _begin_incident(avatar: Node3D) -> void:
|
||||||
var controller: Object = avatar.get_npc_controller() if avatar.has_method("get_npc_controller") else null
|
var controller: Object = avatar.get_npc_controller() if avatar.has_method("get_npc_controller") else null
|
||||||
if controller == null:
|
if controller == null:
|
||||||
@@ -302,9 +575,13 @@ func _begin_incident(avatar: Node3D) -> void:
|
|||||||
current_incident_npc_id = controller.npc_id
|
current_incident_npc_id = controller.npc_id
|
||||||
current_incident_active = true
|
current_incident_active = true
|
||||||
current_npc_truth = _read_npc_truth(controller)
|
current_npc_truth = _read_npc_truth(controller)
|
||||||
|
# Open a structured incident so player actions, access evidence, and
|
||||||
|
# escalation levels are actually recorded (ADR-0005). Without this the
|
||||||
|
# recorder drops every event and the review reports zero incidents.
|
||||||
|
if not coordinator.recorder.has_open_incident(controller.npc_id):
|
||||||
|
coordinator.recorder.start_incident(controller.npc_id, "player_focus")
|
||||||
var profile: Object = controller.profile
|
var profile: Object = controller.profile
|
||||||
var label := "[%s] %s — %s" % [
|
var label := "%s — %s" % [
|
||||||
Rules.NPC_TYPE_NAMES.get((profile.npc_type if profile else -1), "?"),
|
|
||||||
profile.display_name if profile else "?",
|
profile.display_name if profile else "?",
|
||||||
controller.intent,
|
controller.intent,
|
||||||
]
|
]
|
||||||
@@ -321,20 +598,62 @@ func _begin_incident(avatar: Node3D) -> void:
|
|||||||
# ------------------------------------------------------------------ input ---
|
# ------------------------------------------------------------------ input ---
|
||||||
|
|
||||||
func _unhandled_input(event: InputEvent) -> void:
|
func _unhandled_input(event: InputEvent) -> void:
|
||||||
if event is InputEventKey and event.pressed and not event.echo:
|
if event is InputEventKey and event.echo:
|
||||||
_handle_key(event.keycode)
|
return
|
||||||
|
if event.is_action_pressed("cancel"):
|
||||||
|
_handle_cancel(event is InputEventMouseButton)
|
||||||
|
return
|
||||||
|
if event is InputEventMouseButton and event.pressed:
|
||||||
|
_handle_mouse_button(event)
|
||||||
|
return
|
||||||
|
if event is InputEventKey and event.pressed:
|
||||||
|
_handle_key(event)
|
||||||
|
|
||||||
func _handle_key(keycode: Key) -> void:
|
func _handle_mouse_button(event: InputEventMouseButton) -> void:
|
||||||
|
if event.button_index != MOUSE_BUTTON_LEFT:
|
||||||
|
return
|
||||||
|
if radial and radial.is_open:
|
||||||
|
return
|
||||||
|
if not _modal_blocks_radial() and targeted_npc != null:
|
||||||
|
_open_radial()
|
||||||
|
|
||||||
|
func _modal_blocks_radial() -> bool:
|
||||||
|
if inspection_open or wand_open:
|
||||||
|
return true
|
||||||
|
if radio_panel and radio_panel.visible:
|
||||||
|
return true
|
||||||
|
if shift_review_panel and shift_review_panel.visible:
|
||||||
|
return true
|
||||||
|
return false
|
||||||
|
|
||||||
|
func _handle_key(event: InputEvent) -> void:
|
||||||
|
var keycode: Key = event.keycode
|
||||||
|
if radial and radial.is_open:
|
||||||
|
if event.is_action_pressed("confirm"):
|
||||||
|
_confirm_radial()
|
||||||
|
return
|
||||||
|
match keycode:
|
||||||
|
KEY_A, KEY_LEFT:
|
||||||
|
radial.step(-1)
|
||||||
|
KEY_D, KEY_RIGHT:
|
||||||
|
radial.step(1)
|
||||||
|
return
|
||||||
|
if event.is_action_pressed("action_menu"):
|
||||||
|
if targeted_npc != null and not _modal_blocks_radial():
|
||||||
|
_open_radial()
|
||||||
|
return
|
||||||
|
if event.is_action_pressed("inspect"):
|
||||||
|
if targeted_npc != null and not inspection_open and not wand_open:
|
||||||
|
_toggle_inspection()
|
||||||
|
return
|
||||||
|
if event.is_action_pressed("wand"):
|
||||||
|
if targeted_npc != null and not inspection_open and not wand_open:
|
||||||
|
_toggle_wand_screening()
|
||||||
|
return
|
||||||
match keycode:
|
match keycode:
|
||||||
KEY_E:
|
|
||||||
if targeted_npc != null and not inspection_open:
|
|
||||||
_toggle_inspection()
|
|
||||||
KEY_Q:
|
KEY_Q:
|
||||||
if targeted_npc != null and not inspection_open:
|
if targeted_npc != null and not inspection_open:
|
||||||
_apply_interaction(Rules.Level.SIMPLE_DETERRENCE, "polite direction")
|
_apply_interaction(Rules.Level.SIMPLE_DETERRENCE, "polite direction")
|
||||||
KEY_W:
|
|
||||||
if targeted_npc != null and not inspection_open:
|
|
||||||
_toggle_wand_screening()
|
|
||||||
KEY_TAB:
|
KEY_TAB:
|
||||||
_cycle_nearby_target()
|
_cycle_nearby_target()
|
||||||
KEY_F:
|
KEY_F:
|
||||||
@@ -343,6 +662,8 @@ func _handle_key(keycode: Key) -> void:
|
|||||||
_toggle_flashlight()
|
_toggle_flashlight()
|
||||||
KEY_L:
|
KEY_L:
|
||||||
_toggle_door_lock()
|
_toggle_door_lock()
|
||||||
|
KEY_B:
|
||||||
|
_toggle_body_camera()
|
||||||
KEY_V:
|
KEY_V:
|
||||||
_cycle_venue()
|
_cycle_venue()
|
||||||
_:
|
_:
|
||||||
@@ -377,6 +698,134 @@ func _handle_action_key(keycode: Key) -> void:
|
|||||||
_:
|
_:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
## `cancel` (Esc, RMB) closes the top modal. With nothing open, Esc pauses the
|
||||||
|
## shift (or resumes it when paused); RMB does nothing so it never grabs the
|
||||||
|
## mouse by accident.
|
||||||
|
func _handle_cancel(from_mouse: bool) -> void:
|
||||||
|
if _close_top_modal():
|
||||||
|
return
|
||||||
|
if from_mouse:
|
||||||
|
return
|
||||||
|
if settings_panel and settings_panel.visible:
|
||||||
|
return
|
||||||
|
if pause_overlay and pause_overlay.visible:
|
||||||
|
_close_pause()
|
||||||
|
return
|
||||||
|
if _shift_running and not (start_menu and start_menu.visible):
|
||||||
|
_open_pause()
|
||||||
|
return
|
||||||
|
if Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED:
|
||||||
|
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||||
|
else:
|
||||||
|
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||||
|
|
||||||
|
func _close_top_modal() -> bool:
|
||||||
|
if radial and radial.is_open:
|
||||||
|
_cancel_radial()
|
||||||
|
return true
|
||||||
|
if inspection_open:
|
||||||
|
hud.hide_inspection()
|
||||||
|
inspection_open = false
|
||||||
|
_refresh_freeze()
|
||||||
|
return true
|
||||||
|
if wand_open:
|
||||||
|
hud.hide_wand()
|
||||||
|
wand_open = false
|
||||||
|
_refresh_freeze()
|
||||||
|
return true
|
||||||
|
if radio_panel and radio_panel.visible:
|
||||||
|
radio_panel.hide()
|
||||||
|
hud.set_action_hint("")
|
||||||
|
_refresh_freeze()
|
||||||
|
return true
|
||||||
|
return false
|
||||||
|
|
||||||
|
func _open_radial() -> void:
|
||||||
|
if targeted_npc == null:
|
||||||
|
hud.log(Strings.lookup("hud.aim_first"))
|
||||||
|
return
|
||||||
|
var controller: Object = _targeted_controller()
|
||||||
|
var p_name := "Person"
|
||||||
|
if controller and controller.profile:
|
||||||
|
p_name = str(controller.profile.display_name)
|
||||||
|
var wand_ok := selected_scenario != null and selected_scenario.equipment.has("wand")
|
||||||
|
radial.open_menu(p_name, wand_ok)
|
||||||
|
if targeted_npc and targeted_npc.has_method("set_focus_visual"):
|
||||||
|
targeted_npc.set_focus_visual(true, true)
|
||||||
|
_refresh_freeze()
|
||||||
|
|
||||||
|
func _confirm_radial() -> void:
|
||||||
|
if radial == null or not radial.is_open:
|
||||||
|
return
|
||||||
|
var slice := radial.confirm_selected()
|
||||||
|
radial.close_menu()
|
||||||
|
if targeted_npc and targeted_npc.has_method("set_focus_visual"):
|
||||||
|
targeted_npc.set_focus_visual(true, false)
|
||||||
|
_refresh_freeze()
|
||||||
|
if slice != "":
|
||||||
|
_on_radial_confirmed(slice)
|
||||||
|
|
||||||
|
func _cancel_radial() -> void:
|
||||||
|
if radial == null or not radial.is_open:
|
||||||
|
return
|
||||||
|
radial.close_menu()
|
||||||
|
if targeted_npc and targeted_npc.has_method("set_focus_visual"):
|
||||||
|
targeted_npc.set_focus_visual(true, false)
|
||||||
|
_refresh_freeze()
|
||||||
|
|
||||||
|
func _on_radial_confirmed(slice_id: String) -> void:
|
||||||
|
if radial and radial.is_open:
|
||||||
|
radial.close_menu()
|
||||||
|
if targeted_npc and targeted_npc.has_method("set_focus_visual"):
|
||||||
|
targeted_npc.set_focus_visual(true, false)
|
||||||
|
_refresh_freeze()
|
||||||
|
match slice_id:
|
||||||
|
"raise_hand":
|
||||||
|
_apply_interaction(Rules.Level.SIMPLE_DETERRENCE, "raise hand")
|
||||||
|
"eye_contact":
|
||||||
|
_eye_contact()
|
||||||
|
"point":
|
||||||
|
_apply_interaction(Rules.Level.SIMPLE_DETERRENCE, "point")
|
||||||
|
"head_shake":
|
||||||
|
_apply_interaction(Rules.Level.SIMPLE_DETERRENCE, "head shake")
|
||||||
|
"polite":
|
||||||
|
_apply_interaction(Rules.Level.SIMPLE_DETERRENCE, "polite direction")
|
||||||
|
"inspect":
|
||||||
|
_toggle_inspection()
|
||||||
|
"wand":
|
||||||
|
_toggle_wand_screening()
|
||||||
|
"warning":
|
||||||
|
_apply_interaction(Rules.Level.FORMAL_WARNING, "formal warning")
|
||||||
|
"block":
|
||||||
|
_apply_interaction(Rules.Level.BLOCKING, "blocking")
|
||||||
|
"reason":
|
||||||
|
_request_reason()
|
||||||
|
"recognize":
|
||||||
|
_recognize_target()
|
||||||
|
"radio":
|
||||||
|
_open_radio(false)
|
||||||
|
|
||||||
|
func _refresh_freeze() -> void:
|
||||||
|
var freeze := inspection_open or wand_open
|
||||||
|
if radial and radial.is_open:
|
||||||
|
freeze = true
|
||||||
|
if radio_panel and radio_panel.visible:
|
||||||
|
freeze = true
|
||||||
|
if shift_review_panel and shift_review_panel.visible:
|
||||||
|
freeze = true
|
||||||
|
if pause_overlay and pause_overlay.visible:
|
||||||
|
freeze = true
|
||||||
|
if settings_panel and settings_panel.visible:
|
||||||
|
freeze = true
|
||||||
|
if not _shift_running:
|
||||||
|
freeze = true
|
||||||
|
if guard:
|
||||||
|
guard.input_locked = freeze
|
||||||
|
if freeze:
|
||||||
|
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||||
|
else:
|
||||||
|
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||||
|
|
||||||
## Toggle the guard's flashlight. In evening/late phases it widens NPC
|
## Toggle the guard's flashlight. In evening/late phases it widens NPC
|
||||||
## perception radius (PLAN.md: Level 3 — flashlight at night).
|
## perception radius (PLAN.md: Level 3 — flashlight at night).
|
||||||
func _toggle_flashlight() -> void:
|
func _toggle_flashlight() -> void:
|
||||||
@@ -387,6 +836,29 @@ func _toggle_flashlight() -> void:
|
|||||||
hud.set_flashlight(flashlight_on)
|
hud.set_flashlight(flashlight_on)
|
||||||
hud.log(Strings.lookup("flashlight.on") if flashlight_on else Strings.lookup("flashlight.off"))
|
hud.log(Strings.lookup("flashlight.on") if flashlight_on else Strings.lookup("flashlight.off"))
|
||||||
|
|
||||||
|
## Toggle the body camera (PLAN Level 2). The overlay is only visible while the
|
||||||
|
## camera is on, and turning it on or off is written to the incident log.
|
||||||
|
func _toggle_body_camera() -> void:
|
||||||
|
_set_body_camera(not body_camera_on, "manual")
|
||||||
|
|
||||||
|
func _set_body_camera(on: bool, reason: String) -> void:
|
||||||
|
if body_camera_on == on:
|
||||||
|
return
|
||||||
|
body_camera_on = on
|
||||||
|
if hud:
|
||||||
|
hud.set_body_camera(on)
|
||||||
|
var controller: Object = _targeted_controller()
|
||||||
|
if controller != null:
|
||||||
|
_ensure_incident(controller)
|
||||||
|
if coordinator and current_incident_active:
|
||||||
|
coordinator.recorder.add_event(current_incident_npc_id, {
|
||||||
|
"type": "body_camera",
|
||||||
|
"on": on,
|
||||||
|
"reason": reason,
|
||||||
|
})
|
||||||
|
if hud:
|
||||||
|
hud.log(Strings.lookup("bodycam.on") if on else Strings.lookup("bodycam.off"))
|
||||||
|
|
||||||
## Lock or unlock the restricted door (PLAN.md: Level 3). Locked doors thwart
|
## Lock or unlock the restricted door (PLAN.md: Level 3). Locked doors thwart
|
||||||
## FORCE_ENTRY attempts during the reaction flow.
|
## FORCE_ENTRY attempts during the reaction flow.
|
||||||
func _toggle_door_lock() -> void:
|
func _toggle_door_lock() -> void:
|
||||||
@@ -423,8 +895,13 @@ func _cycle_nearby_target() -> void:
|
|||||||
_nearby_index = (_nearby_index + 1) % nearby.size()
|
_nearby_index = (_nearby_index + 1) % nearby.size()
|
||||||
var next_target: Node3D = nearby[_nearby_index]
|
var next_target: Node3D = nearby[_nearby_index]
|
||||||
targeted_npc = next_target
|
targeted_npc = next_target
|
||||||
|
_set_focused_avatar(next_target)
|
||||||
_begin_incident(next_target)
|
_begin_incident(next_target)
|
||||||
hud.log(Strings.fmt("hud.targeting", [next_target.name]))
|
var controller: Object = _targeted_controller()
|
||||||
|
var who: String = next_target.name
|
||||||
|
if controller and controller.profile and controller.profile.display_name != "":
|
||||||
|
who = str(controller.profile.display_name)
|
||||||
|
hud.log(Strings.fmt("hud.targeting", [who]))
|
||||||
|
|
||||||
func _apply_interaction(level: int, action_name: String) -> void:
|
func _apply_interaction(level: int, action_name: String) -> void:
|
||||||
if targeted_npc == null:
|
if targeted_npc == null:
|
||||||
@@ -433,6 +910,7 @@ func _apply_interaction(level: int, action_name: String) -> void:
|
|||||||
var controller: Object = _targeted_controller()
|
var controller: Object = _targeted_controller()
|
||||||
if controller == null or coordinator == null:
|
if controller == null or coordinator == null:
|
||||||
return
|
return
|
||||||
|
_ensure_incident(controller)
|
||||||
var outcome: Dictionary = controller.apply_player_action(level)
|
var outcome: Dictionary = controller.apply_player_action(level)
|
||||||
var npc_id: String = controller.npc_id
|
var npc_id: String = controller.npc_id
|
||||||
coordinator.recorder.add_event(npc_id, {
|
coordinator.recorder.add_event(npc_id, {
|
||||||
@@ -443,11 +921,88 @@ func _apply_interaction(level: int, action_name: String) -> void:
|
|||||||
coordinator.recorder.add_escalation(npc_id, level, "%s on %s" % [action_name, npc_id])
|
coordinator.recorder.add_escalation(npc_id, level, "%s on %s" % [action_name, npc_id])
|
||||||
if level >= Rules.Level.FORMAL_WARNING:
|
if level >= Rules.Level.FORMAL_WARNING:
|
||||||
coordinator.reputation.apply("prop", -1.5, "escalation L%d %s" % [level, action_name])
|
coordinator.reputation.apply("prop", -1.5, "escalation L%d %s" % [level, action_name])
|
||||||
|
# A formal warning is the documented point where the body camera / security
|
||||||
|
# light goes on: it creates a record of the interaction (PLAN Level 2).
|
||||||
|
if level == Rules.Level.FORMAL_WARNING and not body_camera_on:
|
||||||
|
_set_body_camera(true, "formal warning")
|
||||||
|
# Blocking also means physically standing between the person and the door
|
||||||
|
# (PLAN Level 3), not just sending the escalation level.
|
||||||
|
if level == Rules.Level.BLOCKING:
|
||||||
|
_station_between(controller, controller.profile.display_name if controller.profile else "them")
|
||||||
hud.set_escalation(level)
|
hud.set_escalation(level)
|
||||||
if audio:
|
if audio:
|
||||||
audio.play_escalation(level)
|
audio.play_escalation(level)
|
||||||
_react_to_outcome(controller, outcome)
|
_react_to_outcome(controller, outcome)
|
||||||
|
|
||||||
|
## Level 1 eye contact: a distinct, quieter cue than raise-hand (PLAN.md). It
|
||||||
|
## uses the same Level 1 reaction table but is logged as its own action.
|
||||||
|
func _eye_contact() -> void:
|
||||||
|
_apply_interaction(Rules.Level.SIMPLE_DETERRENCE, "eye contact")
|
||||||
|
|
||||||
|
## "I recognize this person" is the player's own decision, recorded as access
|
||||||
|
## evidence rather than pre-attached to every staff/guest type (PLAN.md).
|
||||||
|
func _recognize_target() -> void:
|
||||||
|
var controller: Object = _targeted_controller()
|
||||||
|
if controller == null:
|
||||||
|
hud.log(Strings.lookup("hud.aim_first"))
|
||||||
|
return
|
||||||
|
var name: String = controller.profile.display_name if controller.profile else "them"
|
||||||
|
if controller.player_recognized:
|
||||||
|
hud.log(Strings.fmt("recognition.already", [name]))
|
||||||
|
return
|
||||||
|
_ensure_incident(controller)
|
||||||
|
controller.player_recognized = true
|
||||||
|
coordinator.recorder.add_access_evidence(controller.npc_id, {
|
||||||
|
"kind": "recognition",
|
||||||
|
"source": "guard_decision",
|
||||||
|
"recognized": true,
|
||||||
|
})
|
||||||
|
coordinator.recorder.add_event(controller.npc_id, {
|
||||||
|
"type": "recognition_decision",
|
||||||
|
"recognized": true,
|
||||||
|
"source": "player",
|
||||||
|
})
|
||||||
|
hud.log(Strings.fmt("recognition.declared", [name]))
|
||||||
|
|
||||||
|
## Level 3 ask: request the person's reason for entry. The reply comes from the
|
||||||
|
## NPC's authored `dialogue_lines`; silence is a valid, telling answer.
|
||||||
|
func _request_reason() -> void:
|
||||||
|
var controller: Object = _targeted_controller()
|
||||||
|
if controller == null:
|
||||||
|
hud.log(Strings.lookup("hud.aim_first"))
|
||||||
|
return
|
||||||
|
var name: String = controller.profile.display_name if controller.profile else "They"
|
||||||
|
_ensure_incident(controller)
|
||||||
|
var reply: String = controller.request_reason()
|
||||||
|
coordinator.recorder.add_event(controller.npc_id, {
|
||||||
|
"type": "reason_requested",
|
||||||
|
"reply": reply,
|
||||||
|
})
|
||||||
|
hud.set_escalation(Rules.Level.BLOCKING)
|
||||||
|
hud.log(Strings.fmt("reason.ask", [name]))
|
||||||
|
if reply == "":
|
||||||
|
hud.log(Strings.fmt("reason.silent", [name]))
|
||||||
|
else:
|
||||||
|
hud.log(Strings.fmt("reason.reply", [name, reply]))
|
||||||
|
|
||||||
|
## Physically move the guard between the person and the door (PLAN Level 3).
|
||||||
|
func _station_between(controller: Object, name: String) -> void:
|
||||||
|
if guard == null or targeted_npc == null:
|
||||||
|
return
|
||||||
|
var npc_pos: Vector3 = (targeted_npc as Node3D).global_position
|
||||||
|
var door_pos: Vector3 = selected_scenario._location_or_default("entrance", Vector3(0, 0.5, 1.2))
|
||||||
|
var to_door := door_pos - npc_pos
|
||||||
|
to_door.y = 0.0
|
||||||
|
if to_door.length() < 0.05:
|
||||||
|
return
|
||||||
|
var station: Vector3 = npc_pos + to_door.normalized() * 0.9
|
||||||
|
station.y = guard.global_position.y
|
||||||
|
guard.global_position = station
|
||||||
|
var look_at_point := Vector3(npc_pos.x, guard.global_position.y, npc_pos.z)
|
||||||
|
if (look_at_point - guard.global_position).length() > 0.05:
|
||||||
|
guard.look_at(look_at_point, Vector3.UP)
|
||||||
|
hud.log(Strings.fmt("station.blocking", [name]))
|
||||||
|
|
||||||
func _react_to_outcome(controller: Object, outcome: Dictionary) -> void:
|
func _react_to_outcome(controller: Object, outcome: Dictionary) -> void:
|
||||||
var reaction: int = outcome.get("reaction", -1)
|
var reaction: int = outcome.get("reaction", -1)
|
||||||
var name: String = (controller.profile.display_name if controller.profile else "Person")
|
var name: String = (controller.profile.display_name if controller.profile else "Person")
|
||||||
@@ -500,9 +1055,11 @@ func _open_radio(emergency: bool) -> void:
|
|||||||
return
|
return
|
||||||
radio_panel.open(controller, emergency, current_npc_truth)
|
radio_panel.open(controller, emergency, current_npc_truth)
|
||||||
hud.set_action_hint("Fill in the radio report on screen.")
|
hud.set_action_hint("Fill in the radio report on screen.")
|
||||||
|
_refresh_freeze()
|
||||||
|
|
||||||
func _on_radio_submitted(report: Dictionary, emergency: bool) -> void:
|
func _on_radio_submitted(report: Dictionary, emergency: bool) -> void:
|
||||||
hud.set_action_hint("")
|
hud.set_action_hint("")
|
||||||
|
_refresh_freeze()
|
||||||
var result: Dictionary = coordinator.radio.request_emergency(report) if emergency else coordinator.radio.request_assistance(report)
|
var result: Dictionary = coordinator.radio.request_emergency(report) if emergency else coordinator.radio.request_assistance(report)
|
||||||
if not result.get("ok", false):
|
if not result.get("ok", false):
|
||||||
hud.log(Strings.fmt("radio.blocked", [result.get("reason", "unknown")]))
|
hud.log(Strings.fmt("radio.blocked", [result.get("reason", "unknown")]))
|
||||||
@@ -534,14 +1091,16 @@ func _toggle_inspection() -> void:
|
|||||||
if inspection_open:
|
if inspection_open:
|
||||||
hud.hide_inspection()
|
hud.hide_inspection()
|
||||||
inspection_open = false
|
inspection_open = false
|
||||||
|
_refresh_freeze()
|
||||||
return
|
return
|
||||||
var controller: Object = _targeted_controller()
|
var controller: Object = _targeted_controller()
|
||||||
if controller == null:
|
if controller == null:
|
||||||
return
|
return
|
||||||
inspection_open = true
|
inspection_open = true
|
||||||
var artifacts := _artifacts_for(controller)
|
var artifacts := _artifacts_for(controller)
|
||||||
var result: Dictionary = verifier.verify(artifacts, selected_scenario.access_policy)
|
var result: Dictionary = verifier.verify(artifacts, selected_scenario.access_policy, controller.screened)
|
||||||
hud.show_inspection(controller, artifacts, result)
|
hud.show_inspection(controller, artifacts, result)
|
||||||
|
_refresh_freeze()
|
||||||
# Venue door-staff flavor: an applicable check line (PLAN.md: door-staff dialogue).
|
# Venue door-staff flavor: an applicable check line (PLAN.md: door-staff dialogue).
|
||||||
var line := _door_context_line()
|
var line := _door_context_line()
|
||||||
if line != "":
|
if line != "":
|
||||||
@@ -552,10 +1111,14 @@ func _toggle_inspection() -> void:
|
|||||||
## Handheld wand inspection (The Joke Shop). Only available when the venue
|
## Handheld wand inspection (The Joke Shop). Only available when the venue
|
||||||
## carries a wand. The wand reports an alert; the player interprets it.
|
## carries a wand. The wand reports an alert; the player interprets it.
|
||||||
func _toggle_wand_screening() -> void:
|
func _toggle_wand_screening() -> void:
|
||||||
|
if _wand_cooldown > 0.0:
|
||||||
|
hud.log(Strings.lookup("wand.recharge"))
|
||||||
|
return
|
||||||
if wand_open:
|
if wand_open:
|
||||||
hud.hide_wand()
|
hud.hide_wand()
|
||||||
hud.set_wand_icon(false)
|
hud.set_wand_icon(false)
|
||||||
wand_open = false
|
wand_open = false
|
||||||
|
_refresh_freeze()
|
||||||
return
|
return
|
||||||
if not selected_scenario.equipment.has("wand"):
|
if not selected_scenario.equipment.has("wand"):
|
||||||
hud.log(Strings.lookup("hud.no_wand"))
|
hud.log(Strings.lookup("hud.no_wand"))
|
||||||
@@ -570,6 +1133,7 @@ func _toggle_wand_screening() -> void:
|
|||||||
var result: Dictionary = wand_screener.screen(items)
|
var result: Dictionary = wand_screener.screen(items)
|
||||||
wand_open = true
|
wand_open = true
|
||||||
hud.show_wand(controller, result)
|
hud.show_wand(controller, result)
|
||||||
|
_refresh_freeze()
|
||||||
var wand_line := selected_scenario.door_staff_line("wand_check", _door_rng)
|
var wand_line := selected_scenario.door_staff_line("wand_check", _door_rng)
|
||||||
if wand_line != "":
|
if wand_line != "":
|
||||||
hud.log(wand_line)
|
hud.log(wand_line)
|
||||||
@@ -580,6 +1144,7 @@ func decide_wand(allowed: bool) -> void:
|
|||||||
if controller == null:
|
if controller == null:
|
||||||
hud.hide_wand()
|
hud.hide_wand()
|
||||||
wand_open = false
|
wand_open = false
|
||||||
|
_refresh_freeze()
|
||||||
return
|
return
|
||||||
var profile: Object = controller.profile
|
var profile: Object = controller.profile
|
||||||
var items: Array = profile.carried_items if profile else []
|
var items: Array = profile.carried_items if profile else []
|
||||||
@@ -615,21 +1180,26 @@ func decide_wand(allowed: bool) -> void:
|
|||||||
controller.screened = true
|
controller.screened = true
|
||||||
hud.hide_wand()
|
hud.hide_wand()
|
||||||
wand_open = false
|
wand_open = false
|
||||||
|
_refresh_freeze()
|
||||||
|
# Short scan cooldown: the wand must “recharge” between guests (PLAN.md: feel).
|
||||||
|
_wand_cooldown = WAND_COOLDOWN_S
|
||||||
|
|
||||||
func decide_access(allowed: bool) -> void:
|
func decide_access(allowed: bool) -> void:
|
||||||
var controller: Object = _targeted_controller()
|
var controller: Object = _targeted_controller()
|
||||||
if controller == null:
|
if controller == null:
|
||||||
hud.hide_inspection()
|
hud.hide_inspection()
|
||||||
inspection_open = false
|
inspection_open = false
|
||||||
|
_refresh_freeze()
|
||||||
return
|
return
|
||||||
# Screening-before-entry: at wand venues, a guest must be screened first.
|
# Screening-before-entry: at wand venues, a guest must be screened first.
|
||||||
if allowed and selected_scenario.access_policy.wand_screening_required and not controller.screened:
|
if allowed and selected_scenario.access_policy.wand_screening_required and not controller.screened:
|
||||||
hud.log(Strings.lookup("hud.screen_first"))
|
hud.log(Strings.lookup("hud.screen_first"))
|
||||||
hud.hide_inspection()
|
hud.hide_inspection()
|
||||||
inspection_open = false
|
inspection_open = false
|
||||||
|
_refresh_freeze()
|
||||||
return
|
return
|
||||||
var artifacts := _artifacts_for(controller)
|
var artifacts := _artifacts_for(controller)
|
||||||
var result: Dictionary = verifier.verify(artifacts, selected_scenario.access_policy)
|
var result: Dictionary = verifier.verify(artifacts, selected_scenario.access_policy, controller.screened)
|
||||||
var granted: bool = result.get("granted", false)
|
var granted: bool = result.get("granted", false)
|
||||||
coordinator.recorder.add_access_evidence(controller.npc_id, {
|
coordinator.recorder.add_access_evidence(controller.npc_id, {
|
||||||
"decided": allowed,
|
"decided": allowed,
|
||||||
@@ -661,6 +1231,7 @@ func decide_access(allowed: bool) -> void:
|
|||||||
audio.play_deny()
|
audio.play_deny()
|
||||||
hud.hide_inspection()
|
hud.hide_inspection()
|
||||||
inspection_open = false
|
inspection_open = false
|
||||||
|
_refresh_freeze()
|
||||||
|
|
||||||
## Venue-specific opening line for the access inspection (e.g. The Joke Shop's
|
## Venue-specific opening line for the access inspection (e.g. The Joke Shop's
|
||||||
## ID / ticket check lines). Returns "" when the venue has no matching lines.
|
## ID / ticket check lines). Returns "" when the venue has no matching lines.
|
||||||
@@ -674,23 +1245,22 @@ func _door_context_line() -> String:
|
|||||||
return ""
|
return ""
|
||||||
|
|
||||||
func _artifacts_for(controller: Object) -> Array:
|
func _artifacts_for(controller: Object) -> Array:
|
||||||
var profile: Object = controller.profile
|
var profile: NpcProfile = controller.profile as NpcProfile
|
||||||
var npc_type: int = profile.npc_type if profile else -1
|
var override: Dictionary = controller.access_override
|
||||||
var out: Array = []
|
var policy = selected_scenario.access_policy if selected_scenario else null
|
||||||
match npc_type:
|
var artifacts: Array = AccessLoadout.build(profile, policy, override)
|
||||||
Rules.NpcType.AUTHORIZED_GUEST, Rules.NpcType.AUTHORIZED_STAFF:
|
# The guard's own recognition is evidence the player created, so it is
|
||||||
out.append(AccessArtifact.new(Rules.AccessKind.RECOGNITION, Rules.ArtifactStatus.VALID, {"known": true}))
|
# appended here rather than baked into every staff/guest artifact set.
|
||||||
Rules.NpcType.DELIVERY:
|
if controller.player_recognized and not _has_recognition_artifact(artifacts):
|
||||||
out.append(AccessArtifact.new(Rules.AccessKind.CREDENTIAL, Rules.ArtifactStatus.VALID, {"role": "delivery"}))
|
artifacts.push_front(AccessArtifact.new(
|
||||||
Rules.NpcType.TRESPASSER:
|
Rules.AccessKind.RECOGNITION, Rules.ArtifactStatus.VALID, {"known": true, "source": "player"}))
|
||||||
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.COUNTERFEIT, {"color": "red", "date": "2024-01-01"}))
|
return artifacts
|
||||||
Rules.NpcType.TOURIST:
|
|
||||||
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.MISSING, {}))
|
func _has_recognition_artifact(artifacts: Array) -> bool:
|
||||||
Rules.NpcType.CONFUSED_VISITOR:
|
for artifact in artifacts:
|
||||||
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.AMBIGUOUS, {"color": "gold"}))
|
if artifact is AccessArtifact and artifact.kind == Rules.AccessKind.RECOGNITION:
|
||||||
_:
|
return true
|
||||||
out.append(AccessArtifact.new(Rules.AccessKind.WRISTBAND, Rules.ArtifactStatus.MISSING, {}))
|
return false
|
||||||
return out
|
|
||||||
|
|
||||||
func _read_npc_truth(controller: Object) -> Dictionary:
|
func _read_npc_truth(controller: Object) -> Dictionary:
|
||||||
var profile: Object = controller.profile
|
var profile: Object = controller.profile
|
||||||
@@ -707,6 +1277,17 @@ func _targeted_controller() -> Object:
|
|||||||
return targeted_npc.get_npc_controller()
|
return targeted_npc.get_npc_controller()
|
||||||
return null
|
return null
|
||||||
|
|
||||||
|
## Guarantee an open incident for this NPC before recording evidence, so verbs
|
||||||
|
## work even if the player acted without a prior focus change.
|
||||||
|
func _ensure_incident(controller: Object) -> void:
|
||||||
|
if controller == null or coordinator == null:
|
||||||
|
return
|
||||||
|
if coordinator.recorder.has_open_incident(controller.npc_id):
|
||||||
|
return
|
||||||
|
coordinator.recorder.start_incident(controller.npc_id, "player_action")
|
||||||
|
current_incident_npc_id = controller.npc_id
|
||||||
|
current_incident_active = true
|
||||||
|
|
||||||
func _close_incident(outcome: String) -> void:
|
func _close_incident(outcome: String) -> void:
|
||||||
if current_incident_active and not current_incident_npc_id.is_empty():
|
if current_incident_active and not current_incident_npc_id.is_empty():
|
||||||
coordinator.recorder.close_incident(current_incident_npc_id, outcome)
|
coordinator.recorder.close_incident(current_incident_npc_id, outcome)
|
||||||
@@ -714,6 +1295,8 @@ func _close_incident(outcome: String) -> void:
|
|||||||
current_incident_npc_id = ""
|
current_incident_npc_id = ""
|
||||||
|
|
||||||
func _physics_process(delta: float) -> void:
|
func _physics_process(delta: float) -> void:
|
||||||
|
if _wand_cooldown > 0.0:
|
||||||
|
_wand_cooldown = maxf(0.0, _wand_cooldown - delta)
|
||||||
if coordinator == null or not coordinator.running:
|
if coordinator == null or not coordinator.running:
|
||||||
return
|
return
|
||||||
coordinator.tick(delta)
|
coordinator.tick(delta)
|
||||||
|
|||||||
@@ -1,35 +1,47 @@
|
|||||||
class_name GuardController
|
class_name GuardController
|
||||||
extends CharacterBody3D
|
extends CharacterBody3D
|
||||||
## First-person guard controller: WASD movement, mouse look, interact raycast.
|
## First-person guard: WASD + mouse look. Focus is a cone on NPC heads (ADR-0007, ADR-0008).
|
||||||
|
|
||||||
signal picked_target(target: Node)
|
signal picked_target(target: Node)
|
||||||
signal cleared_target()
|
signal cleared_target()
|
||||||
|
|
||||||
|
const NpcFocus := preload("res://src/game/npc_focus.gd")
|
||||||
|
|
||||||
var move_speed: float = 3.2
|
var move_speed: float = 3.2
|
||||||
var look_sensitivity: float = 0.0022
|
var look_sensitivity: float = 0.0022
|
||||||
|
var accel: float = 12.0
|
||||||
var is_ready := false
|
var is_ready := false
|
||||||
var targeted_npc: Node3D = null
|
var targeted_npc: Node3D = null
|
||||||
|
var input_locked := false
|
||||||
|
var _miss_frames := 0
|
||||||
|
const MISS_GRACE := 8
|
||||||
|
|
||||||
@onready var camera: Camera3D = $Head/Camera3D
|
@onready var camera: Camera3D = $Head/Camera3D
|
||||||
@onready var head: Node3D = $Head
|
@onready var head: Node3D = $Head
|
||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
|
floor_snap_length = 0.3
|
||||||
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
||||||
is_ready = true
|
is_ready = true
|
||||||
|
|
||||||
func _unhandled_input(event: InputEvent) -> void:
|
func _unhandled_input(event: InputEvent) -> void:
|
||||||
|
if input_locked:
|
||||||
|
return
|
||||||
if event is InputEventMouseMotion and Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED:
|
if event is InputEventMouseMotion and Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED:
|
||||||
rotate_y(-event.relative.x * look_sensitivity)
|
rotate_y(-event.relative.x * look_sensitivity)
|
||||||
head.rotate_x(-event.relative.y * look_sensitivity)
|
head.rotate_x(-event.relative.y * look_sensitivity)
|
||||||
head.rotation.x = clampf(head.rotation.x, deg_to_rad(-80.0), deg_to_rad(80.0))
|
head.rotation.x = clampf(head.rotation.x, deg_to_rad(-80.0), deg_to_rad(80.0))
|
||||||
elif event is InputEventKey and event.pressed and event.keycode == KEY_ESCAPE:
|
|
||||||
if Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED:
|
|
||||||
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
|
||||||
else:
|
|
||||||
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
|
|
||||||
|
|
||||||
func _physics_process(_delta: float) -> void:
|
func _physics_process(_delta: float) -> void:
|
||||||
# Movement relative to the head's yaw only.
|
if input_locked:
|
||||||
|
velocity.x = 0.0
|
||||||
|
velocity.z = 0.0
|
||||||
|
if not is_on_floor():
|
||||||
|
velocity.y -= 9.8 * _delta
|
||||||
|
else:
|
||||||
|
velocity.y = 0.0
|
||||||
|
move_and_slide()
|
||||||
|
return
|
||||||
var forward := -global_transform.basis.z
|
var forward := -global_transform.basis.z
|
||||||
forward.y = 0.0
|
forward.y = 0.0
|
||||||
forward = forward.normalized()
|
forward = forward.normalized()
|
||||||
@@ -41,28 +53,49 @@ func _physics_process(_delta: float) -> void:
|
|||||||
Input.get_axis("move_left", "move_right"),
|
Input.get_axis("move_left", "move_right"),
|
||||||
Input.get_axis("move_forward", "move_back")
|
Input.get_axis("move_forward", "move_back")
|
||||||
)
|
)
|
||||||
var direction := (forward * input_dir.y + right * input_dir.x).normalized()
|
if Input.get_mouse_mode() != Input.MOUSE_MODE_CAPTURED:
|
||||||
velocity.x = direction.x * move_speed
|
input_dir = Vector2.ZERO
|
||||||
velocity.z = direction.z * move_speed
|
var desired := (forward * input_dir.y + right * input_dir.x)
|
||||||
velocity.y -= 9.8 * _delta
|
if desired.length() > 1.0:
|
||||||
|
desired = desired.normalized()
|
||||||
|
desired *= move_speed
|
||||||
|
velocity.x = move_toward(velocity.x, desired.x, accel * _delta * move_speed)
|
||||||
|
velocity.z = move_toward(velocity.z, desired.z, accel * _delta * move_speed)
|
||||||
|
if is_on_floor():
|
||||||
|
velocity.y = 0.0
|
||||||
|
else:
|
||||||
|
velocity.y -= 9.8 * _delta
|
||||||
move_and_slide()
|
move_and_slide()
|
||||||
_update_target()
|
_update_target()
|
||||||
|
|
||||||
func _update_target() -> void:
|
func _update_target() -> void:
|
||||||
var space := get_world_3d().direct_space_state
|
if camera == null:
|
||||||
var from := camera.global_position
|
return
|
||||||
var to := from + -camera.global_transform.basis.z * 8.0
|
var npcs := get_tree().get_nodes_in_group("npc") if get_tree() else []
|
||||||
var query := PhysicsRayQueryParameters3D.create(from, to)
|
var heads: Array = []
|
||||||
query.collide_with_areas = true
|
var avatars: Array = []
|
||||||
query.collide_with_bodies = true
|
for node in npcs:
|
||||||
query.exclude = [get_rid()]
|
if not (node is Node3D) or not is_instance_valid(node):
|
||||||
var hit := space.intersect_ray(query)
|
continue
|
||||||
|
var avatar := node as Node3D
|
||||||
|
var head_node := avatar.get_node_or_null("Rig/Head") as Node3D
|
||||||
|
var pos: Vector3 = head_node.global_position if head_node else avatar.global_position + Vector3(0, 1.6, 0)
|
||||||
|
heads.append(pos)
|
||||||
|
avatars.append(avatar)
|
||||||
|
var cam_origin := camera.global_position
|
||||||
|
var cam_forward := -camera.global_transform.basis.z
|
||||||
|
var idx := NpcFocus.pick_index(cam_origin, cam_forward, heads)
|
||||||
var new_target: Node3D = null
|
var new_target: Node3D = null
|
||||||
if hit:
|
if idx >= 0:
|
||||||
var obj: Object = hit.get("collider")
|
var candidate: Node3D = avatars[idx]
|
||||||
var parent_avatar: Node3D = _find_avatar(obj)
|
if _head_visible(cam_origin, heads[idx]):
|
||||||
if parent_avatar != null:
|
new_target = candidate
|
||||||
new_target = parent_avatar
|
if new_target == null and targeted_npc != null:
|
||||||
|
_miss_frames += 1
|
||||||
|
if _miss_frames < MISS_GRACE:
|
||||||
|
return
|
||||||
|
else:
|
||||||
|
_miss_frames = 0
|
||||||
if new_target != targeted_npc:
|
if new_target != targeted_npc:
|
||||||
targeted_npc = new_target
|
targeted_npc = new_target
|
||||||
if new_target != null:
|
if new_target != null:
|
||||||
@@ -70,14 +103,21 @@ func _update_target() -> void:
|
|||||||
else:
|
else:
|
||||||
cleared_target.emit()
|
cleared_target.emit()
|
||||||
|
|
||||||
func _find_avatar(obj: Object) -> Node3D:
|
func _head_visible(from: Vector3, to: Vector3) -> bool:
|
||||||
# Avatars are CharacterBody3D with a collision shape; guard against self and scene junk.
|
var space := get_world_3d().direct_space_state
|
||||||
|
if space == null:
|
||||||
|
return true
|
||||||
|
var query := PhysicsRayQueryParameters3D.create(from, to)
|
||||||
|
query.collide_with_areas = false
|
||||||
|
query.collide_with_bodies = true
|
||||||
|
query.exclude = [get_rid()]
|
||||||
|
var hit := space.intersect_ray(query)
|
||||||
|
if hit.is_empty():
|
||||||
|
return true
|
||||||
|
var obj: Object = hit.get("collider")
|
||||||
var n := obj as Node
|
var n := obj as Node
|
||||||
if n == null:
|
while n != null:
|
||||||
return null
|
if n.is_in_group("npc"):
|
||||||
var current: Node = n
|
return true
|
||||||
while current != null:
|
n = n.get_parent()
|
||||||
if current.has_method("get_npc_controller"):
|
return false
|
||||||
return current as Node3D
|
|
||||||
current = current.get_parent()
|
|
||||||
return null
|
|
||||||
@@ -12,6 +12,19 @@ var target_position: Vector3 = Vector3.ZERO
|
|||||||
var door_position: Vector3 = Vector3(0, 0.5, 1.2)
|
var door_position: Vector3 = Vector3(0, 0.5, 1.2)
|
||||||
var awaiting_interaction := false
|
var awaiting_interaction := false
|
||||||
var arrived := false
|
var arrived := false
|
||||||
|
## Seconds idle at an arrived waypoint. Ordinary traffic lives for a while, then
|
||||||
|
## despawns so the entrance does not fill with standers (TODO: NPC crowd cap).
|
||||||
|
var idle_s := 0.0
|
||||||
|
var lifetime_s := 90.0
|
||||||
|
var ephemeral := true
|
||||||
|
## Crowd presentation (PLAN: Public Crowd Reaction). "watch" rubbernecks at the
|
||||||
|
## incident, "flee" clears away from it, "" is normal navigation.
|
||||||
|
var reaction_mode := ""
|
||||||
|
var reaction_point := Vector3.ZERO
|
||||||
|
var _reaction_timer := 0.0
|
||||||
|
const RUBBERNECK_S := 12.0
|
||||||
|
const FLEE_S := 20.0
|
||||||
|
const FLEE_SPEED := 2.4
|
||||||
var agent: NavigationAgent3D = null
|
var agent: NavigationAgent3D = null
|
||||||
## Set once the nav agent proves it has a path; direct movement is the fallback.
|
## Set once the nav agent proves it has a path; direct movement is the fallback.
|
||||||
var _nav_usable := false
|
var _nav_usable := false
|
||||||
@@ -39,14 +52,17 @@ func _init() -> void:
|
|||||||
func get_npc_controller() -> NPCController:
|
func get_npc_controller() -> NPCController:
|
||||||
return npc
|
return npc
|
||||||
|
|
||||||
func setup(profile: NpcProfile, intent: String, seed_value: int, p_spawn: Vector3, p_target: Vector3, p_door: Vector3 = Vector3(0, 0.5, 1.2)) -> void:
|
func setup(profile: NpcProfile, intent: String, seed_value: int, p_spawn: Vector3, p_target: Vector3, p_door: Vector3 = Vector3(0, 0.5, 1.2), p_npc_id: String = "", p_override: Dictionary = {}) -> void:
|
||||||
npc.setup("npc_%d" % seed_value, profile, intent, seed_value)
|
var id := p_npc_id if p_npc_id != "" else "npc_%d" % seed_value
|
||||||
|
npc.setup(id, profile, intent, seed_value)
|
||||||
|
npc.access_override = p_override
|
||||||
_visual_seed = seed_value
|
_visual_seed = seed_value
|
||||||
spawn_position = p_spawn
|
spawn_position = p_spawn
|
||||||
target_position = p_target
|
target_position = p_target
|
||||||
door_position = p_door
|
door_position = p_door
|
||||||
position = p_spawn
|
position = p_spawn
|
||||||
npc.fsm.state_changed.connect(_on_state_changed)
|
npc.fsm.state_changed.connect(_on_state_changed)
|
||||||
|
add_to_group("npc")
|
||||||
_build_body(profile.npc_type)
|
_build_body(profile.npc_type)
|
||||||
_nav_usable = false
|
_nav_usable = false
|
||||||
_nav_try_frames = 0
|
_nav_try_frames = 0
|
||||||
@@ -62,9 +78,10 @@ func setup(profile: NpcProfile, intent: String, seed_value: int, p_spawn: Vector
|
|||||||
var collider := CollisionShape3D.new()
|
var collider := CollisionShape3D.new()
|
||||||
var shape := CapsuleShape3D.new()
|
var shape := CapsuleShape3D.new()
|
||||||
shape.radius = 0.35
|
shape.radius = 0.35
|
||||||
shape.height = 1.6
|
var height_scale: float = _rig.scale.y if _rig else 1.0
|
||||||
|
shape.height = 1.6 * height_scale
|
||||||
collider.shape = shape
|
collider.shape = shape
|
||||||
collider.position = Vector3(0, 0.8, 0)
|
collider.position = Vector3(0, 0.8 * height_scale, 0)
|
||||||
add_child(collider)
|
add_child(collider)
|
||||||
|
|
||||||
var _visual_seed := 0
|
var _visual_seed := 0
|
||||||
@@ -72,8 +89,11 @@ var _rig: Node3D = null
|
|||||||
var _head: Node3D = null
|
var _head: Node3D = null
|
||||||
var _bob_phase := 0.0
|
var _bob_phase := 0.0
|
||||||
var _guard_ref: Node3D = null
|
var _guard_ref: Node3D = null
|
||||||
|
var _ring: MeshInstance3D = null
|
||||||
|
var _name_tag: Label3D = null
|
||||||
const SKIN_TONE := Color(0.88, 0.72, 0.60)
|
const SKIN_TONE := Color(0.88, 0.72, 0.60)
|
||||||
const PANTS_COLOR := Color(0.22, 0.22, 0.26)
|
const PANTS_COLOR := Color(0.22, 0.22, 0.26)
|
||||||
|
const HAIR_COLORS := [Color(0.12, 0.1, 0.08), Color(0.35, 0.22, 0.12), Color(0.55, 0.42, 0.28), Color(0.15, 0.15, 0.18)]
|
||||||
|
|
||||||
func _build_body(npc_type: int) -> void:
|
func _build_body(npc_type: int) -> void:
|
||||||
_rig = Node3D.new()
|
_rig = Node3D.new()
|
||||||
@@ -96,14 +116,60 @@ func _build_body(npc_type: int) -> void:
|
|||||||
# Arms
|
# Arms
|
||||||
_add_capsule(_rig, 0.09, 0.7, Vector3(-0.42, 1.28, 0), limbs_color, 8.0)
|
_add_capsule(_rig, 0.09, 0.7, Vector3(-0.42, 1.28, 0), limbs_color, 8.0)
|
||||||
_add_capsule(_rig, 0.09, 0.7, Vector3(0.42, 1.28, 0), limbs_color, -8.0)
|
_add_capsule(_rig, 0.09, 0.7, Vector3(0.42, 1.28, 0), limbs_color, -8.0)
|
||||||
# Head
|
# Neck, head, face, hair, shoes so the body reads as a person (ADR-0010).
|
||||||
|
_add_capsule(_rig, 0.08, 0.16, Vector3(0, 1.48, 0), SKIN_TONE)
|
||||||
_head = Node3D.new()
|
_head = Node3D.new()
|
||||||
_head.name = "Head"
|
_head.name = "Head"
|
||||||
_head.position = Vector3(0, 1.62, 0)
|
_head.position = Vector3(0, 1.62, 0)
|
||||||
_add_sphere(_head, 0.17, Vector3.ZERO, SKIN_TONE)
|
_add_sphere(_head, 0.17, Vector3.ZERO, SKIN_TONE)
|
||||||
|
var hair_i := (_visual_seed * 7) % HAIR_COLORS.size()
|
||||||
|
_add_sphere(_head, 0.18, Vector3(0, 0.08, -0.02), HAIR_COLORS[hair_i])
|
||||||
|
_add_sphere(_head, 0.035, Vector3(-0.06, 0.02, 0.14), Color(0.08, 0.08, 0.1))
|
||||||
|
_add_sphere(_head, 0.035, Vector3(0.06, 0.02, 0.14), Color(0.08, 0.08, 0.1))
|
||||||
_rig.add_child(_head)
|
_rig.add_child(_head)
|
||||||
|
_add_box_prop(_rig, Vector3(0.16, 0.08, 0.28), Vector3(-0.16, 0.05, 0.02), Color(0.12, 0.12, 0.14))
|
||||||
|
_add_box_prop(_rig, Vector3(0.16, 0.08, 0.28), Vector3(0.16, 0.05, 0.02), Color(0.12, 0.12, 0.14))
|
||||||
|
_build_focus_ring()
|
||||||
_add_props(npc_type)
|
_add_props(npc_type)
|
||||||
|
|
||||||
|
func _build_focus_ring() -> void:
|
||||||
|
_ring = MeshInstance3D.new()
|
||||||
|
_ring.name = "FocusRing"
|
||||||
|
var torus := TorusMesh.new()
|
||||||
|
torus.inner_radius = 0.26
|
||||||
|
torus.outer_radius = 0.34
|
||||||
|
torus.rings = 12
|
||||||
|
torus.ring_segments = 16
|
||||||
|
_ring.mesh = torus
|
||||||
|
var mat := StandardMaterial3D.new()
|
||||||
|
mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
|
||||||
|
mat.albedo_color = Color(0.95, 0.82, 0.28, 0.9)
|
||||||
|
mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
|
||||||
|
_ring.material_override = mat
|
||||||
|
_ring.position = Vector3(0, 0.28, 0)
|
||||||
|
_ring.visible = false
|
||||||
|
_head.add_child(_ring)
|
||||||
|
_name_tag = Label3D.new()
|
||||||
|
_name_tag.name = "NameTag"
|
||||||
|
_name_tag.text = npc.profile.display_name if npc and npc.profile else ""
|
||||||
|
_name_tag.font_size = 48
|
||||||
|
_name_tag.pixel_size = 0.004
|
||||||
|
_name_tag.billboard = BaseMaterial3D.BILLBOARD_ENABLED
|
||||||
|
_name_tag.position = Vector3(0, 0.58, 0)
|
||||||
|
_name_tag.modulate = Color(0.95, 0.95, 0.9, 0.9)
|
||||||
|
_name_tag.visible = false
|
||||||
|
_head.add_child(_name_tag)
|
||||||
|
|
||||||
|
func set_focus_visual(focused: bool, menu_open: bool = false) -> void:
|
||||||
|
if _ring:
|
||||||
|
_ring.visible = focused
|
||||||
|
var mat := _ring.material_override as StandardMaterial3D
|
||||||
|
if mat:
|
||||||
|
mat.albedo_color = Color(1.0, 0.92, 0.35, 1.0) if menu_open else Color(0.95, 0.82, 0.28, 0.85)
|
||||||
|
_ring.scale = Vector3.ONE * (1.15 if menu_open else 1.0)
|
||||||
|
if _name_tag:
|
||||||
|
_name_tag.visible = focused
|
||||||
|
|
||||||
func _add_capsule(parent: Node3D, radius: float, height: float, pos: Vector3, color: Color, z_rot: float = 0.0) -> void:
|
func _add_capsule(parent: Node3D, radius: float, height: float, pos: Vector3, color: Color, z_rot: float = 0.0) -> void:
|
||||||
var mi := MeshInstance3D.new()
|
var mi := MeshInstance3D.new()
|
||||||
var mesh := CapsuleMesh.new()
|
var mesh := CapsuleMesh.new()
|
||||||
@@ -167,10 +233,78 @@ func _add_box_prop(parent: Node3D, size: Vector3, pos: Vector3, color: Color) ->
|
|||||||
mi.material_override = _material(color)
|
mi.material_override = _material(color)
|
||||||
parent.add_child(mi)
|
parent.add_child(mi)
|
||||||
|
|
||||||
|
## Rubberneck: idle people stop and turn toward the incident. Returns false when
|
||||||
|
## this NPC is too engaged (walking, being talked to, already leaving) to watch.
|
||||||
|
func start_rubberneck(at: Vector3) -> bool:
|
||||||
|
if not arrived or npc.leave_requested or leave_requested_by_lifetime:
|
||||||
|
return false
|
||||||
|
# Someone actually waiting at the entrance is being dealt with, not a bystander.
|
||||||
|
# Avatars live under the identity SceneRoot, so `position` matches world space
|
||||||
|
# and also works before the node enters the tree (tests).
|
||||||
|
if awaiting_interaction and (position - door_position).length() < 3.0:
|
||||||
|
return false
|
||||||
|
if reaction_mode == "flee":
|
||||||
|
return false
|
||||||
|
reaction_mode = "watch"
|
||||||
|
reaction_point = at
|
||||||
|
_reaction_timer = RUBBERNECK_S
|
||||||
|
velocity = Vector3.ZERO
|
||||||
|
return true
|
||||||
|
|
||||||
|
## Panic: clear away from the incident (usually the door) in a straight line.
|
||||||
|
func start_flee(from: Vector3) -> void:
|
||||||
|
if npc.leave_requested or leave_requested_by_lifetime:
|
||||||
|
return
|
||||||
|
reaction_mode = "flee"
|
||||||
|
reaction_point = from
|
||||||
|
_reaction_timer = FLEE_S
|
||||||
|
var away := global_position - from
|
||||||
|
away.y = 0.0
|
||||||
|
if away.length() < 0.5:
|
||||||
|
away = Vector3(0.0, 0.0, 1.0)
|
||||||
|
target_position = global_position + away.normalized() * 25.0
|
||||||
|
target_position.y = 0.5
|
||||||
|
arrived = false
|
||||||
|
awaiting_interaction = false
|
||||||
|
|
||||||
|
func reaction_is_active() -> bool:
|
||||||
|
return reaction_mode != ""
|
||||||
|
|
||||||
|
func _tick_reaction(delta: float) -> void:
|
||||||
|
if reaction_mode == "":
|
||||||
|
return
|
||||||
|
_reaction_timer -= delta
|
||||||
|
if reaction_mode == "flee":
|
||||||
|
if _reaction_timer <= 0.0 or (global_position - target_position).length() < 1.5:
|
||||||
|
reaction_mode = ""
|
||||||
|
queue_free()
|
||||||
|
return
|
||||||
|
if _reaction_timer <= 0.0:
|
||||||
|
reaction_mode = ""
|
||||||
|
|
||||||
|
## Turn the body toward the reaction point without moving.
|
||||||
|
func _face_reaction_point(delta: float) -> void:
|
||||||
|
var to_point := reaction_point - global_position
|
||||||
|
to_point.y = 0.0
|
||||||
|
if to_point.length() < 0.1:
|
||||||
|
return
|
||||||
|
var target_yaw := atan2(-to_point.x, -to_point.z)
|
||||||
|
rotation.y = lerp_angle(rotation.y, target_yaw, clampf(delta * 4.0, 0.0, 1.0))
|
||||||
|
|
||||||
func _physics_process(delta: float) -> void:
|
func _physics_process(delta: float) -> void:
|
||||||
if npc == null or npc.fsm == null:
|
if npc == null or npc.fsm == null:
|
||||||
return
|
return
|
||||||
_advance_fsm(delta)
|
_advance_fsm(delta)
|
||||||
|
_tick_reaction(delta)
|
||||||
|
if reaction_mode == "watch":
|
||||||
|
velocity = Vector3.ZERO
|
||||||
|
_face_reaction_point(delta)
|
||||||
|
_animate(delta)
|
||||||
|
return
|
||||||
|
if reaction_mode == "flee":
|
||||||
|
_move_toward_target(delta)
|
||||||
|
_animate(delta)
|
||||||
|
return
|
||||||
_move_toward_target(delta)
|
_move_toward_target(delta)
|
||||||
_animate(delta)
|
_animate(delta)
|
||||||
|
|
||||||
@@ -187,6 +321,10 @@ func _animate(delta: float) -> void:
|
|||||||
_bob_phase = 0.0
|
_bob_phase = 0.0
|
||||||
_rig.position.y = lerpf(_rig.position.y, 0.0, 0.2)
|
_rig.position.y = lerpf(_rig.position.y, 0.0, 0.2)
|
||||||
_rig.rotation.x = lerpf(_rig.rotation.x, 0.0, 0.2)
|
_rig.rotation.x = lerpf(_rig.rotation.x, 0.0, 0.2)
|
||||||
|
if _ring and _ring.visible:
|
||||||
|
var cam := get_viewport().get_camera_3d() if get_viewport() else null
|
||||||
|
if cam:
|
||||||
|
_ring.look_at(cam.global_position, Vector3.UP)
|
||||||
# Attention cue: head turns toward the guard when awareness was raised.
|
# Attention cue: head turns toward the guard when awareness was raised.
|
||||||
if _head != null and npc.guard_noticed:
|
if _head != null and npc.guard_noticed:
|
||||||
if _guard_ref == null or not is_instance_valid(_guard_ref):
|
if _guard_ref == null or not is_instance_valid(_guard_ref):
|
||||||
@@ -200,25 +338,40 @@ func _animate(delta: float) -> void:
|
|||||||
_head.rotation.y = lerp_angle(_head.rotation.y, world_yaw - parent_yaw, 0.1)
|
_head.rotation.y = lerp_angle(_head.rotation.y, world_yaw - parent_yaw, 0.1)
|
||||||
|
|
||||||
func _advance_fsm(delta: float) -> void:
|
func _advance_fsm(delta: float) -> void:
|
||||||
|
# Routine traffic despawns after a while once it has finished its walk, so
|
||||||
|
# the crowd cap is not permanently occupied by idle standers.
|
||||||
|
if ephemeral and arrived and npc.fsm.current_state != "LEAVING":
|
||||||
|
idle_s += delta
|
||||||
|
if idle_s >= lifetime_s:
|
||||||
|
leave_requested_by_lifetime = true
|
||||||
|
return
|
||||||
# Returning-trespasser: an NPC directed away may circle back to the door.
|
# Returning-trespasser: an NPC directed away may circle back to the door.
|
||||||
if npc.tick_return(delta):
|
if npc.tick_return(delta):
|
||||||
arrived = false
|
arrived = false
|
||||||
awaiting_interaction = false
|
awaiting_interaction = false
|
||||||
target_position = door_position
|
target_position = door_position
|
||||||
return
|
return
|
||||||
if npc.leave_requested:
|
if npc.leave_requested or leave_requested_by_lifetime:
|
||||||
var away := global_position + (global_position - spawn_position).normalized() * 40.0
|
var away := global_position + (global_position - spawn_position).normalized() * 40.0
|
||||||
away.y = 0.5
|
away.y = 0.5
|
||||||
target_position = away
|
target_position = away
|
||||||
|
if (global_position - away).length() < 2.0:
|
||||||
|
queue_free()
|
||||||
return
|
return
|
||||||
if arrived and not awaiting_interaction:
|
if arrived and not awaiting_interaction:
|
||||||
awaiting_interaction = true
|
awaiting_interaction = true
|
||||||
|
|
||||||
|
var leave_requested_by_lifetime := false
|
||||||
|
|
||||||
func _move_toward_target(delta: float) -> void:
|
func _move_toward_target(delta: float) -> void:
|
||||||
if agent == null:
|
if agent == null:
|
||||||
_move_direct(delta)
|
_move_direct(delta)
|
||||||
return
|
return
|
||||||
agent.target_position = target_position
|
# Re-assigning the target every physics frame invalidates the path, so
|
||||||
|
# get_next_path_position() keeps returning the current position and the
|
||||||
|
# avatar never moves. Only update the agent when the target changes.
|
||||||
|
if agent.target_position != target_position:
|
||||||
|
agent.target_position = target_position
|
||||||
if agent.is_navigation_finished():
|
if agent.is_navigation_finished():
|
||||||
if (global_position - target_position).length() < 3.0:
|
if (global_position - target_position).length() < 3.0:
|
||||||
_arrive()
|
_arrive()
|
||||||
@@ -235,14 +388,32 @@ func _move_toward_target(delta: float) -> void:
|
|||||||
_move_direct(delta)
|
_move_direct(delta)
|
||||||
return
|
return
|
||||||
var next := agent.get_next_path_position()
|
var next := agent.get_next_path_position()
|
||||||
|
# Godot reports the current position as the first path point (on the navmesh
|
||||||
|
# plane, so below the body) and only advances past it once the agent is within
|
||||||
|
# path_desired_distance. Steering at the point we are standing on gives a
|
||||||
|
# zero-length direction, and steering at any point merely "far enough" away can
|
||||||
|
# pick the old start behind us. Follow the first path point that is genuinely
|
||||||
|
# closer to the destination than we are.
|
||||||
|
var path := agent.get_current_navigation_path()
|
||||||
|
if path.size() >= 2:
|
||||||
|
var goal: Vector3 = path[path.size() - 1]
|
||||||
|
var here_to_goal := Vector2(goal.x - global_position.x, goal.z - global_position.z).length()
|
||||||
|
for i in range(1, path.size()):
|
||||||
|
var candidate: Vector3 = path[i]
|
||||||
|
candidate.y = global_position.y
|
||||||
|
var candidate_to_goal := Vector2(goal.x - candidate.x, goal.z - candidate.z).length()
|
||||||
|
if candidate_to_goal < here_to_goal - 0.05:
|
||||||
|
next = candidate
|
||||||
|
break
|
||||||
var dir := (next - global_position)
|
var dir := (next - global_position)
|
||||||
dir.y = 0.0
|
dir.y = 0.0
|
||||||
if dir.length() < 0.2:
|
if dir.length() < 0.2:
|
||||||
velocity = Vector3.ZERO
|
velocity = Vector3.ZERO
|
||||||
return
|
return
|
||||||
dir = dir.normalized()
|
dir = dir.normalized()
|
||||||
velocity.x = dir.x * 1.3
|
var speed := FLEE_SPEED if reaction_mode == "flee" else 1.3
|
||||||
velocity.z = dir.z * 1.3
|
velocity.x = dir.x * speed
|
||||||
|
velocity.z = dir.z * speed
|
||||||
velocity.y -= 9.8 * delta
|
velocity.y -= 9.8 * delta
|
||||||
look_at(global_position + Vector3(dir.x, 0, dir.z), Vector3.UP)
|
look_at(global_position + Vector3(dir.x, 0, dir.z), Vector3.UP)
|
||||||
move_and_slide()
|
move_and_slide()
|
||||||
@@ -256,8 +427,9 @@ func _move_direct(delta: float) -> void:
|
|||||||
_arrive()
|
_arrive()
|
||||||
return
|
return
|
||||||
var dir := to_target.normalized()
|
var dir := to_target.normalized()
|
||||||
velocity.x = dir.x * 1.3
|
var speed := FLEE_SPEED if reaction_mode == "flee" else 1.3
|
||||||
velocity.z = dir.z * 1.3
|
velocity.x = dir.x * speed
|
||||||
|
velocity.z = dir.z * speed
|
||||||
velocity.y -= 9.8 * delta
|
velocity.y -= 9.8 * delta
|
||||||
look_at(global_position + Vector3(dir.x, 0, dir.z), Vector3.UP)
|
look_at(global_position + Vector3(dir.x, 0, dir.z), Vector3.UP)
|
||||||
move_and_slide()
|
move_and_slide()
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
extends RefCounted
|
||||||
|
## World-space focus cone (ADR-0008). Picks the head closest to the camera
|
||||||
|
## forward vector inside range and angle. No viewport needed, so tests run headless.
|
||||||
|
|
||||||
|
const MAX_RANGE := 10.0
|
||||||
|
const MAX_ANGLE_RAD := 0.175 # ~10 degrees
|
||||||
|
|
||||||
|
static func score_head(cam_origin: Vector3, cam_forward: Vector3, head_pos: Vector3, max_range: float = MAX_RANGE, max_angle: float = MAX_ANGLE_RAD) -> float:
|
||||||
|
var to := head_pos - cam_origin
|
||||||
|
var dist := to.length()
|
||||||
|
if dist < 0.05 or dist > max_range:
|
||||||
|
return -1.0
|
||||||
|
var dir := to / dist
|
||||||
|
var dot := cam_forward.dot(dir)
|
||||||
|
if dot <= 0.0:
|
||||||
|
return -1.0
|
||||||
|
var ang := acos(clampf(dot, -1.0, 1.0))
|
||||||
|
if ang > max_angle:
|
||||||
|
return -1.0
|
||||||
|
return ang
|
||||||
|
|
||||||
|
static func pick_index(cam_origin: Vector3, cam_forward: Vector3, head_positions: Array, max_range: float = MAX_RANGE, max_angle: float = MAX_ANGLE_RAD) -> int:
|
||||||
|
var best_i := -1
|
||||||
|
var best_score := 999.0
|
||||||
|
for i in head_positions.size():
|
||||||
|
var pos: Vector3 = head_positions[i]
|
||||||
|
var score := score_head(cam_origin, cam_forward, pos, max_range, max_angle)
|
||||||
|
if score < 0.0:
|
||||||
|
continue
|
||||||
|
if score < best_score:
|
||||||
|
best_score = score
|
||||||
|
best_i = i
|
||||||
|
return best_i
|
||||||
@@ -0,0 +1,182 @@
|
|||||||
|
extends CanvasLayer
|
||||||
|
## Doughnut action menu (ADR-0009). Open on LMB/Space, confirm click/Space,
|
||||||
|
## cancel Esc/RMB. Emergency is not a slice.
|
||||||
|
|
||||||
|
signal confirmed(slice_id: String)
|
||||||
|
signal cancelled()
|
||||||
|
|
||||||
|
const Rules := preload("res://src/core/rules.gd")
|
||||||
|
const Strings := preload("res://src/core/strings.gd")
|
||||||
|
|
||||||
|
const SLICE_DEFS := [
|
||||||
|
{"id": "raise_hand", "label_key": "radial.raise_hand", "level": Rules.Level.SIMPLE_DETERRENCE, "action": "raise hand"},
|
||||||
|
{"id": "eye_contact", "label_key": "radial.eye_contact", "level": Rules.Level.SIMPLE_DETERRENCE, "action": "eye contact"},
|
||||||
|
{"id": "point", "label_key": "radial.point", "level": Rules.Level.SIMPLE_DETERRENCE, "action": "point"},
|
||||||
|
{"id": "head_shake", "label_key": "radial.head_shake", "level": Rules.Level.SIMPLE_DETERRENCE, "action": "head shake"},
|
||||||
|
{"id": "polite", "label_key": "radial.polite", "level": Rules.Level.SIMPLE_DETERRENCE, "action": "polite direction"},
|
||||||
|
{"id": "inspect", "label_key": "radial.inspect", "level": -1, "action": "inspect"},
|
||||||
|
{"id": "wand", "label_key": "radial.wand", "level": -1, "action": "wand"},
|
||||||
|
{"id": "warning", "label_key": "radial.warning", "level": Rules.Level.FORMAL_WARNING, "action": "formal warning"},
|
||||||
|
{"id": "block", "label_key": "radial.block", "level": Rules.Level.BLOCKING, "action": "blocking"},
|
||||||
|
{"id": "reason", "label_key": "radial.reason", "level": Rules.Level.BLOCKING, "action": "request reason"},
|
||||||
|
{"id": "recognize", "label_key": "radial.recognize", "level": -1, "action": "recognize"},
|
||||||
|
{"id": "radio", "label_key": "radial.radio", "level": -1, "action": "radio assist"},
|
||||||
|
]
|
||||||
|
|
||||||
|
var selected := 0
|
||||||
|
var wand_available := false
|
||||||
|
var person_name := ""
|
||||||
|
var is_open := false
|
||||||
|
var _opened_ms := 0
|
||||||
|
var _wheel: Control = null
|
||||||
|
var _center_label: Label = null
|
||||||
|
|
||||||
|
func _init() -> void:
|
||||||
|
name = "ActionRadial"
|
||||||
|
layer = 25
|
||||||
|
var wheel := Control.new()
|
||||||
|
wheel.name = "Wheel"
|
||||||
|
wheel.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
wheel.mouse_filter = Control.MOUSE_FILTER_STOP
|
||||||
|
wheel.draw.connect(_on_wheel_draw)
|
||||||
|
wheel.gui_input.connect(_on_wheel_input)
|
||||||
|
add_child(wheel)
|
||||||
|
_wheel = wheel
|
||||||
|
_center_label = Label.new()
|
||||||
|
_center_label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||||
|
_center_label.vertical_alignment = VERTICAL_ALIGNMENT_CENTER
|
||||||
|
_center_label.set_anchors_preset(Control.PRESET_CENTER)
|
||||||
|
_center_label.offset_left = -120
|
||||||
|
_center_label.offset_right = 120
|
||||||
|
_center_label.offset_top = -24
|
||||||
|
_center_label.offset_bottom = 24
|
||||||
|
_center_label.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
add_child(_center_label)
|
||||||
|
hide()
|
||||||
|
|
||||||
|
func slice_count() -> int:
|
||||||
|
return SLICE_DEFS.size()
|
||||||
|
|
||||||
|
func slice_id(index: int) -> String:
|
||||||
|
if index < 0 or index >= SLICE_DEFS.size():
|
||||||
|
return ""
|
||||||
|
return str(SLICE_DEFS[index]["id"])
|
||||||
|
|
||||||
|
func slice_def(index: int) -> Dictionary:
|
||||||
|
if index < 0 or index >= SLICE_DEFS.size():
|
||||||
|
return {}
|
||||||
|
return SLICE_DEFS[index]
|
||||||
|
|
||||||
|
func is_slice_enabled(index: int) -> bool:
|
||||||
|
if slice_id(index) == "wand":
|
||||||
|
return wand_available
|
||||||
|
return true
|
||||||
|
|
||||||
|
func open_menu(p_name: String, p_wand: bool) -> void:
|
||||||
|
person_name = p_name
|
||||||
|
wand_available = p_wand
|
||||||
|
selected = 0
|
||||||
|
is_open = true
|
||||||
|
_opened_ms = Time.get_ticks_msec()
|
||||||
|
_center_label.text = person_name
|
||||||
|
show()
|
||||||
|
_wheel.queue_redraw()
|
||||||
|
|
||||||
|
func close_menu() -> void:
|
||||||
|
is_open = false
|
||||||
|
hide()
|
||||||
|
|
||||||
|
func step(direction: int) -> void:
|
||||||
|
if not is_open or SLICE_DEFS.is_empty():
|
||||||
|
return
|
||||||
|
var n := SLICE_DEFS.size()
|
||||||
|
var next := selected
|
||||||
|
for i in n:
|
||||||
|
next = (next + direction) % n
|
||||||
|
if next < 0:
|
||||||
|
next += n
|
||||||
|
if is_slice_enabled(next):
|
||||||
|
selected = next
|
||||||
|
_wheel.queue_redraw()
|
||||||
|
return
|
||||||
|
|
||||||
|
func confirm_selected() -> String:
|
||||||
|
if not is_open:
|
||||||
|
return ""
|
||||||
|
if not is_slice_enabled(selected):
|
||||||
|
return ""
|
||||||
|
return slice_id(selected)
|
||||||
|
|
||||||
|
func angle_to_index(angle: float) -> int:
|
||||||
|
# angle from atan2, 0 = +x, we want 0 = top (-PI/2).
|
||||||
|
var n := float(SLICE_DEFS.size())
|
||||||
|
var shifted := angle + PI / 2.0
|
||||||
|
while shifted < 0.0:
|
||||||
|
shifted += TAU
|
||||||
|
while shifted >= TAU:
|
||||||
|
shifted -= TAU
|
||||||
|
var idx := int(floor(shifted / TAU * n)) % SLICE_DEFS.size()
|
||||||
|
return idx
|
||||||
|
|
||||||
|
func _on_wheel_input(event: InputEvent) -> void:
|
||||||
|
if not is_open:
|
||||||
|
return
|
||||||
|
if event is InputEventMouseMotion:
|
||||||
|
var idx := _index_at_mouse(event.position)
|
||||||
|
if idx >= 0 and is_slice_enabled(idx):
|
||||||
|
selected = idx
|
||||||
|
_wheel.queue_redraw()
|
||||||
|
elif event is InputEventMouseButton and event.pressed:
|
||||||
|
if event.button_index == MOUSE_BUTTON_LEFT:
|
||||||
|
if Time.get_ticks_msec() - _opened_ms < 120:
|
||||||
|
return
|
||||||
|
var idx := _index_at_mouse(event.position)
|
||||||
|
if idx >= 0 and is_slice_enabled(idx):
|
||||||
|
selected = idx
|
||||||
|
confirmed.emit(slice_id(selected))
|
||||||
|
elif event.button_index == MOUSE_BUTTON_RIGHT:
|
||||||
|
cancelled.emit()
|
||||||
|
|
||||||
|
func _index_at_mouse(local_pos: Vector2) -> int:
|
||||||
|
var center := _wheel.size * 0.5
|
||||||
|
var delta := local_pos - center
|
||||||
|
if delta.length() < 36.0:
|
||||||
|
return -1
|
||||||
|
return angle_to_index(atan2(delta.y, delta.x))
|
||||||
|
|
||||||
|
func _on_wheel_draw() -> void:
|
||||||
|
if not is_open:
|
||||||
|
return
|
||||||
|
var center := _wheel.size * 0.5
|
||||||
|
var n := SLICE_DEFS.size()
|
||||||
|
var outer := 174.0
|
||||||
|
var inner := 64.0
|
||||||
|
for i in n:
|
||||||
|
var a0 := -PI / 2.0 + TAU * float(i) / float(n)
|
||||||
|
var a1 := -PI / 2.0 + TAU * float(i + 1) / float(n)
|
||||||
|
var col := Color(0.12, 0.14, 0.18, 0.82)
|
||||||
|
if i == selected:
|
||||||
|
col = Color(0.92, 0.78, 0.28, 0.9)
|
||||||
|
if not is_slice_enabled(i):
|
||||||
|
col = Color(0.2, 0.2, 0.22, 0.45)
|
||||||
|
_draw_slice(center, inner, outer, a0, a1, col)
|
||||||
|
var mid := (a0 + a1) * 0.5
|
||||||
|
var label_pos := center + Vector2(cos(mid), sin(mid)) * ((inner + outer) * 0.5)
|
||||||
|
var text := Strings.lookup(str(SLICE_DEFS[i]["label_key"]))
|
||||||
|
# With 12 slices the label box is tight: center it on the slice midpoint.
|
||||||
|
var font := ThemeDB.fallback_font
|
||||||
|
var text_size := font.get_string_size(text, HORIZONTAL_ALIGNMENT_LEFT, -1, 12)
|
||||||
|
_wheel.draw_string(font, label_pos - Vector2(text_size.x * 0.5, -4), text, HORIZONTAL_ALIGNMENT_LEFT, -1, 12, Color.WHITE)
|
||||||
|
|
||||||
|
func _draw_slice(center: Vector2, inner: float, outer: float, a0: float, a1: float, color: Color) -> void:
|
||||||
|
var pts := PackedVector2Array()
|
||||||
|
var steps := 8
|
||||||
|
for s in steps + 1:
|
||||||
|
var t := float(s) / float(steps)
|
||||||
|
var ang := lerpf(a0, a1, t)
|
||||||
|
pts.append(center + Vector2(cos(ang), sin(ang)) * outer)
|
||||||
|
for s in steps + 1:
|
||||||
|
var t := float(steps - s) / float(steps)
|
||||||
|
var ang := lerpf(a0, a1, t)
|
||||||
|
pts.append(center + Vector2(cos(ang), sin(ang)) * inner)
|
||||||
|
_wheel.draw_colored_polygon(pts, color)
|
||||||
@@ -5,16 +5,16 @@ extends CanvasLayer
|
|||||||
|
|
||||||
const Rules := preload("res://src/core/rules.gd")
|
const Rules := preload("res://src/core/rules.gd")
|
||||||
const Strings := preload("res://src/core/strings.gd")
|
const Strings := preload("res://src/core/strings.gd")
|
||||||
const T_VIGNETTE := preload("res://assets/textures/vignette.png")
|
const T_VIGNETTE := preload("res://assets/textures/ai/game_ready/vignette.png")
|
||||||
const T_ICON_FLASH := preload("res://assets/textures/icons/flashlight_on.png")
|
const T_ICON_FLASH := preload("res://assets/textures/ai/game_ready/icons/flashlight_on.png")
|
||||||
const T_ICON_DOOR := preload("res://assets/textures/icons/door_locked.png")
|
const T_ICON_DOOR := preload("res://assets/textures/ai/game_ready/icons/door_locked.png")
|
||||||
const T_ICON_WAND := preload("res://assets/textures/icons/wand.png")
|
const T_ICON_WAND := preload("res://assets/textures/ai/game_ready/icons/wand.png")
|
||||||
const T_ICON_REC := preload("res://assets/textures/icons/rec_dot.png")
|
const T_ICON_REC := preload("res://assets/textures/ai/game_ready/icons/rec_dot.png")
|
||||||
const T_CARD_ID := preload("res://assets/textures/cards/id_card.png")
|
const T_CARD_ID := preload("res://assets/textures/ai/game_ready/cards/id_card.png")
|
||||||
const T_CARD_WRIST := preload("res://assets/textures/cards/wristband.png")
|
const T_CARD_WRIST := preload("res://assets/textures/ai/game_ready/cards/wristband.png")
|
||||||
const T_CARD_TICKET := preload("res://assets/textures/cards/ticket.png")
|
const T_CARD_TICKET := preload("res://assets/textures/ai/game_ready/cards/ticket.png")
|
||||||
const T_CARD_CRED := preload("res://assets/textures/cards/credential.png")
|
const T_CARD_CRED := preload("res://assets/textures/ai/game_ready/cards/credential.png")
|
||||||
const T_CARD_GUEST := preload("res://assets/textures/cards/guest_list.png")
|
const T_CARD_GUEST := preload("res://assets/textures/ai/game_ready/cards/guest_list.png")
|
||||||
const CARD_TEXTURES := {
|
const CARD_TEXTURES := {
|
||||||
Rules.AccessKind.ID: T_CARD_ID,
|
Rules.AccessKind.ID: T_CARD_ID,
|
||||||
Rules.AccessKind.WRISTBAND: T_CARD_WRIST,
|
Rules.AccessKind.WRISTBAND: T_CARD_WRIST,
|
||||||
@@ -47,6 +47,8 @@ var escalation_label: Label
|
|||||||
|
|
||||||
var _debug_enabled := false
|
var _debug_enabled := false
|
||||||
var _log_lines: Array[String] = []
|
var _log_lines: Array[String] = []
|
||||||
|
var _cam_overlay: Control = null
|
||||||
|
var _body_camera_on := false
|
||||||
|
|
||||||
func _init() -> void:
|
func _init() -> void:
|
||||||
name = "HUD"
|
name = "HUD"
|
||||||
@@ -138,11 +140,19 @@ func _init() -> void:
|
|||||||
add_child(vignette_rect)
|
add_child(vignette_rect)
|
||||||
|
|
||||||
# --- body-camera overlay (REC + shift clock + corner brackets, top right) ---
|
# --- body-camera overlay (REC + shift clock + corner brackets, top right) ---
|
||||||
|
# Toggled by the body-camera flag (PLAN Level 2); off until the guard activates
|
||||||
|
# it or issues a formal warning.
|
||||||
|
_cam_overlay = Control.new()
|
||||||
|
_cam_overlay.name = "BodyCameraOverlay"
|
||||||
|
_cam_overlay.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
_cam_overlay.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
_cam_overlay.visible = false
|
||||||
|
add_child(_cam_overlay)
|
||||||
var cam_box := VBoxContainer.new()
|
var cam_box := VBoxContainer.new()
|
||||||
cam_box.set_anchors_preset(Control.PRESET_TOP_RIGHT)
|
cam_box.set_anchors_preset(Control.PRESET_TOP_RIGHT)
|
||||||
cam_box.position = Vector2(-180, 12)
|
cam_box.position = Vector2(-180, 50)
|
||||||
cam_box.alignment = BoxContainer.ALIGNMENT_END
|
cam_box.alignment = BoxContainer.ALIGNMENT_END
|
||||||
add_child(cam_box)
|
_cam_overlay.add_child(cam_box)
|
||||||
var rec_row := HBoxContainer.new()
|
var rec_row := HBoxContainer.new()
|
||||||
rec_row.alignment = BoxContainer.ALIGNMENT_END
|
rec_row.alignment = BoxContainer.ALIGNMENT_END
|
||||||
cam_box.add_child(rec_row)
|
cam_box.add_child(rec_row)
|
||||||
@@ -180,9 +190,12 @@ func _init() -> void:
|
|||||||
icon_row.add_child(wand_icon)
|
icon_row.add_child(wand_icon)
|
||||||
|
|
||||||
# --- inspect panel (popup center) ---
|
# --- inspect panel (popup center) ---
|
||||||
|
var inspect_center := CenterContainer.new()
|
||||||
|
inspect_center.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
inspect_center.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
add_child(inspect_center)
|
||||||
inspect_panel = PanelContainer.new()
|
inspect_panel = PanelContainer.new()
|
||||||
inspect_panel.visible = false
|
inspect_panel.visible = false
|
||||||
inspect_panel.set_anchors_preset(Control.PRESET_CENTER)
|
|
||||||
inspect_panel.modulate.a = 1.0
|
inspect_panel.modulate.a = 1.0
|
||||||
var ivbox := VBoxContainer.new()
|
var ivbox := VBoxContainer.new()
|
||||||
inspect_panel.add_child(ivbox)
|
inspect_panel.add_child(ivbox)
|
||||||
@@ -197,12 +210,15 @@ func _init() -> void:
|
|||||||
insp_hint.text = "A = allow entry D = deny entry"
|
insp_hint.text = "A = allow entry D = deny entry"
|
||||||
insp_hint.add_theme_font_size_override("font_size", 12)
|
insp_hint.add_theme_font_size_override("font_size", 12)
|
||||||
ivbox.add_child(insp_hint)
|
ivbox.add_child(insp_hint)
|
||||||
add_child(inspect_panel)
|
inspect_center.add_child(inspect_panel)
|
||||||
|
|
||||||
# --- wand screening panel (popup center) ---
|
# --- wand screening panel (popup center) ---
|
||||||
|
var wand_center := CenterContainer.new()
|
||||||
|
wand_center.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
wand_center.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
add_child(wand_center)
|
||||||
wand_panel = PanelContainer.new()
|
wand_panel = PanelContainer.new()
|
||||||
wand_panel.visible = false
|
wand_panel.visible = false
|
||||||
wand_panel.set_anchors_preset(Control.PRESET_CENTER)
|
|
||||||
var wvbox := VBoxContainer.new()
|
var wvbox := VBoxContainer.new()
|
||||||
wand_panel.add_child(wvbox)
|
wand_panel.add_child(wvbox)
|
||||||
wand_text = Label.new()
|
wand_text = Label.new()
|
||||||
@@ -216,7 +232,7 @@ func _init() -> void:
|
|||||||
wand_hint.text = "A = admit D = refuse entry"
|
wand_hint.text = "A = admit D = refuse entry"
|
||||||
wand_hint.add_theme_font_size_override("font_size", 12)
|
wand_hint.add_theme_font_size_override("font_size", 12)
|
||||||
wvbox.add_child(wand_hint)
|
wvbox.add_child(wand_hint)
|
||||||
add_child(wand_panel)
|
wand_center.add_child(wand_panel)
|
||||||
|
|
||||||
# --- debug overlay ---
|
# --- debug overlay ---
|
||||||
debug_label = Label.new()
|
debug_label = Label.new()
|
||||||
@@ -273,6 +289,28 @@ func set_wand_icon(visible: bool) -> void:
|
|||||||
if wand_icon:
|
if wand_icon:
|
||||||
wand_icon.visible = visible
|
wand_icon.visible = visible
|
||||||
|
|
||||||
|
## Show or hide the body-camera overlay (REC + clock + brackets). The flag is a
|
||||||
|
## record of the interaction (PLAN Level 2), not a permanent HUD fixture.
|
||||||
|
func set_body_camera(on: bool) -> void:
|
||||||
|
_body_camera_on = on
|
||||||
|
if _cam_overlay:
|
||||||
|
_cam_overlay.visible = on
|
||||||
|
|
||||||
|
func is_body_camera_on() -> bool:
|
||||||
|
return _body_camera_on
|
||||||
|
|
||||||
|
## Scale the whole HUD text block (accessibility settings).
|
||||||
|
func set_font_scale(scale: float) -> void:
|
||||||
|
var clamped := clampf(scale, 0.75, 1.75)
|
||||||
|
if top_label:
|
||||||
|
top_label.scale = Vector2(clamped, clamped)
|
||||||
|
if log_label:
|
||||||
|
log_label.scale = Vector2(clamped, clamped)
|
||||||
|
if target_label:
|
||||||
|
target_label.scale = Vector2(clamped, clamped)
|
||||||
|
if hint_label:
|
||||||
|
hint_label.scale = Vector2(clamped, clamped)
|
||||||
|
|
||||||
func _make_icon(texture: Texture2D) -> TextureRect:
|
func _make_icon(texture: Texture2D) -> TextureRect:
|
||||||
var tr := TextureRect.new()
|
var tr := TextureRect.new()
|
||||||
tr.texture = texture
|
tr.texture = texture
|
||||||
@@ -290,6 +328,7 @@ func _add_corner_brackets(color: Color) -> void:
|
|||||||
var corners := [
|
var corners := [
|
||||||
Vector2(OFF, OFF), Vector2(vp.x - OFF, OFF), Vector2(OFF, vp.y - OFF), Vector2(vp.x - OFF, vp.y - OFF),
|
Vector2(OFF, OFF), Vector2(vp.x - OFF, OFF), Vector2(OFF, vp.y - OFF), Vector2(vp.x - OFF, vp.y - OFF),
|
||||||
]
|
]
|
||||||
|
var parent: Node = _cam_overlay if _cam_overlay != null else self
|
||||||
for i in 4:
|
for i in 4:
|
||||||
var c: Vector2 = corners[i]
|
var c: Vector2 = corners[i]
|
||||||
var flip_x: bool = (i % 2) == 1
|
var flip_x: bool = (i % 2) == 1
|
||||||
@@ -299,13 +338,13 @@ func _add_corner_brackets(color: Color) -> void:
|
|||||||
h.size = Vector2(LEN, TH)
|
h.size = Vector2(LEN, TH)
|
||||||
h.position = Vector2(c.x - (LEN if flip_x else 0.0), c.y - (TH if flip_y else 0.0))
|
h.position = Vector2(c.x - (LEN if flip_x else 0.0), c.y - (TH if flip_y else 0.0))
|
||||||
h.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
h.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
add_child(h)
|
parent.add_child(h)
|
||||||
var v := ColorRect.new()
|
var v := ColorRect.new()
|
||||||
v.color = color
|
v.color = color
|
||||||
v.size = Vector2(TH, LEN)
|
v.size = Vector2(TH, LEN)
|
||||||
v.position = Vector2(c.x - (TH if flip_x else 0.0), c.y - (LEN if flip_y else 0.0))
|
v.position = Vector2(c.x - (TH if flip_x else 0.0), c.y - (LEN if flip_y else 0.0))
|
||||||
v.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
v.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
add_child(v)
|
parent.add_child(v)
|
||||||
|
|
||||||
func set_action_hint(text: String) -> void:
|
func set_action_hint(text: String) -> void:
|
||||||
hint_label.text = text
|
hint_label.text = text
|
||||||
@@ -374,6 +413,7 @@ func show_inspection(controller: Object, artifacts: Array, result: Dictionary) -
|
|||||||
continue
|
continue
|
||||||
var card := TextureRect.new()
|
var card := TextureRect.new()
|
||||||
card.texture = tex
|
card.texture = tex
|
||||||
|
card.expand_mode = TextureRect.EXPAND_IGNORE_SIZE
|
||||||
card.custom_minimum_size = Vector2(92, 58)
|
card.custom_minimum_size = Vector2(92, 58)
|
||||||
card.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED
|
card.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_CENTERED
|
||||||
card.tooltip_text = artifact.summary()
|
card.tooltip_text = artifact.summary()
|
||||||
@@ -382,7 +422,8 @@ func show_inspection(controller: Object, artifacts: Array, result: Dictionary) -
|
|||||||
card_row.add_child(card)
|
card_row.add_child(card)
|
||||||
added_card = true
|
added_card = true
|
||||||
if added_card:
|
if added_card:
|
||||||
inspect_panel.add_child(card_row)
|
var content := inspect_panel.get_child(0) as VBoxContainer
|
||||||
|
content.add_child(card_row)
|
||||||
var lines: Array[String] = []
|
var lines: Array[String] = []
|
||||||
for artifact in artifacts:
|
for artifact in artifacts:
|
||||||
lines.append(" • " + artifact.summary())
|
lines.append(" • " + artifact.summary())
|
||||||
@@ -403,7 +444,7 @@ func _clear_card_row() -> void:
|
|||||||
return
|
return
|
||||||
var row := inspect_panel.find_child("INSPECT_CARD_ROW", true, false) as Control
|
var row := inspect_panel.find_child("INSPECT_CARD_ROW", true, false) as Control
|
||||||
if row:
|
if row:
|
||||||
inspect_panel.remove_child(row)
|
row.get_parent().remove_child(row)
|
||||||
row.queue_free()
|
row.queue_free()
|
||||||
|
|
||||||
func show_wand(controller: Object, result: Dictionary) -> void:
|
func show_wand(controller: Object, result: Dictionary) -> void:
|
||||||
|
|||||||
@@ -0,0 +1,84 @@
|
|||||||
|
class_name PauseOverlay
|
||||||
|
extends CanvasLayer
|
||||||
|
## Shift pause overlay: resume, restart the shift, open settings, or quit to the
|
||||||
|
## venue menu. Opened with Esc from the world (or a dedicated pause action) and
|
||||||
|
## while the overlay is open the guard is frozen.
|
||||||
|
|
||||||
|
signal resume_requested()
|
||||||
|
signal restart_requested()
|
||||||
|
signal settings_requested()
|
||||||
|
signal quit_to_menu_requested()
|
||||||
|
|
||||||
|
var _root: Control = null
|
||||||
|
var _resume_button: Button = null
|
||||||
|
|
||||||
|
func _ready() -> void:
|
||||||
|
layer = 18
|
||||||
|
_build()
|
||||||
|
hide()
|
||||||
|
|
||||||
|
func _build() -> void:
|
||||||
|
_root = Control.new()
|
||||||
|
_root.name = "PauseRoot"
|
||||||
|
_root.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
_root.mouse_filter = Control.MOUSE_FILTER_STOP
|
||||||
|
add_child(_root)
|
||||||
|
|
||||||
|
var bg := ColorRect.new()
|
||||||
|
bg.color = Color(0.02, 0.03, 0.05, 0.82)
|
||||||
|
bg.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
bg.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
_root.add_child(bg)
|
||||||
|
|
||||||
|
var center := CenterContainer.new()
|
||||||
|
center.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
_root.add_child(center)
|
||||||
|
|
||||||
|
var column := VBoxContainer.new()
|
||||||
|
column.custom_minimum_size = Vector2(320, 0)
|
||||||
|
column.add_theme_constant_override("separation", 10)
|
||||||
|
center.add_child(column)
|
||||||
|
|
||||||
|
var title := Label.new()
|
||||||
|
title.text = "Paused"
|
||||||
|
title.add_theme_font_size_override("font_size", 36)
|
||||||
|
title.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||||
|
column.add_child(title)
|
||||||
|
|
||||||
|
_resume_button = _add_button(column, "Resume", "ResumeButton", func(): resume_requested.emit())
|
||||||
|
_add_button(column, "Restart shift", "RestartButton", func(): restart_requested.emit())
|
||||||
|
_add_button(column, "Settings", "SettingsButton", func(): settings_requested.emit())
|
||||||
|
_add_button(column, "Quit to menu", "MenuButton", func(): quit_to_menu_requested.emit())
|
||||||
|
|
||||||
|
var hint := Label.new()
|
||||||
|
hint.text = "Esc resumes"
|
||||||
|
hint.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||||
|
hint.add_theme_color_override("font_color", Color(0.55, 0.58, 0.65))
|
||||||
|
column.add_child(hint)
|
||||||
|
|
||||||
|
func _add_button(parent: Control, text: String, node_name: String, cb: Callable) -> Button:
|
||||||
|
var button := Button.new()
|
||||||
|
button.name = node_name
|
||||||
|
button.text = text
|
||||||
|
button.custom_minimum_size = Vector2(320, 44)
|
||||||
|
button.pressed.connect(cb)
|
||||||
|
parent.add_child(button)
|
||||||
|
return button
|
||||||
|
|
||||||
|
func open() -> void:
|
||||||
|
visible = true
|
||||||
|
_root.visible = true
|
||||||
|
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||||
|
if _resume_button:
|
||||||
|
_resume_button.grab_focus()
|
||||||
|
|
||||||
|
func close() -> void:
|
||||||
|
visible = false
|
||||||
|
_root.visible = false
|
||||||
|
|
||||||
|
func _unhandled_input(event: InputEvent) -> void:
|
||||||
|
if not visible:
|
||||||
|
return
|
||||||
|
if event is InputEventKey and event.pressed and not event.echo and event.keycode == KEY_ESCAPE:
|
||||||
|
resume_requested.emit()
|
||||||
|
get_viewport().set_input_as_handled()
|
||||||
@@ -34,9 +34,12 @@ func _init() -> void:
|
|||||||
dim.set_anchors_preset(Control.PRESET_FULL_RECT)
|
dim.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
add_child(dim)
|
add_child(dim)
|
||||||
|
|
||||||
|
var center := CenterContainer.new()
|
||||||
|
center.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
center.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
add_child(center)
|
||||||
panel = PanelContainer.new()
|
panel = PanelContainer.new()
|
||||||
panel.set_anchors_preset(Control.PRESET_CENTER)
|
center.add_child(panel)
|
||||||
add_child(panel)
|
|
||||||
|
|
||||||
var vbox := VBoxContainer.new()
|
var vbox := VBoxContainer.new()
|
||||||
panel.add_child(vbox)
|
panel.add_child(vbox)
|
||||||
|
|||||||
@@ -0,0 +1,154 @@
|
|||||||
|
class_name SettingsPanel
|
||||||
|
extends CanvasLayer
|
||||||
|
## Settings: mouse look sensitivity and HUD font scale, persisted through the
|
||||||
|
## `Save` autoload into `user://settings.json`.
|
||||||
|
##
|
||||||
|
## Emits `applied(settings)` so the game manager can push values into the guard
|
||||||
|
## and HUD as soon as the player confirms.
|
||||||
|
|
||||||
|
signal applied(settings: Dictionary)
|
||||||
|
signal closed()
|
||||||
|
|
||||||
|
var _root: Control = null
|
||||||
|
var _sensitivity: HSlider = null
|
||||||
|
var _font_scale: HSlider = null
|
||||||
|
var _sensitivity_value: Label = null
|
||||||
|
var _font_scale_value: Label = null
|
||||||
|
var settings: Dictionary = {}
|
||||||
|
|
||||||
|
func _ready() -> void:
|
||||||
|
layer = 22
|
||||||
|
_build()
|
||||||
|
hide()
|
||||||
|
|
||||||
|
func _init() -> void:
|
||||||
|
layer = 22
|
||||||
|
_build()
|
||||||
|
hide()
|
||||||
|
|
||||||
|
func _build() -> void:
|
||||||
|
_root = Control.new()
|
||||||
|
_root.name = "SettingsRoot"
|
||||||
|
_root.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
_root.mouse_filter = Control.MOUSE_FILTER_STOP
|
||||||
|
add_child(_root)
|
||||||
|
|
||||||
|
var bg := ColorRect.new()
|
||||||
|
bg.color = Color(0.02, 0.03, 0.05, 0.9)
|
||||||
|
bg.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
bg.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
_root.add_child(bg)
|
||||||
|
|
||||||
|
var center := CenterContainer.new()
|
||||||
|
center.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
_root.add_child(center)
|
||||||
|
|
||||||
|
var column := VBoxContainer.new()
|
||||||
|
column.custom_minimum_size = Vector2(420, 0)
|
||||||
|
column.add_theme_constant_override("separation", 12)
|
||||||
|
center.add_child(column)
|
||||||
|
|
||||||
|
var title := Label.new()
|
||||||
|
title.text = "Settings"
|
||||||
|
title.add_theme_font_size_override("font_size", 32)
|
||||||
|
title.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||||
|
column.add_child(title)
|
||||||
|
|
||||||
|
var sens_row := VBoxContainer.new()
|
||||||
|
column.add_child(sens_row)
|
||||||
|
_sensitivity_value = _add_label_row(sens_row, "Mouse look sensitivity")
|
||||||
|
_sensitivity = _add_slider(sens_row, 0.0005, 0.0060, 0.0001)
|
||||||
|
_sensitivity.value_changed.connect(_on_sensitivity_changed)
|
||||||
|
|
||||||
|
var font_row := VBoxContainer.new()
|
||||||
|
column.add_child(font_row)
|
||||||
|
_font_scale_value = _add_label_row(font_row, "HUD font scale")
|
||||||
|
_font_scale = _add_slider(font_row, 0.75, 1.75, 0.05)
|
||||||
|
_font_scale.value_changed.connect(_on_font_scale_changed)
|
||||||
|
|
||||||
|
var row := HBoxContainer.new()
|
||||||
|
row.alignment = BoxContainer.ALIGNMENT_CENTER
|
||||||
|
row.add_theme_constant_override("separation", 12)
|
||||||
|
column.add_child(row)
|
||||||
|
|
||||||
|
var save_button := Button.new()
|
||||||
|
save_button.name = "ApplyButton"
|
||||||
|
save_button.text = "Apply"
|
||||||
|
save_button.pressed.connect(_on_apply)
|
||||||
|
row.add_child(save_button)
|
||||||
|
|
||||||
|
var cancel_button := Button.new()
|
||||||
|
cancel_button.name = "CancelButton"
|
||||||
|
cancel_button.text = "Cancel"
|
||||||
|
cancel_button.pressed.connect(_on_cancel)
|
||||||
|
row.add_child(cancel_button)
|
||||||
|
|
||||||
|
func _add_label_row(parent: Control, text: String) -> Label:
|
||||||
|
var row := HBoxContainer.new()
|
||||||
|
parent.add_child(row)
|
||||||
|
var label := Label.new()
|
||||||
|
label.text = text
|
||||||
|
label.size_flags_horizontal = Control.SIZE_EXPAND_FILL
|
||||||
|
row.add_child(label)
|
||||||
|
var value := Label.new()
|
||||||
|
value.add_theme_color_override("font_color", Color(0.75, 0.8, 0.9))
|
||||||
|
row.add_child(value)
|
||||||
|
return value
|
||||||
|
|
||||||
|
func _add_slider(parent: Control, min_v: float, max_v: float, step: float) -> HSlider:
|
||||||
|
var slider := HSlider.new()
|
||||||
|
slider.min_value = min_v
|
||||||
|
slider.max_value = max_v
|
||||||
|
slider.step = step
|
||||||
|
slider.custom_minimum_size = Vector2(420, 24)
|
||||||
|
parent.add_child(slider)
|
||||||
|
return slider
|
||||||
|
|
||||||
|
func open(current: Dictionary) -> void:
|
||||||
|
settings = current.duplicate(true)
|
||||||
|
var sens: float = float(settings.get("look_sensitivity", 0.0022))
|
||||||
|
var scale: float = float(settings.get("hud_font_scale", 1.0))
|
||||||
|
if _sensitivity:
|
||||||
|
_sensitivity.set_value_no_signal(clampf(sens, _sensitivity.min_value, _sensitivity.max_value))
|
||||||
|
if _font_scale:
|
||||||
|
_font_scale.set_value_no_signal(clampf(scale, _font_scale.min_value, _font_scale.max_value))
|
||||||
|
_sync_labels()
|
||||||
|
visible = true
|
||||||
|
_root.visible = true
|
||||||
|
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||||
|
|
||||||
|
func close() -> void:
|
||||||
|
visible = false
|
||||||
|
_root.visible = false
|
||||||
|
|
||||||
|
func _sync_labels() -> void:
|
||||||
|
if _sensitivity_value and _sensitivity:
|
||||||
|
_sensitivity_value.text = "%.4f" % _sensitivity.value
|
||||||
|
if _font_scale_value and _font_scale:
|
||||||
|
_font_scale_value.text = "%.2fx" % _font_scale.value
|
||||||
|
|
||||||
|
func _on_sensitivity_changed(value: float) -> void:
|
||||||
|
settings["look_sensitivity"] = value
|
||||||
|
_sync_labels()
|
||||||
|
|
||||||
|
func _on_font_scale_changed(value: float) -> void:
|
||||||
|
settings["hud_font_scale"] = value
|
||||||
|
_sync_labels()
|
||||||
|
|
||||||
|
func _on_apply() -> void:
|
||||||
|
if Save:
|
||||||
|
Save.save_settings(settings)
|
||||||
|
applied.emit(settings)
|
||||||
|
close()
|
||||||
|
closed.emit()
|
||||||
|
|
||||||
|
func _on_cancel() -> void:
|
||||||
|
close()
|
||||||
|
closed.emit()
|
||||||
|
|
||||||
|
func _unhandled_input(event: InputEvent) -> void:
|
||||||
|
if not visible:
|
||||||
|
return
|
||||||
|
if event is InputEventKey and event.pressed and not event.echo and event.keycode == KEY_ESCAPE:
|
||||||
|
_on_cancel()
|
||||||
|
get_viewport().set_input_as_handled()
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
class_name StartMenu
|
||||||
|
extends CanvasLayer
|
||||||
|
## Startup menu: pick a venue, start the shift, open settings, or quit.
|
||||||
|
## Keyboard and mouse both work. Replaces `V` as the player-facing venue path
|
||||||
|
## (the `V` bind stays as a debug shortcut).
|
||||||
|
|
||||||
|
signal venue_selected(scenario_id: String)
|
||||||
|
signal settings_requested()
|
||||||
|
signal quit_requested()
|
||||||
|
|
||||||
|
const VENUES := [
|
||||||
|
{"id": "hollywood_building", "label": "Hollywood Boulevard", "blurb": "Building entrance, tourists and late-night trouble."},
|
||||||
|
{"id": "joke_shop", "label": "The Joke Shop", "blurb": "Guest list, IDs and wand screening."},
|
||||||
|
{"id": "tv_studio", "label": "Late Night TV Studio", "blurb": "Credentials, filming boundary, celebrity arrivals."},
|
||||||
|
]
|
||||||
|
|
||||||
|
var _index := 0
|
||||||
|
var _buttons: Array[Button] = []
|
||||||
|
var _root: Control = null
|
||||||
|
|
||||||
|
func _ready() -> void:
|
||||||
|
layer = 20
|
||||||
|
_build()
|
||||||
|
hide()
|
||||||
|
|
||||||
|
func _build() -> void:
|
||||||
|
_root = Control.new()
|
||||||
|
_root.name = "StartMenuRoot"
|
||||||
|
_root.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
_root.mouse_filter = Control.MOUSE_FILTER_STOP
|
||||||
|
add_child(_root)
|
||||||
|
|
||||||
|
var bg := ColorRect.new()
|
||||||
|
bg.color = Color(0.03, 0.04, 0.07, 0.96)
|
||||||
|
bg.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
bg.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||||
|
_root.add_child(bg)
|
||||||
|
|
||||||
|
var center := CenterContainer.new()
|
||||||
|
center.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||||
|
_root.add_child(center)
|
||||||
|
|
||||||
|
var column := VBoxContainer.new()
|
||||||
|
column.name = "Column"
|
||||||
|
column.custom_minimum_size = Vector2(460, 0)
|
||||||
|
column.add_theme_constant_override("separation", 14)
|
||||||
|
center.add_child(column)
|
||||||
|
|
||||||
|
var title := Label.new()
|
||||||
|
title.text = "STEP LINE"
|
||||||
|
title.add_theme_font_size_override("font_size", 44)
|
||||||
|
title.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||||
|
column.add_child(title)
|
||||||
|
|
||||||
|
var subtitle := Label.new()
|
||||||
|
subtitle.text = "Pick a venue to start your shift."
|
||||||
|
subtitle.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||||
|
subtitle.add_theme_color_override("font_color", Color(0.72, 0.75, 0.82))
|
||||||
|
column.add_child(subtitle)
|
||||||
|
|
||||||
|
for i in VENUES.size():
|
||||||
|
var venue: Dictionary = VENUES[i]
|
||||||
|
var button := Button.new()
|
||||||
|
button.name = "Venue_%s" % venue["id"]
|
||||||
|
button.text = "%s\n%s" % [venue["label"], venue["blurb"]]
|
||||||
|
button.alignment = HORIZONTAL_ALIGNMENT_LEFT
|
||||||
|
button.custom_minimum_size = Vector2(460, 62)
|
||||||
|
button.pressed.connect(_on_venue_pressed.bind(i))
|
||||||
|
column.add_child(button)
|
||||||
|
_buttons.append(button)
|
||||||
|
|
||||||
|
var spacer := Control.new()
|
||||||
|
spacer.custom_minimum_size = Vector2(0, 10)
|
||||||
|
column.add_child(spacer)
|
||||||
|
|
||||||
|
var row := HBoxContainer.new()
|
||||||
|
row.alignment = BoxContainer.ALIGNMENT_CENTER
|
||||||
|
row.add_theme_constant_override("separation", 12)
|
||||||
|
column.add_child(row)
|
||||||
|
|
||||||
|
var settings_button := Button.new()
|
||||||
|
settings_button.name = "SettingsButton"
|
||||||
|
settings_button.text = "Settings"
|
||||||
|
settings_button.pressed.connect(func(): settings_requested.emit())
|
||||||
|
row.add_child(settings_button)
|
||||||
|
|
||||||
|
var quit_button := Button.new()
|
||||||
|
quit_button.name = "QuitButton"
|
||||||
|
quit_button.text = "Quit"
|
||||||
|
quit_button.pressed.connect(func(): quit_requested.emit())
|
||||||
|
row.add_child(quit_button)
|
||||||
|
|
||||||
|
var hint := Label.new()
|
||||||
|
hint.text = "Up/Down to choose, Enter to start, Esc to quit"
|
||||||
|
hint.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||||
|
hint.add_theme_color_override("font_color", Color(0.55, 0.58, 0.65))
|
||||||
|
column.add_child(hint)
|
||||||
|
|
||||||
|
_focus_index(0)
|
||||||
|
|
||||||
|
func _focus_index(i: int) -> void:
|
||||||
|
if _buttons.is_empty():
|
||||||
|
return
|
||||||
|
_index = clampi(i, 0, _buttons.size() - 1)
|
||||||
|
_buttons[_index].grab_focus()
|
||||||
|
|
||||||
|
func open() -> void:
|
||||||
|
visible = true
|
||||||
|
_root.visible = true
|
||||||
|
Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
|
||||||
|
_focus_index(_index)
|
||||||
|
|
||||||
|
func close() -> void:
|
||||||
|
visible = false
|
||||||
|
_root.visible = false
|
||||||
|
|
||||||
|
func _unhandled_input(event: InputEvent) -> void:
|
||||||
|
if not visible:
|
||||||
|
return
|
||||||
|
if event is InputEventKey and event.pressed and not event.echo:
|
||||||
|
match event.keycode:
|
||||||
|
KEY_UP, KEY_W:
|
||||||
|
_focus_index(_index - 1)
|
||||||
|
get_viewport().set_input_as_handled()
|
||||||
|
KEY_DOWN, KEY_S:
|
||||||
|
_focus_index(_index + 1)
|
||||||
|
get_viewport().set_input_as_handled()
|
||||||
|
KEY_ENTER, KEY_KP_ENTER, KEY_SPACE:
|
||||||
|
_on_venue_pressed(_index)
|
||||||
|
get_viewport().set_input_as_handled()
|
||||||
|
KEY_ESCAPE:
|
||||||
|
quit_requested.emit()
|
||||||
|
get_viewport().set_input_as_handled()
|
||||||
|
|
||||||
|
func _on_venue_pressed(i: int) -> void:
|
||||||
|
if i < 0 or i >= VENUES.size():
|
||||||
|
return
|
||||||
|
var venue: Dictionary = VENUES[i]
|
||||||
|
close()
|
||||||
|
venue_selected.emit(str(venue["id"]))
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
class_name WorldBuilder
|
class_name WorldBuilder
|
||||||
## Procedurally assembles a minimal Hollywood Boulevard entrance prototype:
|
## Procedurally assembles a minimal Hollywood Boulevard entrance prototype:
|
||||||
|
|
||||||
const T_BRICK := preload("res://assets/textures/brick_facade.png")
|
const T_BRICK := preload("res://assets/textures/ai/game_ready/brick_facade.png")
|
||||||
const T_CONCRETE := preload("res://assets/textures/concrete.png")
|
const T_CONCRETE := preload("res://assets/textures/ai/game_ready/concrete.png")
|
||||||
const T_ASPHALT := preload("res://assets/textures/asphalt.png")
|
const T_ASPHALT := preload("res://assets/textures/ai/game_ready/asphalt.png")
|
||||||
const T_AWNING := preload("res://assets/textures/awning.png")
|
const T_AWNING := preload("res://assets/textures/ai/game_ready/awning.png")
|
||||||
const T_SKYLINE := preload("res://assets/textures/skyline.png")
|
const T_SKYLINE := preload("res://assets/textures/skyline.png")
|
||||||
## steps, building facade, restricted door, sidewalk, pavement, and street edge.
|
## steps, building facade, restricted door, sidewalk, pavement, and street edge.
|
||||||
## No art assets required; all geometry is BoxMesh with flat materials.
|
## No art assets required; all geometry is BoxMesh with flat materials.
|
||||||
@@ -26,6 +26,7 @@ func _init(root_node: Node3D) -> void:
|
|||||||
func build() -> void:
|
func build() -> void:
|
||||||
_build_ground()
|
_build_ground()
|
||||||
_build_building()
|
_build_building()
|
||||||
|
_build_skyline_backdrop()
|
||||||
_build_marquee()
|
_build_marquee()
|
||||||
_build_steps()
|
_build_steps()
|
||||||
_build_sidewalk()
|
_build_sidewalk()
|
||||||
@@ -33,7 +34,6 @@ func build() -> void:
|
|||||||
_build_crosswalk()
|
_build_crosswalk()
|
||||||
_build_street_furniture()
|
_build_street_furniture()
|
||||||
_build_guard_spawn()
|
_build_guard_spawn()
|
||||||
_build_skyline_backdrop()
|
|
||||||
_build_navmesh()
|
_build_navmesh()
|
||||||
set_night_mode(false)
|
set_night_mode(false)
|
||||||
|
|
||||||
@@ -57,9 +57,11 @@ func _add_box(parent: Node3D, size: Vector3, pos: Vector3, color: Color, cast_sh
|
|||||||
func _build_ground() -> void:
|
func _build_ground() -> void:
|
||||||
var ground := StaticBody3D.new()
|
var ground := StaticBody3D.new()
|
||||||
ground.name = "Ground"
|
ground.name = "Ground"
|
||||||
_add_box(root, Vector3(160, 0.5, 160), Vector3(0, -0.25, 20), Color(0.22, 0.24, 0.26))
|
# Large enough that the ground meets the distant skyline ring (no gap of sky
|
||||||
|
# under the buildings when looking down the boulevard).
|
||||||
|
_add_box(root, Vector3(500, 0.5, 500), Vector3(0, -0.25, 20), Color(0.22, 0.24, 0.26))
|
||||||
var col := BoxShape3D.new()
|
var col := BoxShape3D.new()
|
||||||
col.size = Vector3(160, 1, 160)
|
col.size = Vector3(500, 1, 500)
|
||||||
var shape_owner := ground.create_shape_owner(ground)
|
var shape_owner := ground.create_shape_owner(ground)
|
||||||
ground.shape_owner_add_shape(shape_owner, col)
|
ground.shape_owner_add_shape(shape_owner, col)
|
||||||
root.add_child(ground)
|
root.add_child(ground)
|
||||||
@@ -68,13 +70,13 @@ func _build_building() -> void:
|
|||||||
var building := StaticBody3D.new()
|
var building := StaticBody3D.new()
|
||||||
building.name = "Building"
|
building.name = "Building"
|
||||||
# Main facade (textured brick)
|
# Main facade (textured brick)
|
||||||
_add_box(building, Vector3(40, 18, 4), Vector3(0, 9, -2), Color(0.85, 0.8, 0.78), false, T_BRICK, Vector2(10, 5))
|
_add_box(building, Vector3(40, 18, 4), Vector3(0, 9, -6), Color(0.85, 0.8, 0.78), false, T_BRICK, Vector2(10, 5))
|
||||||
# Entrance recess + door recess frame
|
# Entrance recess + door recess frame
|
||||||
_add_box(building, Vector3(5.4, 6.4, 0.2), Vector3(0, 3.2, -4.0), Color(0.08, 0.08, 0.09))
|
_add_box(building, Vector3(5.4, 6.4, 0.2), Vector3(0, 3.2, -3.9), Color(0.08, 0.08, 0.09))
|
||||||
# Door frame and dark door
|
# Door frame and dark door
|
||||||
_add_box(building, Vector3(3.0, 5.2, 0.3), Vector3(0, 2.9, -4.15), Color(0.13, 0.12, 0.11))
|
_add_box(building, Vector3(3.0, 5.2, 0.3), Vector3(0, 2.9, -3.98), Color(0.13, 0.12, 0.11))
|
||||||
# Door glass (semi-transparent)
|
# Door glass (semi-transparent)
|
||||||
var glass := _add_box(building, Vector3(1.8, 1.4, 0.34), Vector3(0, 3.8, -4.0), 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, -3.9), Color(0.6, 0.75, 0.9, 0.55))
|
||||||
var glass_mat := StandardMaterial3D.new()
|
var glass_mat := StandardMaterial3D.new()
|
||||||
glass_mat.albedo_color = Color(0.6, 0.75, 0.9, 0.45)
|
glass_mat.albedo_color = Color(0.6, 0.75, 0.9, 0.45)
|
||||||
glass_mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
|
glass_mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
|
||||||
@@ -82,30 +84,42 @@ func _build_building() -> void:
|
|||||||
glass_mat.metallic = 0.1
|
glass_mat.metallic = 0.1
|
||||||
glass.material_override = glass_mat
|
glass.material_override = glass_mat
|
||||||
# Door lock indicator (green = open, red = locked), placed beside the handle
|
# 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, -4.35), Color(0.1, 0.9, 0.3))
|
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.material_override = _lock_indicator_material(Color(0.1, 0.9, 0.3))
|
door_indicator.material_override = _lock_indicator_material(Color(0.1, 0.9, 0.3))
|
||||||
var col := BoxShape3D.new()
|
var col := BoxShape3D.new()
|
||||||
col.size = Vector3(40, 18, 4)
|
col.size = Vector3(40, 18, 4)
|
||||||
var so := building.create_shape_owner(building)
|
var so := building.create_shape_owner(building)
|
||||||
building.shape_owner_add_shape(so, col)
|
building.shape_owner_add_shape(so, col)
|
||||||
building.shape_owner_set_transform(so, Transform3D(Basis(), Vector3(0, 9, -2)))
|
building.shape_owner_set_transform(so, Transform3D(Basis(), Vector3(0, 9, -6)))
|
||||||
root.add_child(building)
|
root.add_child(building)
|
||||||
|
|
||||||
func _build_steps() -> void:
|
func _build_steps() -> void:
|
||||||
# Steps are visual only (no collider) so NPCs and the guard can walk up the
|
# Steps have collision so NPCs and the guard can walk up the entrance.
|
||||||
# entrance on the flat navigation mesh; the ground and building provide the
|
# The ground and building provide the actual collision boundaries.
|
||||||
# actual collision boundaries.
|
var steps := StaticBody3D.new()
|
||||||
var steps := Node3D.new()
|
|
||||||
steps.name = "Steps"
|
steps.name = "Steps"
|
||||||
var step_w := 8.0
|
var step_w := 8.0
|
||||||
var tread := 0.6
|
var tread := 0.6
|
||||||
var height := 0.16
|
var height := 0.16
|
||||||
for i in 4:
|
for i in 4:
|
||||||
var y: float = i * height
|
var y: float = i * height
|
||||||
var z: float = i * tread
|
var z: float = 4.0 * tread - i * tread
|
||||||
_add_box(steps, Vector3(step_w - i * 0.35, height, tread), Vector3(0, y + height / 2.0, z), Color(0.55, 0.52, 0.5))
|
var w: float = step_w - i * 0.35
|
||||||
# Landing at the top
|
_add_box(steps, Vector3(w, height, tread), Vector3(0, y + height / 2.0, z), Color(0.55, 0.52, 0.5))
|
||||||
_add_box(steps, Vector3(9, 0.2, 3), Vector3(0, 4 * height + 0.1, -1.5), Color(0.5, 0.47, 0.45))
|
# Add collision shape to each tread
|
||||||
|
var tread_col := BoxShape3D.new()
|
||||||
|
tread_col.size = Vector3(w, height, tread)
|
||||||
|
var owner_id := steps.create_shape_owner(steps)
|
||||||
|
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
|
||||||
|
_add_box(steps, Vector3(9, 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)
|
||||||
|
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)))
|
||||||
root.add_child(steps)
|
root.add_child(steps)
|
||||||
|
|
||||||
func _build_sidewalk() -> void:
|
func _build_sidewalk() -> void:
|
||||||
@@ -152,6 +166,53 @@ func _build_navmesh() -> void:
|
|||||||
region.navigation_mesh = mesh
|
region.navigation_mesh = mesh
|
||||||
root.add_child(region)
|
root.add_child(region)
|
||||||
|
|
||||||
|
func _build_skyline_backdrop() -> void:
|
||||||
|
## Distant skyline surrounding the block. The texture's sky is transparent
|
||||||
|
## (alpha scissor), so only building silhouettes show. Four planes form a
|
||||||
|
## ring: a single plane placed behind the building reads as a floating black
|
||||||
|
## band from the sidewalk.
|
||||||
|
var backdrop := Node3D.new()
|
||||||
|
backdrop.name = "SkylineBackdrop"
|
||||||
|
var mat := StandardMaterial3D.new()
|
||||||
|
mat.albedo_texture = T_SKYLINE
|
||||||
|
mat.texture_repeat = true
|
||||||
|
mat.uv1_scale = Vector3(3.0, 1.0, 1.0)
|
||||||
|
mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA_SCISSOR
|
||||||
|
mat.alpha_scissor_threshold = 0.5
|
||||||
|
mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
|
||||||
|
mat.cull_mode = BaseMaterial3D.CULL_DISABLED
|
||||||
|
# Unshaded silhouettes read as pure black at 255-scale; lift the albedo so the
|
||||||
|
# distant skyline sits closer to a hazy daytime city.
|
||||||
|
mat.albedo_color = Color(2.6, 2.7, 3.0, 1.0)
|
||||||
|
_skyline_mat = mat
|
||||||
|
var mesh := PlaneMesh.new()
|
||||||
|
# PlaneMesh defaults to a horizontal (XZ) plane; the skyline must stand up.
|
||||||
|
mesh.orientation = PlaneMesh.FACE_Z
|
||||||
|
mesh.size = Vector2(400, 60)
|
||||||
|
# Far enough that the skyline reads as background and its top edge stays out
|
||||||
|
# of the middle of the sky.
|
||||||
|
const DIST := 200.0
|
||||||
|
# The texture keeps its buildings in the lower part of the image, so the plane
|
||||||
|
# center sits at half its height: the building bases meet the ground.
|
||||||
|
const CENTER_Y := 30.0
|
||||||
|
var placements := [
|
||||||
|
[Vector3(0, CENTER_Y, -DIST), 0.0],
|
||||||
|
[Vector3(0, CENTER_Y, DIST), 0.0],
|
||||||
|
[Vector3(-DIST, CENTER_Y, 0), PI / 2.0],
|
||||||
|
[Vector3(DIST, CENTER_Y, 0), PI / 2.0],
|
||||||
|
]
|
||||||
|
for placement in placements:
|
||||||
|
var plane := MeshInstance3D.new()
|
||||||
|
plane.mesh = mesh
|
||||||
|
plane.material_override = mat
|
||||||
|
plane.cast_shadow = GeometryInstance3D.SHADOW_CASTING_SETTING_OFF
|
||||||
|
plane.position = placement[0]
|
||||||
|
plane.rotation.y = placement[1]
|
||||||
|
backdrop.add_child(plane)
|
||||||
|
root.add_child(backdrop)
|
||||||
|
|
||||||
|
var _skyline_mat: StandardMaterial3D = null
|
||||||
|
|
||||||
func _build_marquee() -> void:
|
func _build_marquee() -> void:
|
||||||
## Striped awning above the door, then the neon sign strip + label.
|
## Striped awning above the door, then the neon sign strip + label.
|
||||||
var awning := _add_box(root, Vector3(10.5, 0.08, 1.8), Vector3(0, 6.55, -3.7), Color(1, 1, 1), false, T_AWNING)
|
var awning := _add_box(root, Vector3(10.5, 0.08, 1.8), Vector3(0, 6.55, -3.7), Color(1, 1, 1), false, T_AWNING)
|
||||||
@@ -169,9 +230,9 @@ func _build_marquee() -> void:
|
|||||||
marquee_label.text = "STEP LINE"
|
marquee_label.text = "STEP LINE"
|
||||||
marquee_label.position = Vector3(0, 7.3, -3.55)
|
marquee_label.position = Vector3(0, 7.3, -3.55)
|
||||||
marquee_label.modulate = Color(1, 0.6, 0.9)
|
marquee_label.modulate = Color(1, 0.6, 0.9)
|
||||||
marquee_label.font_size = 72
|
marquee_label.font_size = 160
|
||||||
marquee_label.pixel_size = 0.004
|
marquee_label.pixel_size = 0.004
|
||||||
marquee_label.outline_size = 12
|
marquee_label.outline_size = 24
|
||||||
marquee_label.outline_modulate = Color(0.9, 0.15, 0.5)
|
marquee_label.outline_modulate = Color(0.9, 0.15, 0.5)
|
||||||
marquee_label.billboard = BaseMaterial3D.BILLBOARD_ENABLED
|
marquee_label.billboard = BaseMaterial3D.BILLBOARD_ENABLED
|
||||||
marquee_label.no_depth_test = false
|
marquee_label.no_depth_test = false
|
||||||
@@ -206,8 +267,10 @@ func _build_street_furniture() -> void:
|
|||||||
# Low-poly trees along the street front.
|
# Low-poly trees along the street front.
|
||||||
var trunk_color := Color(0.35, 0.25, 0.18)
|
var trunk_color := Color(0.35, 0.25, 0.18)
|
||||||
var leaf_color := Color(0.16, 0.42, 0.2)
|
var leaf_color := Color(0.16, 0.42, 0.2)
|
||||||
|
# Flank the walkway; keep the sight line to the door clear.
|
||||||
for i in 6:
|
for i in 6:
|
||||||
var x := -11.0 + i * 4.4
|
var side := -1.0 if i % 2 == 0 else 1.0
|
||||||
|
var x := side * (6.5 + float(int(i / 2)) * 3.0)
|
||||||
var z := 4.0 + float((i * 7) % 5)
|
var z := 4.0 + float((i * 7) % 5)
|
||||||
var tree := Node3D.new()
|
var tree := Node3D.new()
|
||||||
tree.name = "Tree_%d" % (i + 1)
|
tree.name = "Tree_%d" % (i + 1)
|
||||||
@@ -261,32 +324,15 @@ func _plain_material(color: Color) -> StandardMaterial3D:
|
|||||||
mat.albedo_color = color
|
mat.albedo_color = color
|
||||||
return mat
|
return mat
|
||||||
|
|
||||||
func _build_skyline_backdrop() -> void:
|
|
||||||
## Distant procedural skyline on four unshaded planes around the block.
|
|
||||||
var mat := StandardMaterial3D.new()
|
|
||||||
mat.albedo_texture = T_SKYLINE
|
|
||||||
mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
|
|
||||||
mat.transparency = BaseMaterial3D.TRANSPARENCY_ALPHA
|
|
||||||
mat.cull_mode = BaseMaterial3D.CULL_DISABLED
|
|
||||||
const DIST := 95.0
|
|
||||||
const HEIGHT := 90.0
|
|
||||||
for i in 4:
|
|
||||||
var plane := MeshInstance3D.new()
|
|
||||||
plane.name = "Skyline_%d" % i
|
|
||||||
var pm := PlaneMesh.new()
|
|
||||||
pm.size = Vector2(300, HEIGHT)
|
|
||||||
plane.mesh = pm
|
|
||||||
plane.material_override = mat
|
|
||||||
var angle := i * 90.0
|
|
||||||
plane.position = Vector3(sin(deg_to_rad(angle)) * DIST, HEIGHT / 2.0, cos(deg_to_rad(angle)) * DIST)
|
|
||||||
plane.rotation_degrees = Vector3(0, -angle + 90.0, 0)
|
|
||||||
plane.cast_shadow = (0 as GeometryInstance3D.ShadowCastingSetting)
|
|
||||||
root.add_child(plane)
|
|
||||||
|
|
||||||
func _build_guard_spawn() -> void:
|
func _build_guard_spawn() -> void:
|
||||||
var marker := Marker3D.new()
|
var marker := Marker3D.new()
|
||||||
marker.name = "GuardSpawn"
|
marker.name = "GuardSpawn"
|
||||||
marker.position = Vector3(0, 1.6, -2.5)
|
# Guard spawns on the landing at the top of the steps, facing the street.
|
||||||
|
# The landing is at y=4*height+0.1 where height=0.16, so y=0.76
|
||||||
|
# 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)
|
||||||
root.add_child(marker)
|
root.add_child(marker)
|
||||||
|
|
||||||
func _lock_indicator_material(color: Color) -> StandardMaterial3D:
|
func _lock_indicator_material(color: Color) -> StandardMaterial3D:
|
||||||
|
|||||||
@@ -12,9 +12,10 @@ var gm: Node = null
|
|||||||
var state := 0
|
var state := 0
|
||||||
var state_frames := 0
|
var state_frames := 0
|
||||||
var targeted := false
|
var targeted := false
|
||||||
|
var camera_staged := false
|
||||||
|
|
||||||
func _initialize() -> void:
|
func _initialize() -> void:
|
||||||
root.size = Vector2i(1600, 900)
|
root.size = Vector2i(1280, 720)
|
||||||
var packed: PackedScene = load("res://scenes/main.tscn")
|
var packed: PackedScene = load("res://scenes/main.tscn")
|
||||||
var inst: Node = packed.instantiate()
|
var inst: Node = packed.instantiate()
|
||||||
root.add_child(inst)
|
root.add_child(inst)
|
||||||
@@ -29,6 +30,15 @@ func _process(_delta: float) -> bool:
|
|||||||
push_error("GameManager not found")
|
push_error("GameManager not found")
|
||||||
quit(1)
|
quit(1)
|
||||||
return true
|
return true
|
||||||
|
if gm != null and not camera_staged:
|
||||||
|
# The game boots into the venue menu now; start the Hollywood shift first.
|
||||||
|
var menu = gm.get("start_menu")
|
||||||
|
if menu != null and menu.visible:
|
||||||
|
gm.call("_on_venue_selected", "hollywood_building")
|
||||||
|
gm.guard.global_position = Vector3(0, 0.1, 10.5)
|
||||||
|
gm.guard.rotation.y = 0.0
|
||||||
|
gm.guard.head.rotation.x = deg_to_rad(2.0)
|
||||||
|
camera_staged = true
|
||||||
if frames > MAX_FRAMES:
|
if frames > MAX_FRAMES:
|
||||||
print("timeout reached")
|
print("timeout reached")
|
||||||
quit(0)
|
quit(0)
|
||||||
@@ -46,9 +56,11 @@ func _advance() -> void:
|
|||||||
state = 1
|
state = 1
|
||||||
state_frames = 0
|
state_frames = 0
|
||||||
1:
|
1:
|
||||||
# Wait for a nearby NPC so the interaction HUD has a target.
|
# Wait for a nearby NPC so the interaction HUD has a target. NPCs now
|
||||||
|
# walk in from the street, so this can take a few simulated seconds.
|
||||||
if gm != null and gm.npcs.size() > 0:
|
if gm != null and gm.npcs.size() > 0:
|
||||||
gm.call("_cycle_nearby_target")
|
gm.call("_cycle_nearby_target")
|
||||||
|
_face_target()
|
||||||
targeted = true
|
targeted = true
|
||||||
state = 2
|
state = 2
|
||||||
state_frames = 0
|
state_frames = 0
|
||||||
@@ -56,6 +68,7 @@ func _advance() -> void:
|
|||||||
if state_frames >= 30:
|
if state_frames >= 30:
|
||||||
_shoot("02-targeting-npc.png")
|
_shoot("02-targeting-npc.png")
|
||||||
if targeted and gm != null:
|
if targeted and gm != null:
|
||||||
|
_face_target()
|
||||||
gm.call("_toggle_inspection")
|
gm.call("_toggle_inspection")
|
||||||
state = 3
|
state = 3
|
||||||
state_frames = 0
|
state_frames = 0
|
||||||
@@ -75,24 +88,42 @@ func _advance() -> void:
|
|||||||
# Close the radio form, then jump the shift to the LATE phase.
|
# Close the radio form, then jump the shift to the LATE phase.
|
||||||
if gm != null:
|
if gm != null:
|
||||||
gm.radio_panel.hide()
|
gm.radio_panel.hide()
|
||||||
|
gm.hud.set_action_hint("")
|
||||||
gm.coordinator.elapsed_s = 750.0
|
gm.coordinator.elapsed_s = 750.0
|
||||||
state = 5
|
state = 5
|
||||||
state_frames = 0
|
state_frames = 0
|
||||||
5:
|
5:
|
||||||
# Let the phase transition (and street lamps / marquee) settle, then
|
# Stage the avenue view down the boulevard (not into the wall) and let
|
||||||
# take the night avenue shot.
|
# the night lighting and street lamps settle.
|
||||||
|
if state_frames == 1 and gm != null:
|
||||||
|
gm.guard.rotation.y = deg_to_rad(-70)
|
||||||
|
gm.guard.head.rotation.x = deg_to_rad(3.0)
|
||||||
if state_frames >= 90:
|
if state_frames >= 90:
|
||||||
_shoot("05-late-night-avenue.png")
|
_shoot("05-late-night-avenue.png")
|
||||||
if gm != null:
|
|
||||||
gm.call("_toggle_flashlight")
|
|
||||||
state = 6
|
state = 6
|
||||||
state_frames = 0
|
state_frames = 0
|
||||||
6:
|
6:
|
||||||
if state_frames >= 40:
|
# Face the entrance again and switch the flashlight on for the night set.
|
||||||
|
if state_frames == 1 and gm != null:
|
||||||
|
gm.guard.rotation.y = 0.0
|
||||||
|
gm.guard.head.rotation.x = deg_to_rad(4.0)
|
||||||
|
gm.call("_toggle_flashlight")
|
||||||
|
if state_frames >= 30:
|
||||||
_shoot("06-night-flashlight.png")
|
_shoot("06-night-flashlight.png")
|
||||||
state = 7
|
state = 7
|
||||||
quit(0)
|
quit(0)
|
||||||
|
|
||||||
|
func _face_target() -> void:
|
||||||
|
var target: Node3D = gm.targeted_npc
|
||||||
|
if target == null:
|
||||||
|
return
|
||||||
|
var to: Vector3 = target.global_position - gm.guard.global_position
|
||||||
|
to.y = 0.0
|
||||||
|
if to.length() < 0.01:
|
||||||
|
return
|
||||||
|
gm.guard.rotation.y = atan2(-to.x, -to.z)
|
||||||
|
gm.guard.head.rotation.x = deg_to_rad(-4.0)
|
||||||
|
|
||||||
func _shoot(file_name: String) -> void:
|
func _shoot(file_name: String) -> void:
|
||||||
var dir := DirAccess.open("user://")
|
var dir := DirAccess.open("user://")
|
||||||
if dir == null or not dir.dir_exists("screenshots"):
|
if dir == null or not dir.dir_exists("screenshots"):
|
||||||
|
|||||||
@@ -0,0 +1,114 @@
|
|||||||
|
extends SceneTree
|
||||||
|
## Crowd-presentation smoke: starts a shift, waits for bystanders to settle, then
|
||||||
|
## checks that an aggressive crowd event makes idle NPCs stop and watch, and that
|
||||||
|
## panic sends them away from the door.
|
||||||
|
##
|
||||||
|
## Usage:
|
||||||
|
## godot --headless --path . --script res://src/test/smoke_crowd.gd
|
||||||
|
## Exit code 0 = pass, 1 = failure.
|
||||||
|
|
||||||
|
const MAX_FRAMES := 2400
|
||||||
|
|
||||||
|
var frame := 0
|
||||||
|
var gm: Node = null
|
||||||
|
var started := false
|
||||||
|
var phase := 0
|
||||||
|
var failures: Array[String] = []
|
||||||
|
|
||||||
|
func _initialize() -> void:
|
||||||
|
root.size = Vector2i(1280, 720)
|
||||||
|
root.add_child(load("res://scenes/main.tscn").instantiate())
|
||||||
|
|
||||||
|
func _process(_delta: float) -> bool:
|
||||||
|
frame += 1
|
||||||
|
if gm == null:
|
||||||
|
gm = root.find_child("GameManager", true, false)
|
||||||
|
return false
|
||||||
|
if not started:
|
||||||
|
gm.call("_on_venue_selected", "hollywood_building")
|
||||||
|
started = true
|
||||||
|
return false
|
||||||
|
if frame > MAX_FRAMES:
|
||||||
|
_fail("timeout before crowd reactions were observed")
|
||||||
|
return true
|
||||||
|
match phase:
|
||||||
|
0:
|
||||||
|
if frame < 300:
|
||||||
|
return false
|
||||||
|
# Wait until at least one settled bystander is away from the door (someone
|
||||||
|
# waiting at the entrance is being dealt with and must not rubberneck).
|
||||||
|
if _bystander_count() == 0:
|
||||||
|
return false
|
||||||
|
gm.coordinator.crowd.apply_event("aggressive_behavior")
|
||||||
|
var watching := _count_mode("watch")
|
||||||
|
_check(watching > 0, "aggressive behavior makes idle NPCs watch (%d watching)" % watching)
|
||||||
|
phase = 1
|
||||||
|
1:
|
||||||
|
if frame < 320:
|
||||||
|
return false
|
||||||
|
var door: Vector3 = gm.selected_scenario._location_or_default("entrance", Vector3(0, 0.5, 1.2))
|
||||||
|
for npc in gm.npcs:
|
||||||
|
if is_instance_valid(npc) and npc.has_method("reaction_is_active"):
|
||||||
|
pass
|
||||||
|
gm.coordinator.crowd.apply_event("visible_weapon")
|
||||||
|
gm.coordinator.crowd.apply_event("aggressive_behavior")
|
||||||
|
gm.coordinator.crowd.apply_event("aggressive_behavior")
|
||||||
|
gm.coordinator.crowd.apply_event("emergency_responder")
|
||||||
|
_check(gm.coordinator.crowd.should_flee(), "stacked alarms panic the crowd")
|
||||||
|
var fleeing := _count_mode("flee")
|
||||||
|
_check(fleeing > 0, "panic sends NPCs away from the door (%d fleeing)" % fleeing)
|
||||||
|
var away_ok := true
|
||||||
|
for npc in gm.npcs:
|
||||||
|
if not is_instance_valid(npc) or npc.reaction_mode != "flee":
|
||||||
|
continue
|
||||||
|
if (npc.target_position - door).length() <= (npc.global_position - door).length():
|
||||||
|
away_ok = false
|
||||||
|
_check(away_ok, "every fleeing NPC targets a point farther from the door")
|
||||||
|
phase = 2
|
||||||
|
_:
|
||||||
|
_finish()
|
||||||
|
return true
|
||||||
|
return false
|
||||||
|
|
||||||
|
func _bystander_count() -> int:
|
||||||
|
var n := 0
|
||||||
|
for npc in gm.npcs:
|
||||||
|
if not is_instance_valid(npc) or not npc.arrived:
|
||||||
|
continue
|
||||||
|
if npc.awaiting_interaction and npc.global_position.distance_to(npc.door_position) < 3.0:
|
||||||
|
continue
|
||||||
|
n += 1
|
||||||
|
return n
|
||||||
|
|
||||||
|
func _settled_count() -> int:
|
||||||
|
var n := 0
|
||||||
|
for npc in gm.npcs:
|
||||||
|
if is_instance_valid(npc) and npc.arrived:
|
||||||
|
n += 1
|
||||||
|
return n
|
||||||
|
|
||||||
|
func _count_mode(mode: String) -> int:
|
||||||
|
var n := 0
|
||||||
|
for npc in gm.npcs:
|
||||||
|
if is_instance_valid(npc) and npc.reaction_mode == mode:
|
||||||
|
n += 1
|
||||||
|
return n
|
||||||
|
|
||||||
|
func _check(condition: bool, message: String) -> void:
|
||||||
|
if condition:
|
||||||
|
print("ok: " + message)
|
||||||
|
else:
|
||||||
|
_fail(message)
|
||||||
|
|
||||||
|
func _fail(message: String) -> void:
|
||||||
|
failures.append(message)
|
||||||
|
_finish()
|
||||||
|
|
||||||
|
func _finish() -> void:
|
||||||
|
if failures.is_empty():
|
||||||
|
print("SMOKE OK: crowd rubberneck and panic flee")
|
||||||
|
quit(0)
|
||||||
|
else:
|
||||||
|
for message in failures:
|
||||||
|
printerr("SMOKE FAIL: " + message)
|
||||||
|
quit(1)
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
extends SceneTree
|
||||||
|
## Windowed smoke helper for the ADR-0007–0010 control pass (focus ring + action
|
||||||
|
## wheel). Boots the real main scene, stages one NPC in front of the guard, opens
|
||||||
|
## the wheel, and saves two PNGs to user://screenshots/. Exits 1 if the focus or
|
||||||
|
## radial state did not come up, so it can be used as a smoke check.
|
||||||
|
## Usage: godot --path . --script res://src/test/smoke_focus_radial.gd
|
||||||
|
|
||||||
|
const OUT_DIR := "user://screenshots"
|
||||||
|
const MAX_FRAMES := 1800
|
||||||
|
const STAGE_DISTANCE := 2.4
|
||||||
|
|
||||||
|
var frames := 0
|
||||||
|
var gm: Node = null
|
||||||
|
var state := 0
|
||||||
|
var state_frames := 0
|
||||||
|
var stage_npc: Node3D = null
|
||||||
|
var failures: Array[String] = []
|
||||||
|
var _shift_started := false
|
||||||
|
|
||||||
|
func _initialize() -> void:
|
||||||
|
root.size = Vector2i(1280, 720)
|
||||||
|
var packed: PackedScene = load("res://scenes/main.tscn")
|
||||||
|
root.add_child(packed.instantiate())
|
||||||
|
|
||||||
|
## The game now boots into the venue menu, so the smoke starts a shift first.
|
||||||
|
func _start_shift_if_needed() -> void:
|
||||||
|
if _shift_started or gm == null:
|
||||||
|
return
|
||||||
|
var menu = gm.get("start_menu")
|
||||||
|
if menu != null and menu.visible:
|
||||||
|
gm.call("_on_venue_selected", "hollywood_building")
|
||||||
|
_shift_started = true
|
||||||
|
print("smoke: started hollywood_building shift from the menu")
|
||||||
|
|
||||||
|
func _process(_delta: float) -> bool:
|
||||||
|
frames += 1
|
||||||
|
if gm == null:
|
||||||
|
gm = root.find_child("GameManager", true, false)
|
||||||
|
if gm == null:
|
||||||
|
if frames > 600:
|
||||||
|
_fail("GameManager not found")
|
||||||
|
return false
|
||||||
|
if frames > MAX_FRAMES:
|
||||||
|
_fail("timeout before the radial state")
|
||||||
|
return true
|
||||||
|
_advance()
|
||||||
|
return false
|
||||||
|
|
||||||
|
func _advance() -> void:
|
||||||
|
state_frames += 1
|
||||||
|
match state:
|
||||||
|
0:
|
||||||
|
_start_shift_if_needed()
|
||||||
|
# Wait for the guard to settle on the ground, then grab one NPC.
|
||||||
|
if state_frames >= 40 and gm.npcs.size() > 0:
|
||||||
|
print("smoke: spawn guard_y=%.2f z=%.2f" % [
|
||||||
|
(gm.guard.global_position as Vector3).y,
|
||||||
|
(gm.guard.global_position as Vector3).z,
|
||||||
|
])
|
||||||
|
_shoot("smoke-00-spawn.png")
|
||||||
|
stage_npc = gm.npcs[0]
|
||||||
|
_hide_other_npcs(stage_npc)
|
||||||
|
state = 1
|
||||||
|
state_frames = 0
|
||||||
|
1:
|
||||||
|
# Keep the staged NPC in front of the guard so the ring is visible.
|
||||||
|
_stage_target()
|
||||||
|
if state_frames >= 20:
|
||||||
|
gm.call("_cycle_nearby_target")
|
||||||
|
if gm.targeted_npc == null:
|
||||||
|
_fail("no NPC focused")
|
||||||
|
elif gm.radial == null:
|
||||||
|
_fail("radial layer missing")
|
||||||
|
else:
|
||||||
|
print("smoke: guard_y=%.2f npc_y=%.2f" % [
|
||||||
|
(gm.guard.global_position as Vector3).y,
|
||||||
|
(gm.targeted_npc.global_position as Vector3).y,
|
||||||
|
])
|
||||||
|
_shoot("smoke-01-focus-ring.png")
|
||||||
|
gm.call("_open_radial")
|
||||||
|
state = 2
|
||||||
|
state_frames = 0
|
||||||
|
2:
|
||||||
|
if state_frames >= 20:
|
||||||
|
if not gm.radial.is_open:
|
||||||
|
_fail("action wheel did not open")
|
||||||
|
else:
|
||||||
|
_shoot("smoke-02-action-wheel.png")
|
||||||
|
gm.call("_cancel_radial")
|
||||||
|
state = 3
|
||||||
|
state_frames = 0
|
||||||
|
3:
|
||||||
|
if state_frames >= 5:
|
||||||
|
if gm.radial.is_open:
|
||||||
|
_fail("action wheel did not close on cancel")
|
||||||
|
_finish()
|
||||||
|
|
||||||
|
func _stage_target() -> void:
|
||||||
|
if stage_npc == null or not is_instance_valid(stage_npc):
|
||||||
|
stage_npc = gm.npcs[0] if gm.npcs.size() > 0 else null
|
||||||
|
if stage_npc == null:
|
||||||
|
return
|
||||||
|
_hide_other_npcs(stage_npc)
|
||||||
|
var guard_pos: Vector3 = gm.guard.global_position
|
||||||
|
var forward: Vector3 = -gm.guard.global_transform.basis.z
|
||||||
|
forward.y = 0.0
|
||||||
|
forward = forward.normalized()
|
||||||
|
stage_npc.global_position = guard_pos + forward * STAGE_DISTANCE + Vector3(0, 0.4, 0)
|
||||||
|
stage_npc.rotation.y = gm.guard.rotation.y + PI
|
||||||
|
|
||||||
|
func _hide_other_npcs(keep: Node3D) -> void:
|
||||||
|
for npc in gm.npcs:
|
||||||
|
if is_instance_valid(npc) and npc is Node3D and npc != keep:
|
||||||
|
(npc as Node3D).visible = false
|
||||||
|
|
||||||
|
func _shoot(file_name: String) -> void:
|
||||||
|
var dir := DirAccess.open("user://")
|
||||||
|
if dir == null or not dir.dir_exists("screenshots"):
|
||||||
|
dir.make_dir_recursive("screenshots")
|
||||||
|
var img: Image = root.get_texture().get_image()
|
||||||
|
var err: int = img.save_png(OUT_DIR.path_join(file_name))
|
||||||
|
print("%s -> err=%d (%dx%d)" % [file_name, err, img.get_width(), img.get_height()])
|
||||||
|
|
||||||
|
func _fail(message: String) -> void:
|
||||||
|
failures.append(message)
|
||||||
|
_finish()
|
||||||
|
|
||||||
|
func _finish() -> void:
|
||||||
|
if failures.is_empty():
|
||||||
|
print("SMOKE OK: focus ring + action wheel opened and cancelled")
|
||||||
|
quit(0)
|
||||||
|
else:
|
||||||
|
for message in failures:
|
||||||
|
printerr("SMOKE FAIL: " + message)
|
||||||
|
quit(1)
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
extends SceneTree
|
||||||
|
## PLAN-verb smoke: starts a shift, focuses one person, then exercises the verbs
|
||||||
|
## added after the radial pass — recognize, request reason, body camera, formal
|
||||||
|
## warning (which must arm the body camera), and blocking (which must move the
|
||||||
|
## guard between the person and the door). Also checks that an incident is
|
||||||
|
## actually recorded, then closing it at shift end.
|
||||||
|
##
|
||||||
|
## Usage:
|
||||||
|
## godot --headless --path . --script res://src/test/smoke_plan_verbs.gd
|
||||||
|
## Exit code 0 = pass, 1 = failure.
|
||||||
|
|
||||||
|
const MAX_FRAMES := 1200
|
||||||
|
|
||||||
|
var frame := 0
|
||||||
|
var gm: Node = null
|
||||||
|
var started := false
|
||||||
|
var step := 0
|
||||||
|
var failures: Array[String] = []
|
||||||
|
|
||||||
|
func _initialize() -> void:
|
||||||
|
root.size = Vector2i(1280, 720)
|
||||||
|
root.add_child(load("res://scenes/main.tscn").instantiate())
|
||||||
|
|
||||||
|
func _process(_delta: float) -> bool:
|
||||||
|
frame += 1
|
||||||
|
if gm == null:
|
||||||
|
gm = root.find_child("GameManager", true, false)
|
||||||
|
return false
|
||||||
|
if not started:
|
||||||
|
gm.call("_on_venue_selected", "hollywood_building")
|
||||||
|
started = true
|
||||||
|
return false
|
||||||
|
if frame > MAX_FRAMES:
|
||||||
|
_fail("timeout before the verbs ran")
|
||||||
|
return true
|
||||||
|
if frame < 200:
|
||||||
|
return false
|
||||||
|
if step == 0:
|
||||||
|
if gm.npcs.is_empty():
|
||||||
|
_fail("no NPCs spawned to test the verbs on")
|
||||||
|
return true
|
||||||
|
var npc: Node = gm.npcs[0]
|
||||||
|
gm.call("_on_guard_target", npc)
|
||||||
|
var controller: Object = npc.get_npc_controller()
|
||||||
|
gm.call("_recognize_target")
|
||||||
|
_check(controller.player_recognized, "recognize marks the person as recognized")
|
||||||
|
gm.call("_request_reason")
|
||||||
|
_check(typeof(controller.last_reason_reply) == TYPE_STRING, "reason request returns a reply")
|
||||||
|
gm.call("_set_body_camera", false, "smoke")
|
||||||
|
_check(not gm.body_camera_on, "body camera can be switched off")
|
||||||
|
gm.call("_apply_interaction", 2, "formal warning")
|
||||||
|
_check(gm.body_camera_on, "formal warning arms the body camera")
|
||||||
|
var before: Vector3 = gm.guard.global_position
|
||||||
|
gm.call("_apply_interaction", 3, "blocking")
|
||||||
|
_check(before.distance_to(gm.guard.global_position) > 0.05, "blocking moves the guard")
|
||||||
|
_check(gm.coordinator.recorder.open_incidents_count() > 0 or gm.coordinator.recorder.incidents.size() > 0,
|
||||||
|
"an incident was recorded")
|
||||||
|
gm.coordinator.call("_finish_shift")
|
||||||
|
_check(gm.coordinator.recorder.open_incidents_count() == 0, "open incidents close at shift end")
|
||||||
|
_check(gm.coordinator.recorder.incidents.size() > 0, "shift history keeps the incident")
|
||||||
|
step = 1
|
||||||
|
if step == 1:
|
||||||
|
_finish()
|
||||||
|
return true
|
||||||
|
return false
|
||||||
|
|
||||||
|
func _check(condition: bool, message: String) -> void:
|
||||||
|
if condition:
|
||||||
|
print("ok: " + message)
|
||||||
|
else:
|
||||||
|
_fail(message)
|
||||||
|
|
||||||
|
func _fail(message: String) -> void:
|
||||||
|
failures.append(message)
|
||||||
|
_finish()
|
||||||
|
|
||||||
|
func _finish() -> void:
|
||||||
|
if failures.is_empty():
|
||||||
|
print("SMOKE OK: PLAN verbs (recognize, reason, body camera, warning, blocking)")
|
||||||
|
quit(0)
|
||||||
|
else:
|
||||||
|
for message in failures:
|
||||||
|
printerr("SMOKE FAIL: " + message)
|
||||||
|
quit(1)
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
extends SceneTree
|
||||||
|
## Session-shell smoke: boot the main scene, confirm the venue menu is showing,
|
||||||
|
## start a Joke Shop shift, open the pause overlay and settings, then return to
|
||||||
|
## the menu. Exits non-zero on failure.
|
||||||
|
##
|
||||||
|
## Usage:
|
||||||
|
## godot --headless --path . --script res://src/test/smoke_session_shell.gd
|
||||||
|
## godot --path . --script res://src/test/smoke_session_shell.gd (windowed)
|
||||||
|
var _frames := 0
|
||||||
|
var _manager = null
|
||||||
|
var _main = null
|
||||||
|
|
||||||
|
func _initialize() -> void:
|
||||||
|
var packed: PackedScene = load("res://scenes/main.tscn")
|
||||||
|
if packed == null:
|
||||||
|
printerr("cannot load main scene")
|
||||||
|
quit(1)
|
||||||
|
return
|
||||||
|
_main = packed.instantiate()
|
||||||
|
root.add_child(_main)
|
||||||
|
print("boot: main scene added")
|
||||||
|
|
||||||
|
func _process(_delta: float) -> bool:
|
||||||
|
_frames += 1
|
||||||
|
if _frames == 10:
|
||||||
|
_manager = _main.get_node_or_null("GameManager")
|
||||||
|
if _manager.start_menu == null or not _manager.start_menu.visible:
|
||||||
|
printerr("start menu not visible at boot")
|
||||||
|
quit(1)
|
||||||
|
return true
|
||||||
|
print("boot: start menu visible")
|
||||||
|
_manager._on_venue_selected("joke_shop")
|
||||||
|
if _frames == 200:
|
||||||
|
if _manager.npcs.size() == 0:
|
||||||
|
printerr("no NPCs spawned after shift start")
|
||||||
|
quit(1)
|
||||||
|
return true
|
||||||
|
print("boot: shift running, npcs=%d" % _manager.npcs.size())
|
||||||
|
_manager._open_pause()
|
||||||
|
if _frames == 210:
|
||||||
|
if _manager.pause_overlay == null or not _manager.pause_overlay.visible:
|
||||||
|
printerr("pause overlay did not open")
|
||||||
|
quit(1)
|
||||||
|
return true
|
||||||
|
print("boot: pause overlay visible")
|
||||||
|
_manager._open_settings()
|
||||||
|
if _frames == 220:
|
||||||
|
if _manager.settings_panel == null or not _manager.settings_panel.visible:
|
||||||
|
printerr("settings panel did not open")
|
||||||
|
quit(1)
|
||||||
|
return true
|
||||||
|
print("boot: settings visible")
|
||||||
|
_manager.settings_panel._on_cancel()
|
||||||
|
_manager._quit_to_menu()
|
||||||
|
if _frames == 230:
|
||||||
|
if not _manager.start_menu.visible:
|
||||||
|
printerr("quit-to-menu did not return to the start menu")
|
||||||
|
quit(1)
|
||||||
|
return true
|
||||||
|
print("SMOKE PASS: menu -> shift -> pause -> settings -> menu")
|
||||||
|
quit(0)
|
||||||
|
return true
|
||||||
|
return false
|
||||||
@@ -0,0 +1,134 @@
|
|||||||
|
extends RefCounted
|
||||||
|
## Venue-correct access artifacts (override_access, no free recognition on guests).
|
||||||
|
|
||||||
|
const Rules := preload("res://src/core/rules.gd")
|
||||||
|
const AccessLoadout := preload("res://src/core/access_loadout.gd")
|
||||||
|
const AccessVerifier := preload("res://src/core/access_verifier.gd")
|
||||||
|
const ScenarioFactory := preload("res://src/content/scenario_factory.gd")
|
||||||
|
const NpcProfile := preload("res://src/core/npc_profile.gd")
|
||||||
|
|
||||||
|
var verifier := AccessVerifier.new()
|
||||||
|
|
||||||
|
func _guest() -> NpcProfile:
|
||||||
|
var p := NpcProfile.new()
|
||||||
|
p.id = "authorized_guest"
|
||||||
|
p.display_name = "Authorized Guest"
|
||||||
|
p.npc_type = Rules.NpcType.AUTHORIZED_GUEST
|
||||||
|
return p
|
||||||
|
|
||||||
|
func _staff() -> NpcProfile:
|
||||||
|
var p := NpcProfile.new()
|
||||||
|
p.id = "authorized_staff"
|
||||||
|
p.display_name = "Staff Member"
|
||||||
|
p.npc_type = Rules.NpcType.AUTHORIZED_STAFF
|
||||||
|
return p
|
||||||
|
|
||||||
|
func _kinds(artifacts: Array) -> Array:
|
||||||
|
var out: Array = []
|
||||||
|
for a in artifacts:
|
||||||
|
out.append(a.kind)
|
||||||
|
return out
|
||||||
|
|
||||||
|
func test_joke_guest_valid_needs_screen_then_grants() -> bool:
|
||||||
|
var policy = ScenarioFactory.joke_shop().access_policy
|
||||||
|
var arts: Array = AccessLoadout.build(_guest(), policy, {"has_id": true, "has_ticket": true})
|
||||||
|
var has_rec := false
|
||||||
|
for art in arts:
|
||||||
|
if art.kind == Rules.AccessKind.RECOGNITION:
|
||||||
|
has_rec = true
|
||||||
|
var a := TestUtils.check(not has_rec, "no free recognition")
|
||||||
|
var before := verifier.verify(arts, policy, false)
|
||||||
|
var after := verifier.verify(arts, policy, true)
|
||||||
|
var b := TestUtils.check_eq(before["granted"], false, "unscreened valid guest denied")
|
||||||
|
var c := TestUtils.check_eq(after["granted"], true, "screened valid guest granted")
|
||||||
|
return a and b and c
|
||||||
|
|
||||||
|
func test_joke_guest_no_id_denied_even_when_screened() -> bool:
|
||||||
|
var policy = ScenarioFactory.joke_shop().access_policy
|
||||||
|
var arts: Array = AccessLoadout.build(_guest(), policy, {"has_id": false, "has_ticket": true})
|
||||||
|
var result := verifier.verify(arts, policy, true)
|
||||||
|
return TestUtils.check_eq(result["granted"], false, "no-id guest denied")
|
||||||
|
|
||||||
|
func test_joke_guest_expired_id_denied() -> bool:
|
||||||
|
var policy = ScenarioFactory.joke_shop().access_policy
|
||||||
|
var arts: Array = AccessLoadout.build(_guest(), policy, {
|
||||||
|
"has_id": true, "has_ticket": true, "id_status": Rules.ArtifactStatus.EXPIRED,
|
||||||
|
})
|
||||||
|
var result := verifier.verify(arts, policy, true)
|
||||||
|
return TestUtils.check_eq(result["granted"], false, "expired id denied")
|
||||||
|
|
||||||
|
func test_joke_event_payload_matches_factory() -> bool:
|
||||||
|
var shop = ScenarioFactory.joke_shop()
|
||||||
|
var found_expired := false
|
||||||
|
var found_no_id := false
|
||||||
|
for event in shop.event_pool:
|
||||||
|
var ov: Dictionary = event.get("override_access", {})
|
||||||
|
if event.get("id", "") == "guest_expired_id":
|
||||||
|
found_expired = int(ov.get("id_status", -1)) == Rules.ArtifactStatus.EXPIRED
|
||||||
|
if event.get("id", "") == "guest_no_id":
|
||||||
|
found_no_id = ov.get("has_id", true) == false
|
||||||
|
var a := TestUtils.check(found_expired, "guest_expired_id carries expired status")
|
||||||
|
var b := TestUtils.check(found_no_id, "guest_no_id has has_id false")
|
||||||
|
return a and b
|
||||||
|
|
||||||
|
func test_joke_staff_recognized_without_override() -> bool:
|
||||||
|
var policy = ScenarioFactory.joke_shop().access_policy
|
||||||
|
var arts: Array = AccessLoadout.build(_staff(), policy, {})
|
||||||
|
var has_rec := false
|
||||||
|
for a in arts:
|
||||||
|
if a.kind == Rules.AccessKind.RECOGNITION and a.status == Rules.ArtifactStatus.VALID:
|
||||||
|
has_rec = true
|
||||||
|
var screened := verifier.verify(arts, policy, true)
|
||||||
|
return TestUtils.check(has_rec, "staff are recognized") and TestUtils.check_eq(screened["granted"], true, "recognized staff enter after screen")
|
||||||
|
|
||||||
|
func test_building_guest_uses_wristband_not_recognition() -> bool:
|
||||||
|
var policy = ScenarioFactory.hollywood_building().access_policy
|
||||||
|
var arts: Array = AccessLoadout.build(_guest(), policy, {})
|
||||||
|
var has_rec := false
|
||||||
|
var has_band := false
|
||||||
|
for a in arts:
|
||||||
|
if a.kind == Rules.AccessKind.RECOGNITION:
|
||||||
|
has_rec = true
|
||||||
|
if a.kind == Rules.AccessKind.WRISTBAND and a.status == Rules.ArtifactStatus.VALID:
|
||||||
|
has_band = true
|
||||||
|
var result := verifier.verify(arts, policy)
|
||||||
|
var a := TestUtils.check(not has_rec, "building guest is not auto-recognized")
|
||||||
|
var b := TestUtils.check(has_band, "building guest presents a wristband")
|
||||||
|
var c := TestUtils.check_eq(result["granted"], true, "valid wristband grants")
|
||||||
|
return a and b and c
|
||||||
|
|
||||||
|
func test_studio_ticket_grants_without_recognition() -> bool:
|
||||||
|
var policy = ScenarioFactory.tv_studio().access_policy
|
||||||
|
var arts: Array = AccessLoadout.build(_guest(), policy, {"has_ticket": true})
|
||||||
|
var has_rec := false
|
||||||
|
for a in arts:
|
||||||
|
if a.kind == Rules.AccessKind.RECOGNITION:
|
||||||
|
has_rec = true
|
||||||
|
var result := verifier.verify(arts, policy)
|
||||||
|
return TestUtils.check(not has_rec, "audience ticket is not recognition") and TestUtils.check_eq(result["granted"], true, "ticket grants at studio")
|
||||||
|
|
||||||
|
func test_studio_counterfeit_denied() -> bool:
|
||||||
|
var policy = ScenarioFactory.tv_studio().access_policy
|
||||||
|
var arts: Array = AccessLoadout.build(_guest(), policy, {
|
||||||
|
"wristband_status": Rules.ArtifactStatus.COUNTERFEIT,
|
||||||
|
"credential_status": Rules.ArtifactStatus.COUNTERFEIT,
|
||||||
|
})
|
||||||
|
var result := verifier.verify(arts, policy)
|
||||||
|
return TestUtils.check_eq(result["granted"], false, "counterfeit studio artifacts deny")
|
||||||
|
|
||||||
|
func test_carried_items_override_and_roll() -> bool:
|
||||||
|
var forced: Array = AccessLoadout.roll_carried_items(1, {"carried_items": ["weapon"]})
|
||||||
|
var a := TestUtils.check_eq(forced, ["weapon"], "override items win")
|
||||||
|
var rolled: Array = AccessLoadout.roll_carried_items(42, {})
|
||||||
|
var b := TestUtils.check(rolled is Array, "roll returns an array")
|
||||||
|
var again: Array = AccessLoadout.roll_carried_items(42, {})
|
||||||
|
var c := TestUtils.check_eq(rolled, again, "same seed same pocket")
|
||||||
|
return a and b and c
|
||||||
|
|
||||||
|
func test_joke_shop_sidewalk_exists() -> bool:
|
||||||
|
var shop = ScenarioFactory.joke_shop()
|
||||||
|
var studio = ScenarioFactory.tv_studio()
|
||||||
|
var a := TestUtils.check(shop.locations.has("sidewalk"), "joke shop sidewalk")
|
||||||
|
var b := TestUtils.check(studio.locations.has("sidewalk"), "studio sidewalk")
|
||||||
|
var c := TestUtils.check_eq(shop.waypoint_for_intent("film").z, shop.locations["sidewalk"].z, "film walks to sidewalk")
|
||||||
|
return a and b and c
|
||||||