Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix type check in Magnet Rise AI (#8609)

Browse Source
This commit is contained in:
grintoul 2025-12-21 11:26:21 +00:00 committed by GitHub
parent 828e12bee6
commit ae01e51f85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_ai_main.c
View File

@ -5519,7 +5519,7 @@ static s32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move, stru
ADJUST_SCORE(GOOD_EFFECT); ADJUST_SCORE(GOOD_EFFECT);
break; break;
case EFFECT_MAGNET_RISE: case EFFECT_MAGNET_RISE:
if (AI_IsBattlerGrounded(battlerAtk) && HasDamagingMoveOfType(battlerDef, TYPE_ELECTRIC) if (AI_IsBattlerGrounded(battlerAtk) && HasDamagingMoveOfType(battlerDef, TYPE_GROUND)
&& !(effectiveness == UQ_4_12(0.0))) // Doesn't resist ground move && !(effectiveness == UQ_4_12(0.0))) // Doesn't resist ground move
{ {
if (AI_IsFaster(battlerAtk, battlerDef, move, predictedMoveSpeedCheck, CONSIDER_PRIORITY)) // Attacker goes first if (AI_IsFaster(battlerAtk, battlerDef, move, predictedMoveSpeedCheck, CONSIDER_PRIORITY)) // Attacker goes first
@ -5530,8 +5530,7 @@ static s32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move, stru
} }
else // Opponent Goes First else // Opponent Goes First
{ {
if (HasDamagingMoveOfType(battlerDef, TYPE_GROUND)) ADJUST_SCORE(DECENT_EFFECT);
ADJUST_SCORE(DECENT_EFFECT);
break; break;
} }
} }