Skip to content

FRLG: gate-aware routes, OPEN_GATE/PRESS_SWITCH steps, gate state in the story - #442

Draft
dayfine wants to merge 116 commits into
frlg/stage14a-blainefrom
frlg/gates
Draft

dayfine wants to merge 116 commits into
frlg/stage14a-blainefrom
frlg/gates

Conversation

@dayfine

@dayfine dayfine commented Nov 13, 2026 •

Copy link
Copy Markdown
Owner

Depends on #410 and #440

FRLG routes could not go through Silph's card-key doors or Mansion's statue switches. The FRLG step model now takes the gate state (wrapped by #440's GatedPlanner), the executor and sim run OPEN_GATE (face, A, message, settle) and PRESS_SWITCH (face, A, Yes, B through text), and the story engine carries gate state and the card_key_held flag between steps and in checkpoints. Plans author gates_after on steps, start_gates on checkpoints, flags_after: ["card_key_held"] on the Card Key pickup and start_flags on checkpoints whose save already has it. This PR bumps the FRLG map pin to PokemonSimulation 4b886bb (Silph card-key doors, Mansion statue switches), an agreed exception to a PR owning its files; the PRs below stay on 0c46df1. The synthetic gate test maps are gone (the gate tests read the real Silph and Mansion maps), 13.01-13.04 are planned routes with PRESS_SWITCH, and the row sim plans on the story's maps. Tested with the OverworldGates, StoryStepExecutor and StoryStepJson suites (sim and fake console), plus the FRLG Overworld suites; not run on a console.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 30 commits November 11, 2026 19:37
Tap lengths, tile times per gait and axis, start delay and how open legs
are pressed (BDSP taps, FRLG timed holds on foot), with an entry for BDSP
and one for FRLG and a check of each.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Maps joined by their warps and edges, with the player's place as a map
and a tile of it. Where a warp or an edge leads is computed once here;
whether a step is allowed stays per game. connect_by_world() joins maps
placed on one world grid, for BDSP's maps, which have no connections.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…edge entry split out

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…mation#1895)

* Command-line test runner: filter tests by name substring

Add a "--test-substring <value>" argument to the command-line unit test
runner (--command-line-test-mode): it only runs the tests whose name contains
the given substring, using the same case-sensitive matching as the GUI's
"Run All Tests Containing This Substring" mode. Without the argument (or
with an empty value) all tests run, as before.

- Main.cpp: parse the argument (error + exit 1 if it has no value).
- CommandLineTests.h/.cpp: pass the substring through to the runner.
- CommandLineUnitTestRunner::run(): add only the matching tests; log how many
  will run, and warn in orange if nothing matches.

* Dedup the GUI and command-line unit test runners

The two runners (UnitTestRunner::program and CommandLineUnitTestRunner::run)
each had their own copy of the "add the tests whose name contains this
substring" loop (and the GUI's "Tests to Run" preview had a third copy),
and each of their on_test_finished listeners re-implemented the same result
classification into passed/failed/skipped/OOM buckets.

- Add a file-local add_tests_matching(filter, add_test) helper and use it
  in the GUI's run-substring-match / run-all modes, the GUI's "Tests to
  Run" preview, and the command-line runner.
- Add UnitTestResultCounters, shared by both runners: one place defines
  which bucket each result kind goes into (OOM is a failure and has its own
  counter) and returns the result's 1-based index within its bucket, which
  the GUI uses for its 1000-entry panel caps, exactly like the old
  fetch_add(1) + 1 sequences. The write-only m_total_failed goes away.

* Revert the shared result counters; keep the shared test selection

Per review: UnitTestResultCounters/m_results was redundant for the GUI,
whose Stats already track the same passed/failed/skipped/OOM buckets, and
its one unique use (the combined FAILED+OOM cap sequence) was just the old
m_total_failed. Revert both runners to their original atomics and
per-case counting, keeping only the shared add_tests_matching() helper
from the previous commit.

---------

Co-authored-by: PA Dev Bot <344001113+pa-devbot@users.noreply.github.com>
* Exit menu simplification

* cleanup
* StorageView

* Read the box number at the bottom left
Conflict in SourceFiles.cmake: kept both file lists.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Pokemon_StoryBackend.h forward-declared Pokemon::ScreenEvents, which shadowed
the engine's ScreenEvents in namespace Pokemon. The bridge now has its own
header that includes Pokemon_ScreenEventTypes.h, so the backend header needs
neither, and the engine tests write a bare ScreenEvents again.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Same fix as 74e5b90 on frlg/stage8-rocktunnel; the BDSP line got the
test from f360dd3 without it, so its Ubuntu build failed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
(cherry picked from commit 2b4544d)
…e messages name expected and actual (#402 review)

FRLG's Bicycle taps 40 ms at one per 100 ms, its walk 66 ms with a 700 ms
release, so the step tap moves from MoveMechanics onto Gait. Every scalar
gets a default, and the test reports which gait and which value failed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
A defaulted operator<=> (x, then y) lets planners keep tiles and places
built from them in ordered sets with std::less instead of hand-written
comparators.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine and others added 5 commits November 12, 2026 15:58
…e executor and sim

plan_overworld_route_gated() wraps FRLG's step rules in the shared gated planner
(a closed gate is a wall; a plan may open a card-key gate with the Card Key or
press a statue). Route steps OPEN_GATE and PRESS_SWITCH carry their gate change;
the console walker faces the gate/statue, A (Yes), B through the text, and the
run reads its maps through the gates each one changes. The sim holds the gate
state (SimField::OPEN_GATE / PRESS_SWITCH), so the leg-to-command sequence is
tested with the fake console.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…n with gates

RunState carries GateState; steps apply gates_after and flags_after on
success; checkpoints give start_gates and start_flags; walk_route plans
with the gated planner when the maps have gates, and the Card Key flag
allows card-key gates.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
… WalkGates header)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine and others added 3 commits November 12, 2026 19:03
StoryMapsSim, OverworldStepSim and the replay executor now plan and walk
over the run's gates (a closed door blocks; OPEN_GATE/PRESS_SWITCH change
them). The gated planner keeps the step model's open-stop risk costs. A
skipped step applies its gates_after (Event::when_skipped). New tests:
AutoStoryGates (Silph door, Mansion statue on both row sims), OverworldGates
stop-risk, executor skipped-step gates.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…> gated

OverworldSim::has_gates() clashed with the free has_gates(maps); renamed
gated(). StoryMapsSim's wall-overrun and facing checks look in the maps the
step is walked on, not the story maps.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…route

Code health: OverworldSim public_methods back to 8 (gate maps and the Card
Key are SimState fields, not accessors); walked_route's maps, gates and rules
are default arguments, not an overload.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine and others added 18 commits November 12, 2026 19:37
…on statue switches)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…with PRESS_SWITCH

The synthetic gate maps are gone; the gate tests read the real Silph and
Mansion maps (pinned in the previous commit). 13.01-13.04 are planned
routes: the statue presses and the holes come from the planner, and 13.02
is split so the walk crosses 1F's row 24 out of Ted's line. The row sim
plans on the story's maps again (the sim's own maps lacked the Rocket
Hideout stairs a switch opens, 09.01). Goldens regenerated.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…, test registration)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
… a Mansion statue on the real maps

The replay scenario takes start_flags (the Card Key); the new tests record the native route across each gate and replay it on the pinned maps.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…rge counted one twice)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…itches, Victory Road gates); map-pack action at the same revision

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants