Repository navigation
Conversation
fly_toward_plaza() retried until it flew, with no limit: each pass mashed B back to the overworld and ran fly_to_closest_pokecenter_on_map(), which itself tries up to 17 times (~13 s each). In bbq-m5 (11:20) the same "no Pokecenter at max warpable level" failure repeated for minutes. The roadmap (M13) records one return that took 8m50s. fly_toward_plaza() now tries once, with at most 3 closest-Pokecenter tries (fly_to_closest_pokecenter_on_map() takes a try limit; it defaults to 17, so other callers are unchanged), and returns whether it flew. A battle on the way also ends the try. return_to_plaza_checked() counts a fly that didn't happen as one of its 3 attempts, so after 3 the return fails through the existing path (OperationFailedException) instead of looping. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Give PlazaReturnCase's `fly_results` a default member initializer (= {}), so
test cases that leave them out of a designated initializer compile on
the Windows Clang CI job.
That job builds with clang-cl /W4 /WX, which turns on
-Wmissing-designated-field-initializers: a designated initializer that
omits a field without a default member initializer is an error. Apple
clang's -Wextra does not enable that warning, so macOS builds miss it.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
dayfine
force-pushed
the
bbq/plaza-return-bounds
branch
from
October 23, 2026 04:21
b60c23b to
1b5b675
Compare
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E
Owner
Author
|
Superseded by consolidated Tree 3 PR #274. |
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.
Part of PokemonAutomation/ComputerControl#263.
Behavior change: a return to Central Plaza now gives up. Before, it retried until it flew; now, after 3 failed flies or wrong landings, it fails through the existing path (
OperationFailedException, "Unable to return to Central Plaza").Problem
Roadmap M13: one return to Central Plaza took 8m50s.
fly_toward_plaza()looped until it flew, with no limit. Each pass mashed B back to the overworld, then ranfly_to_closest_pokecenter_on_map(), which itself tries up to 17 times (~13 s each) before throwing. In bbq-m5 at 11:20, the same "At max warpable map level, still cannot find PokeCenter icon" failure repeated every ~13 s for minutes, and the outer loop then started over. A battle on the way also restarted the loop.Change
fly_toward_plaza()tries once and returns whether it flew. A failed fly or a battle (after fleeing) returns false. A shiny still stops the program.fly_to_closest_pokecenter_on_map()with a limit of 3 tries per search. The newmax_triesparameter defaults to 17, so other callers are unchanged.PlazaReturnActions::fly_to_plaza()returns that bool.return_to_plaza_checked()counts a fly that didn't happen as one of its 3 attempts: it logs "attempt k/3: the fly didn't happen.", skips the banner read, and the next attempt overshoots, as after a wrong landing.Worst case, a return is now 3 flies of at most 3 tries per search each, instead of unbounded. Lab runs R5a/R5b had 73/73 returns land on the first fly, so the bound shouldn't trigger in normal runs.
Not changed:
map_move_cursor_fly()was already bounded (3 tries, thenTerariumFlyFailedException, which fails the quest attempt and returns to the plaza).How to review
Nothing moved.
fly_toward_plaza()'swhile (!returned_to_pokecenter)became a plain block, so its body is re-indented in place, not changed. Use GitHub's "Hide whitespace" (?w=1). Read in this order:return_to_plaza_checked()(3 lines), thePlazaReturnActionscomment,fly_toward_plaza(), themax_trieslimit inPokemonSV_WorldNavigation.cpp, then the tests.Tests
ScriptedPlazaReturnActionscan script whether each fly happens. 4 newPokemonSV::BBQPlazaReturncases:The console side (the 3-try limit, battles) is console-only. All 35 native BBQ cases pass (macOS arm64).
🤖 Generated with Claude Code
https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E