Repository navigation
Conversation
…ovanni resolve to the doc's policies
…own checkpoint 16.05's Giovanni and 18.02's Sabrina had no battle policy, so they were fought potions-only; console B lost 16.05 twice (2026-11-15). Both now name goal-based-setup with the doc's goals (silph-giovanni: Sp. Atk +1, outspeed, Guard Spec first; sabrina: outspeed, Guard Spec first) and foe_threats from PokemonSimulation planning_risk() against the doc's entry. 17.04's Giovanni (an A fight) runs B, the doc's default runtime: solo-recovery with its rows. A boss battle is its own checkpoint: 16.05 ends at Giovanni and 16.05b walks to the president for the Master Ball; 18.02 ends at Sabrina and 18.02b takes the pads out and heals. 16.04's save still starts 16.05.
A talk returns as soon as its first message opens. 16.05b ended on the president's talk, so the save pressed + into his dialog and failed (console B, 2026-11-15). 16.05b gets a master_ball_obtained scene after the talk, with the talk's skip_if; 09.01, 10.06 and 16.02 ended on a talk the same way and get a scene too. A new lint test checks that a step running whenever the talk does follows every talk.
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 #554 (base frlg/silph-rival-battle; the diff shows only this change).
16.05's Giovanni and 18.02's Sabrina had no battle policy, so the lead fought them potions-only; console B lost 16.05 twice. Both now use goal-based-setup with the goals from PokemonSimulation's pokeguy-conditions.md (silph-giovanni: Sp. Atk +1, outspeed, Guard Spec first; sabrina: outspeed, Guard Spec first), and 17.04's gym Giovanni, an A fight, gets solo-recovery, the doc's default runtime. Their foe_threats are planning_risk() rows against the doc's entry, from the same generator that made 19.01's and the League's (it reproduces those rows exactly). The other boss fights after 16.05 (19.01, 20.01 to 20.05) already match the doc. Each boss now ends its own checkpoint: 16.05 stops at Giovanni and 16.05b walks to the president for the Master Ball; 18.02 stops at Sabrina and 18.02b takes the pads out and heals. 16.04's save still starts 16.05.
Tested: new BattlePolicy plan cases check that each of the three boss steps resolves to the doc's policy, goals and rows. The Silph, SaffronGym, Table, RunPlan and golden-plan suites are updated for the splits. Touched files compile locally; Fork Draft CI runs the full suite.