Change freeze dry to allow easier extendebility #4312
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
AlexOn1ine
changed the title
cfmnephrite
reviewed
Mar 27, 2024
| @@ -4258,7 +4258,7 @@ static u32 AI_CalcMoveScore(u32 battlerAtk, u32 battlerDef, u32 move) | |||
| ADJUST_SCORE(DECENT_EFFECT); | |||
| break; | |||
| case EFFECT_SOAK: | |||
| if (HasMoveWithType(battlerAtk, TYPE_ELECTRIC) || HasMoveWithType(battlerAtk, TYPE_GRASS) || HasMoveEffect(battlerAtk, EFFECT_FREEZE_DRY)) | |||
| if (HasMoveWithType(battlerAtk, TYPE_ELECTRIC) || HasMoveWithType(battlerAtk, TYPE_GRASS) || (HasMoveEffect(battlerAtk, EFFECT_SUPER_EFFECTIVE_ON_ARG) && gMovesInfo[move].argument == TYPE_WATER) ) | |||
There was a problem hiding this comment.
Worth adding a generic IsSuperEffectiveOnType function?
There was a problem hiding this comment.
I do think that's a great idea but I've decided not to do it right now since it's not a very common check. Though if something like this comes up again in the future I'll introduce the suggested function.
|
Ready for review, now with tests. Also I wanted to base the stat used for Foul Play and Body Press based on the argument but even with CFs code example (from discord) I couldn't get it to work. |
Bassoonian
approved these changes
Mar 31, 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.
Suggested by The Sylph is in.
Removes hardcoded check in favor of an argument and renames
EFFECT_FREEZE_DRYtoEFFECT_SUPER_EFFECTIVE_ON_ARGAlso gives Body Press the Foul Play treatment so user can make a move based on spDef