Fixed AI not handling type effectiveness beyond x8 #6127
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
reviewed
Jan 27, 2025
src/battle_ai_main.c
Outdated
| @@ -4488,7 +4485,7 @@ static u32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move) | |||
| break; | |||
| case EFFECT_MAGNET_RISE: | |||
| if (IsBattlerGrounded(battlerAtk) && HasDamagingMoveOfType(battlerDef, TYPE_ELECTRIC) | |||
| && !(AI_GetMoveEffectiveness(MOVE_EARTHQUAKE, battlerDef, battlerAtk) == AI_EFFECTIVENESS_x0)) // Doesn't resist ground move | |||
| && !(AI_GetMoveEffectiveness(MOVE_EARTHQUAKE, battlerDef, battlerAtk) == UQ_4_12(0.0))) // Doesn't resist ground move | |||
There was a problem hiding this comment.
I think you can use the var effectiveness here?
src/battle_ai_main.c
Outdated
| @@ -4506,7 +4503,7 @@ static u32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move) | |||
| break; | |||
| case EFFECT_CAMOUFLAGE: | |||
| if (predictedMove != MOVE_NONE && AI_IsFaster(battlerAtk, battlerDef, move) // Attacker goes first | |||
| && !IsBattleMoveStatus(move) && AI_GetMoveEffectiveness(predictedMove, battlerDef, battlerAtk) != AI_EFFECTIVENESS_x0) | |||
| && !IsBattleMoveStatus(move) && AI_GetMoveEffectiveness(predictedMove, battlerDef, battlerAtk) != UQ_4_12(0.0)) | |||
AlexOn1ine
approved these changes
Jan 28, 2025
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
x32 can be achieved with the following:
People who collaborated with me in this PR
@/sshadowzkmao
Things to note in the release changelog:
AI_EFFECTIVENESS_in favor of storing the actual type effectiveness.AI_GetTypeEffectivenesstoAI_GetMoveEffectiveness, removing the original one.Discord contact info
AsparagusEduardo