update Autostory tools. added UnexpectedBattleException. #493
Conversation
This file contains 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
Mysticial
reviewed
Oct 6, 2024
| namespace PokemonAutomation{ | ||
|
|
||
|
|
||
| UnexpectedBattleException::UnexpectedBattleException(ErrorReport error_report, Logger& logger, std::string message) |
There was a problem hiding this comment.
With this, there will be 4 exception classes with near identical implementations. I'll probably revisit this in future to try to merge away some of this duplicate code.
Mysticial
reviewed
Oct 6, 2024
| return fly_to_overworld_from_map(info, console, context, true); | ||
|
|
||
| }catch (UnexpectedBattleException& e){ | ||
| (void) e; |
There was a problem hiding this comment.
If you omit the parameter name in the catch declaration, you don't need to do this.
}catch (UnexpectedBattleException&){
Mysticial
reviewed
Oct 6, 2024
| open_map_from_overworld(info, console, context); | ||
| fly_to_closest_pokecenter_on_map(info, console, context); | ||
| }catch (UnexpectedBattleException& e){ | ||
| (void) e; |
Mysticial
reviewed
Oct 6, 2024
| throw OperationFailedException( | ||
| ErrorReport::SEND_ERROR_REPORT, console, | ||
| "leave_phone_to_overworld(): Unknown state after 10 button Y presses.", | ||
| true | ||
| ); | ||
| ); |
There was a problem hiding this comment.
Not sure how these random trailing spaces get added.
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.
added UnexpectedBattleException.
added battle detection for functions that need to detect overworld.
Updated DestionationMarker detector so that it can be detected within the minimap (where it alternates between orange and yellow).
I also added handle_when_stationary_in_overworld(). It's commented out for now, since it requires
StationaryOverworldWatcher, which hasn't been merged yet. I'll submit this in another PR later.