Improve wild encounter handling #86
Merged
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
There are some scenarios (Eterna Forest with Cheryl) where wild encounters may contain more than one wild pokemon. This solution needs some polish as I'm unfamilair with the codebase.
The wild encounter list is now only populated with pokemon in the battle. Empty pokemon entries are not added to the list.
The party list is iterated through to cull any empty slots that would otherwise be present as well as providing the species of the pokemon before requiring the user to drill down.
The wild objects used in bdsp are shared by both random encounters as well as trainer battles. In order to highlight this, the use of wild in several places was replaced with encounter.
zaksabeast
requested changes
Feb 6, 2022
This change is to facilitate generalized pokemon parsing in order to improve standardization and reusability of code.
|
Just to be clear, I don't expect you to replace the party view for all games; that's outside the scope of this PR. I can do that later. |
Unified pokemon list implemented and applied to both encounter lsits as well as the party.
The filtering was implemented to solve the problem of empty stots being hown in the list view, this has been resolved with the addition of the count parameter.
Player party count added to support pokemon list view changes
|
Issues should be resolved. |
|
After reading the issue mentioned in the original post (#36), I'm going to keep it opened since it isn't fully resolved:
I should probably open a new issue to address the second point and separate the two. However this PR did help get it closer to being closed! |
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.
This PR is intended to resolve the issue of only the first Pokemon being shown when in a wild encounter.
The code used by the wild encounter system is shared by the trainer battle system and as such this PR changes the naming to highlight that fact.
As this is the case, this PR should also resolve the outstanding requests raised in #36.