Repository navigation
BDSP AutoStory: pin PokemonSimulation's Floaroma couple fix; drop the sim ground - #285
Merged
Merged
Conversation
… sim ground Bump the BDSP map pin to PokemonSimulation 7209388 (#76), which moves Floaroma's old couple a column east: old man (3, 25), old woman (4, 25). 01.11's walk west now stops at the field's edge on the map (x 0), and 4 taps east land on her column, so the sim-only extra column west of the map goes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
dayfine
marked this pull request as ready for review
November 9, 2026 04:24
dayfine
merged commit Nov 9, 2026
4101475
into
bdsp/autostory-old-couple-clip
17 of 22 checks passed
dayfine
added a commit
that referenced
this pull request
Nov 9, 2026
…279) * BDSP AutoStory: a wall leg that never moved waits, then plans from its start On lab-B (2026-11-08 16:50, 01.08 below_the_ravaged_path) the leg "west 2 (to wall)" from Route 204 (13, 2) stopped at once, 0 chunks moved: the youngster who wanders (12, 2) to (14, 2) stood a tile ahead. The wait for the way needed a stop three tiles short of the wall, so he was talked to at once, and the replan from both (12, 2) and (13, 2) found no plan: an uncertain start needs a wall both tiles reach, and no wall is anchored from a tile someone wanders on. A walk to the wall that never moved stopped where it began, so someone stands on the next tile: it now waits for the way on short legs too, and if they stay, the replan starts from the start tile alone with their tile marked. Two Planned route tests replay the run. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss * BDSP AutoStory: red tests for routes along wander zones and short wall legs On lab-B (2026-11-08, 01.08 below_the_ravaged_path) the plan "north 35 (to wall) to (13, 2), west 2 (to wall) to (11, 2)" walked along the row Route 204 South's youngster wanders, (12..14, 2). He stopped the leg west after 1 of 2 tiles; the check at the wall allowed a tile short on legs of two or three tiles, so the route logged arriving at (11, 2) from (13, 2). New tests, red on this commit: - Route planner: a leg may cross a row zone (one tile of it) but not run along it (two tiles, the start among them); no plan when the row is the only way. - Story table: every ROUTE step plans and none runs along a wander zone; 01.08's plan walks at most one tile of (12..14, 2). - Planned route: a 2-tile leg to a wall that ran out of time after 1 tile is a stop short of the wall, not the wall. The two #271 tests that replayed the console's leg along the youngster's row now replay it on a plain room: the planner will no longer plan it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss * BDSP AutoStory: no route runs along a wander zone; short wall legs walk every tile plan_robust_route() no longer uses a leg that walks two tiles in a row of a zone where someone wanders (the leg's start among them): along a row zone, or through a 2-D one. Crossing a row zone through one tile is still planned at per_wander_tile, with #271's wait if he stands there. With no other way there is no plan; nothing falls back. A leg to a wall of 3 tiles or fewer that runs out of time short of its tiles is now a stop short of the wall (talk, then plan again), and the check at the wall needs every tile on such legs. Plans that change: 01.08 below_the_ravaged_path goes up column 14, then 12, and crosses the youngster's row at (12, 2) only; 00.05b below_the_tv_clown and 01.03 above_the_mine go round their wanderers. The story sim now plans ROUTE steps as walk_route() does (from a wall for a few start tiles, then default costs): from 01.03's two start tiles the search over both ran out of budget on the longer way. The grid sim's wait test crosses a row zone on a plain room, and Segment00Lines' reference line for 00.03 goes along Route 201's row 13, above the Breeder. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss * BDSP AutoStory: red tests for 01.10's line-5 recovery wall and a battle on line 7 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss * BDSP AutoStory: recovery takes the cheapest whole walk; 01.10 runs into Floaroma Recovery from a few possible tiles pinned the wall with the fewest held tiles and ignored the way on to the goal: after Taylor's battle on line 5 it held south 12 and walked 12 back where north 13 and 5 south would do. It now plans the way on from every anchor and keeps the cheapest whole walk. 01.10's last line ran an open leg up column 11, which has no wall north; a wild battle on it left no plan. The row now runs north until Floaroma's banner, which ends the same from any tile of the column, and 01.11 starts from the rows the run may stop on. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss * BDSP AutoStory: keep the story table under the length limit; line-7 cases as a table Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss * BDSP AutoStory: red sim test for 01.11's walk to the old woman lab-B 2026-11-08 18:41: 01.11's 8 taps west, then north, ended below the old man and no one answered the old woman's talk. A grid sim test walks 01.11 to her from each of the nine tiles Floaroma's banner stops us on: the old taps (OldStorySteps) must miss her from x 10 and 12, and the table's walk must end below her from all nine. The westedge batch found the field's edge 3 taps west of the old man, a column west of Floaroma's map. SimGround adds that column beside the map, for this test and for the story sim's 01.11 from now on. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss * BDSP AutoStory: 01.11 walks west to the field's edge, then 4 taps east 8 taps west from where Floaroma's banner stops us (any of x 10..12) did not end below the old woman: on lab-B (2026-11-08 18:41) they ended below the old man. A walk west until the field's edge stops us ends on one column from every arrival; from below the old man the edge is 3 taps west (westedge batch 2026-11-08), so her column is 4 taps east of it. That edge is x = -1, a column west of Floaroma's map. The map is left as it is (a TODO in the table): the field may go on past it, or the old couple may stand a tile east of their map points. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss * BDSP AutoStory: pin PokemonSimulation's Floaroma couple fix; drop the sim ground (#285) Bump the BDSP map pin to PokemonSimulation 7209388 (#76), which moves Floaroma's old couple a column east: old man (3, 25), old woman (4, 25). 01.11's walk west now stops at the field's edge on the map (x 0), and 4 taps east land on her column, so the sim-only extra column west of the map goes. Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
dayfine
added a commit
that referenced
this pull request
Nov 9, 2026
… into bdsp/autostory-route-plan-dump #285 removed the sim-only Floaroma column (SimGround) and put 01.11's field edge at x 0 on the real map. Keep this branch's StorySim.{h,cpp} layout and drop every SimGround use there, in StorySim_Tests.cpp and SourceFiles.cmake. StoryTable.cpp, GridSim_Tests.cpp and the StoryTable tests take #285's content. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
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 #279
Pins the BDSP maps to PokemonSimulation 7209388 (dayfine/PokemonSimulation#76), which puts Floaroma's old couple a column east, so 01.11 walks on the real map and the sim-only ground west of it goes.
devtools/maps/map-resources.lock.json: BDSP pin 4de7742 to 7209388, written byconsumer_sync update. Only FloaromaTown changes: old man (3, 25), old woman (4, 25). No other BDSP map changed, Oreburgh included.PokemonBDSP_AutoStory_SimGround.{h,cpp}and its uses in the story sim and the 01.11 grid test.Testing
SerialProgramsTests --filter PokemonBDSP::AutoStory(headless runner): 116 passed, 0 failed, 7 skipped (image tests). The 01.11 grid test passes from all 9 banner arrival tiles on the real map; the old 8 taps now miss from x 10 and 11.bdsp/autostory-route-plan-dump): 128 passed, 0 failed; the route plans golden is unchanged. That merge conflicts inPokemonBDSP_AutoStory_StorySim.{h,cpp}andSourceFiles.cmake; drop the SimGround bits there.🤖 Generated with Claude Code
https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss