Skip to content

FRLG AutoStory stage 3: 00.10-00.13 as JSON, GAME steps with typed args - #333

Merged
dayfine merged 7 commits into
frlg/stage3-mtmoonfrom
frlg/stage3-json
Nov 10, 2026
Merged

dayfine merged 7 commits into
frlg/stage3-mtmoonfrom
frlg/stage3-json

Conversation

@dayfine

@dayfine dayfine commented Nov 10, 2026

Copy link
Copy Markdown
Owner

Depends on #215 and #331 (base frlg/stage3-mtmoon, with frlg/stage2-rng merged in; until stage 2 lands in frlg/stage3-mtmoon, the diff also shows #330/#331's port).

Stage 3 didn't build on #312's action/args steps, and its rows were still C++. This ports it and moves its checkpoints into StoryData/ the way #330 and #331 did for stages 1 and 2.

  • 00.11, 00.12, 00.12b, 00.12c and 00.13 are files, and 00.10 gains its walk to below Pewter's Center. Each has "metadata": {"phase": "testing"}; FRLG's reader checks the phase and strips it before the shared reader, which doesn't take it yet.
  • FRLG's GAME steps declare typed args instead of variant strings: pc (do, slot, box, if_present), capture, fossil, level, mart, teach, grind (the nurse is now its nurse arg) and leave_gift_summary. The specs are in story_action_specs() and the step table binds each one to the GAME action. VariantWords became GameArgs; the variant round-trip tests now round-trip args.
  • The execution object's handoff takes gift_rng.
  • Review commit by commit: the merge keeps stage 3's C++ rows in a parity test; the next commit deletes them.

Testing: full build; --command-line-test-mode --profile unit-tests: the parity test passed on the merge; PokemonFRLG::AutoStory* and the Pokemon::Story* suites pass apart from the 6 known FileException image tests. Code health against frlg/stage3-mtmoon: 0 failures. Nothing ran on a console.

🤖 Generated with Claude Code

https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss

dayfine and others added 7 commits November 10, 2026 09:58
…ction/args steps

The FRLG stack stopped building after #312: the C++ rows set step.target,
legs, direction, fight_wild and may_lose directly, StoryChecks became
StoryCheckLevel, Pokemon_StorySteps.h moved to Pokemon_StoryStepExecutor.h
and the JSON codecs to Data/.

- Each checkpoint is StoryData/frlg-<id>.plan.json (pokesim-authored-
  checkpoint/1), read with read_authored_checkpoint() against FRLG's
  actions: the built-in ones plus ROUTE/LEGS "run". The parser fills in
  the fallbacks (fight_wild, may_lose, yes), so the files give only what
  differs. FRLG's execution object carries the START menu, the supplies,
  the lead after Brock and the notes that were C++ comments.
- The executor, the step-table, sim and route tests read typed args
  (story_arg<T>()); the sim's fake game dispatches by kind in run().
- Check levels: DEFAULT and above check the screen as THOROUGH did;
  FAST and SPEEDRUN trust counts as FAST did.
- AutoStory: StoryRunOptions with the FRLG languages, the check level and
  language into StoryEnv, record_story_counts().

The old C++ rows stay in PokemonFRLG_AutoStoryTableParity_Tests.cpp for
this commit only: each file loads to the same steps, args, poses,
supplies and START menu.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The previous commit's parity test passed: every StoryData file loads to
its old C++ row. The rows and the test go; StoryData/ is the table.

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

Stage 1 moved 00.01-00.10 into StoryData/ on #312's action/args steps.
Stage 2's own rows follow it:

- 00.01 (handoff sid_helper, the new intro why), 00.01b (live start, the
  GAME step close_trainer_card), 00.04 (to the ball, handoff starter_rng)
  and 00.04b are files; FRLG's execution object reads "handoff" and
  "live_start".
- close_trainer_card is an FRLG GAME action with no args; StoryExecutor's
  GAME action dispatches on step.action instead of overriding the old
  per-kind game().
- AutoStory: check level and language into StoryEnv, record_story_counts();
  the run-plan tests convert the start GridPose.

The C++ rows stay in PokemonFRLG_AutoStoryTableParity_Tests.cpp for this
commit only, and every file loads to its row.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The merge's parity test passed: every StoryData file, 00.01b and the
00.04/00.04b split included, loads to its C++ row. The rows and the test go.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
FRLG AutoStory stage 2: 00.01b and the 00.04 split as JSON
… JSON

Stage 3 ported to #312's action/args steps, its checkpoints moved into
StoryData/ the way #330 and #331 moved stages 1 and 2.

- 00.11, 00.12, 00.12b, 00.12c and 00.13 are files, and 00.10 gains its
  walk to below Pewter's Center. Each carries "metadata": {"phase":
  "testing"}, which FRLG's reader checks and strips before the shared one.
- FRLG's GAME actions declare typed args in place of the variant strings:
  pc (do, slot, box, if_present), capture, fossil, level, mart, teach and
  grind (whose nurse is now its "nurse" arg), plus leave_gift_summary.
  Their specs are in story_action_specs(); the step table binds each to
  the GAME action with its args. VariantWords became GameArgs.
- The execution object's handoff takes gift_rng.

The old C++ rows stay in PokemonFRLG_AutoStoryTableParity_Tests.cpp for
this commit only: every file loads to the same steps, args, poses,
supplies and START menu.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
The parity test passed on the merge before this commit: every StoryData
file through 00.13 loads to the C++ row it replaces.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013VUubhHeYSMGSSDXZkKZss
@dayfine
dayfine marked this pull request as ready for review November 10, 2026 18:29
@dayfine
dayfine merged commit 7f7a9cf into frlg/stage3-mtmoon Nov 10, 2026
11 of 15 checks passed
@dayfine
dayfine deleted the frlg/stage3-json branch November 13, 2026 03:26
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.

1 participant