Repository navigation
Conversation
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
…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
…nes) 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
…e replay's run_route has no planning)
…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
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Victory Road's boulder switches and barriers come from frlg/gates' map pin (PokemonSimulation 1cacf81). PokemonFRLG_OverworldSim.h keeps LF endings (e6ceb4e had turned it to CRLF). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
frlg/gates (fb8795f) moved these tests to PokemonFRLG_OverworldGateMaps_Tests but left the include and the call, so the runner did not compile. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…or's switch is its own Victory Road's maps give each floor a floor_switch_1 with its own flag, so a switch with one floor is known in GateState as gate_key(map, id) (switch_key()); the Mansion's shared switch keeps its id. MapSwitch reads the boulder buttons; the sim's PUSH_BOULDER, the console's push_boulder step and the map-level row sim (boulder_pushed()) turn the switch on when the boulder ends on a button. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…out to Route 23 19.04b pushes 1F's boulder onto its switch and climbs to 2F; 19.04c does 2F's west switch and 3F's (7, 7); 19.04d pushes 3F's boulder down the hole, follows it to 2F, pushes it onto 2F's second switch and leaves by the exit. Pushes are the boulder solver's; corner waypoints keep routes off pushed boulders (the maps still show them where they started) and out of trainers' lines. The sim drops a boulder through a hole and shows the one the game hid below; the fault sweep counts a push as a step the sim plays. 19.05 starts at Route 23 (18, 29): the exit walks the player a tile off the cave mouth in the sim. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…boulder() Code health: PokemonFRLG_AutoStoryEvents.cpp back to its 1030 lines, and the sim's landing no longer nests six deep. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
…ream PokemonAutomation#1881 free party slots (c09beca)
# Conflicts: # SerialPrograms/Source/Pokemon/Navigation/Pokemon_GatedPlanner.h
fb8795f replaced the shared gate tests (Pokemon_Gates_Tests, the synthetic GateTestMaps and their embedded map list) with tests on FRLG's real maps. The shared ones come back exactly as they are on nav/gates; the FRLG-map tests stay as extra FRLG tests. Both suites register. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
Takes the parent's PokemonFRLG_Navigation and EggRng (PokemonAutomation#1896's), replacing the old copies kept through d11b360. OverworldSim.h: the parent's file with this branch's land_fallen_boulder(), in LF endings. 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
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
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Depends on #446 (base
frlg/stage19-victory-road). Also mergesfrlg/gates(#442) for the Victory Road gates in the map pin (PokemonSimulation 1cacf81), so the diff also shows #442's commits.This adds the Victory Road cave rows that were missing between 19.04 (cave mouth) and 19.05 (Indigo Plateau).
map/id(each floor has its ownfloor_switch_1).MapSwitchreads the boulderbuttons. A boulder that lands on a button turns its switch on, in the sim, in the console step and in the map-level row sim.frlg/gates' unit test runner, which still included the deletedPokemon_Gates_Tests.h.PokemonFRLG_OverworldSim.his back to LF line endings.Testing
🤖 Generated with Claude Code
https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss