atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better AI_TryToFaint

Browse source
This commit is contained in:
Evan 2021-01-26 17:11:55 -07:00
parent c003f1c023
commit 18f5d9f0a3
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/battle_ai_main.c
View file

@ -2412,33 +2412,40 @@ static s16 AI_CheckBadMove(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
static s16 AI_TryToFaint(u8 battlerAtk, u8 battlerDef, u16 move, s16 score) static s16 AI_TryToFaint(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
{ {
s32 dmg;
u8 result;
if (IsTargetingPartner(battlerAtk, battlerDef)) if (IsTargetingPartner(battlerAtk, battlerDef))
return score; // don't try to faint your ally ever return score;
if (gBattleMoves[AI_THINKING_STRUCT->moveConsidered].power == 0) if (gBattleMoves[move].power == 0)
return score; // can't make anything faint with no power return score; // can't make anything faint with no power
if (CanAttackerFaintTarget(battlerAtk, battlerDef, AI_THINKING_STRUCT->movesetIndex, 0) && gBattleMoves[move].effect != EFFECT_EXPLOSION) if (CanAttackerFaintTarget(battlerAtk, battlerDef, AI_THINKING_STRUCT->movesetIndex, 0) && gBattleMoves[move].effect != EFFECT_EXPLOSION)
{ {
// AI_TryToFaint_Can // this move can faint the target
if (IsAiFaster(AI_CHECK_FASTER) || TestMoveFlags(move, FLAG_HIGH_CRIT)) if (GetWhoStrikesFirst(battlerAtk, battlerDef, TRUE) == 0 || GetMovePriority(battlerAtk, move) > 0)
score += 4; score += 4;
else else
score += 2; score += 2;
} }
else else
{ {
// this move isn't expected to faint the target
if (TestMoveFlags(move, FLAG_HIGH_CRIT))
score += 2; // crit makes it more likely to make them faint
if (GetMoveDamageResult(move) == MOVE_POWER_DISCOURAGED) if (GetMoveDamageResult(move) == MOVE_POWER_DISCOURAGED)
score--; score--;
if (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef) == AI_EFFECTIVENESS_x4) switch (AI_GetMoveEffectiveness(move, battlerAtk, battlerDef))
{ {
// AI_TryToFaint_DoubleSuperEffective case AI_EFFECTIVENESS_x4:
if ((Random() % 256) >= 80) score += 4;
break;
case AI_EFFECTIVENESS_x2:
if (AI_RandLessThan(176))
score += 2; score += 2;
else
score++;
break;
} }
} }