Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove #3218
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
src/battle_ai_switch_items.c
Outdated
| if (absorbingTypeAbility == monAbility && Random() & 1) | ||
| if (absorbingTypeAbility == monAbility | ||
| || (absorbingTypeAbility == ABILITY_WATER_ABSORB && (monAbility == ABILITY_STORM_DRAIN || monAbility == ABILITY_DRY_SKIN)) | ||
| || (absorbingTypeAbility == ABILITY_VOLT_ABSORB && (monAbility == ABILITY_MOTOR_DRIVE || monAbility == ABILITY_LIGHTNING_ROD)) |
There was a problem hiding this comment.
hmm, I think it might be better to have a small array that correlates each ability to the type it absorbs,
There was a problem hiding this comment.
Updated following this structure, almost exactly lifted from Buffel's Inclement Emerald so if this gets accepted please also credit them :)
Previous implementation involving piggybacking on a conditional in a bit of a messy fashion to check for each ability type, this should be more readable and more easily modified by a novice. This is almost exactly BuffelSaft's inclement emerald implementation.
LOuroboros
reviewed
Aug 22, 2023
LOuroboros
reviewed
Aug 22, 2023
DizzyEggg
approved these changes
Aug 28, 2023
Merged
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.
Description
Adds consideration for Sap Sipper, Storm Drain, Dry Skin, Motor Drive, and Lightning Rod to the
FindMonThatAbsorbsOpponentsMovefunction, which is called by the ShouldSwitch function and affects the switch AI.This works fine for Flash Fire, Water Absorb, and Volt Absorb by default, just adding the missing abilities. This was initially brought up by EZBREEZY on Discord, and Alex suggested I PR it.
Discord contact info
Pawkkie