Minor shouldUseGimmick refactor #4962
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
Bassoonian
reviewed
Jul 13, 2024
Comment on lines
+69
to
+72
| if (!TESTING && !CheckBagHasItem(ITEM_TERA_ORB, 1)) | ||
| return FALSE; | ||
|
|
||
| if (!TESTING |
There was a problem hiding this comment.
Since we check !TESTING twice, shouldn't we just rewrite it so it only needs to be checked once?
There was a problem hiding this comment.
Also, this touches the same code as #4863. Does this supersede that PR, too?
There was a problem hiding this comment.
No, it doesn't. Only thing I did was wrap it around the player check but I agree with you that it should be somehow simplified. In general I think that the whole sequence of checks is very weird which I tried to simplify in #4863. In general though I would prefer it if this pr gets merged (ideally first) and the rest is handled in the old pr.
Bassoonian
approved these changes
Jul 13, 2024
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.
#4861
Replaced
shouldUseGimmickwithshouldUseDynamax.Simplifies the usage for tera since you only need to set the tera type now. Also the field was misleading since it implies you have to set it for Mega and Z moves as well which wasn't true. We still need it for dynamax though since dynamlevel is set by default. See the comment from Duke.
Also fixes an issue where enemy trainers couldn't use tera