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

Small AI fixes by mrgriffin

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2022-07-26 09:53:39 -04:00
parent 57e2de092b
commit 611b192e8c
1 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/battle_ai_main.c
View file

@ -3061,7 +3061,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
if (AI_RandLessThan(128)) if (AI_RandLessThan(128))
IncreaseSleepScore(battlerAtk, battlerDef, move, &score); IncreaseSleepScore(battlerAtk, battlerDef, move, &score);
break; break;
case EFFECT_ABSORB: case EFFECT_ABSORB:
if (AI_DATA->holdEffects[battlerAtk] == HOLD_EFFECT_BIG_ROOT) if (AI_DATA->holdEffects[battlerAtk] == HOLD_EFFECT_BIG_ROOT)
score++; score++;
if (effectiveness <= AI_EFFECTIVENESS_x0_5 && AI_RandLessThan(50)) if (effectiveness <= AI_EFFECTIVENESS_x0_5 && AI_RandLessThan(50))
@ -3075,12 +3075,12 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
score++; score++;
} }
break; break;
case EFFECT_MIRROR_MOVE: case EFFECT_MIRROR_MOVE:
if (predictedMove != MOVE_NONE) if (predictedMove != MOVE_NONE)
return AI_CheckViability(battlerAtk, battlerDef, gLastMoves[battlerDef], score); return AI_CheckViability(battlerAtk, battlerDef, gLastMoves[battlerDef], score);
break; break;
// stat raising effects // stat raising effects
case EFFECT_ATTACK_UP: case EFFECT_ATTACK_UP:
case EFFECT_ATTACK_UP_2: case EFFECT_ATTACK_UP_2:
if (MovesWithSplitUnusable(battlerAtk, battlerDef, SPLIT_PHYSICAL)) if (MovesWithSplitUnusable(battlerAtk, battlerDef, SPLIT_PHYSICAL))
{ {
@ -3101,7 +3101,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
score--; score--;
} }
break; break;
case EFFECT_DEFENSE_UP: case EFFECT_DEFENSE_UP:
case EFFECT_DEFENSE_UP_2: case EFFECT_DEFENSE_UP_2:
case EFFECT_DEFENSE_UP_3: case EFFECT_DEFENSE_UP_3:
if (!HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL)) if (!HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL))
@ -3113,7 +3113,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
else if (AI_DATA->hpPercents[battlerAtk] < 40) else if (AI_DATA->hpPercents[battlerAtk] < 40)
score -= 2; score -= 2;
break; break;
case EFFECT_SPEED_UP: case EFFECT_SPEED_UP:
case EFFECT_SPEED_UP_2: case EFFECT_SPEED_UP_2:
if (!WillAIStrikeFirst()) if (!WillAIStrikeFirst())
{ {
@ -3125,7 +3125,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
score -= 3; score -= 3;
} }
break; break;
case EFFECT_SPECIAL_ATTACK_UP: case EFFECT_SPECIAL_ATTACK_UP:
case EFFECT_SPECIAL_ATTACK_UP_2: case EFFECT_SPECIAL_ATTACK_UP_2:
case EFFECT_SPECIAL_ATTACK_UP_3: case EFFECT_SPECIAL_ATTACK_UP_3:
if (MovesWithSplitUnusable(battlerAtk, battlerDef, SPLIT_SPECIAL)) if (MovesWithSplitUnusable(battlerAtk, battlerDef, SPLIT_SPECIAL))
@ -3147,7 +3147,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
score--; score--;
} }
break; break;
case EFFECT_SPECIAL_DEFENSE_UP: case EFFECT_SPECIAL_DEFENSE_UP:
case EFFECT_SPECIAL_DEFENSE_UP_2: case EFFECT_SPECIAL_DEFENSE_UP_2:
if (!HasMoveWithSplit(battlerDef, SPLIT_SPECIAL)) if (!HasMoveWithSplit(battlerDef, SPLIT_SPECIAL))
score -= 2; score -= 2;
@ -3158,7 +3158,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
else if (AI_DATA->hpPercents[battlerAtk] < 40) else if (AI_DATA->hpPercents[battlerAtk] < 40)
score -= 2; score -= 2;
break; break;
case EFFECT_ACCURACY_UP: case EFFECT_ACCURACY_UP:
case EFFECT_ACCURACY_UP_2: case EFFECT_ACCURACY_UP_2:
if (gBattleMons[battlerAtk].statStages[STAT_ACC] >= 9 && !AI_RandLessThan(50)) if (gBattleMons[battlerAtk].statStages[STAT_ACC] >= 9 && !AI_RandLessThan(50))
score -= 2; score -= 2;
@ -3167,7 +3167,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
else else
score++; score++;
break; break;
case EFFECT_EVASION_UP: case EFFECT_EVASION_UP:
case EFFECT_EVASION_UP_2: case EFFECT_EVASION_UP_2:
if (AI_DATA->hpPercents[battlerAtk] > 90 && !AI_RandLessThan(100)) if (AI_DATA->hpPercents[battlerAtk] > 90 && !AI_RandLessThan(100))
score += 3; score += 3;
@ -3189,7 +3189,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
score -= 2; score -= 2;
break; break;
// stat lowering effects // stat lowering effects
case EFFECT_ATTACK_DOWN: case EFFECT_ATTACK_DOWN:
case EFFECT_ATTACK_DOWN_2: case EFFECT_ATTACK_DOWN_2:
if (!ShouldLowerAttack(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef])) if (!ShouldLowerAttack(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef]))
score -= 2; score -= 2;
@ -3202,7 +3202,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
else if (AI_DATA->hpPercents[battlerDef] < 70) else if (AI_DATA->hpPercents[battlerDef] < 70)
score -= 2; score -= 2;
break; break;
case EFFECT_DEFENSE_DOWN: case EFFECT_DEFENSE_DOWN:
case EFFECT_DEFENSE_DOWN_2: case EFFECT_DEFENSE_DOWN_2:
if (!ShouldLowerDefense(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef])) if (!ShouldLowerDefense(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef]))
score -= 2; score -= 2;
@ -3211,14 +3211,14 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
if (AI_DATA->hpPercents[battlerDef] <= 70) if (AI_DATA->hpPercents[battlerDef] <= 70)
score -= 2; score -= 2;
break; break;
case EFFECT_SPEED_DOWN: case EFFECT_SPEED_DOWN:
case EFFECT_SPEED_DOWN_2: case EFFECT_SPEED_DOWN_2:
if (WillAIStrikeFirst()) if (WillAIStrikeFirst())
score -= 3; score -= 3;
else if (!AI_RandLessThan(70)) else if (!AI_RandLessThan(70))
score += 2; score += 2;
break; break;
case EFFECT_SPECIAL_ATTACK_DOWN: case EFFECT_SPECIAL_ATTACK_DOWN:
case EFFECT_SPECIAL_ATTACK_DOWN_2: case EFFECT_SPECIAL_ATTACK_DOWN_2:
if (!ShouldLowerSpAtk(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef])) if (!ShouldLowerSpAtk(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef]))
score -= 2; score -= 2;
@ -3231,7 +3231,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
else if (AI_DATA->hpPercents[battlerDef] < 70) else if (AI_DATA->hpPercents[battlerDef] < 70)
score -= 2; score -= 2;
break; break;
case EFFECT_SPECIAL_DEFENSE_DOWN: case EFFECT_SPECIAL_DEFENSE_DOWN:
case EFFECT_SPECIAL_DEFENSE_DOWN_2: case EFFECT_SPECIAL_DEFENSE_DOWN_2:
if (!ShouldLowerSpDef(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef])) if (!ShouldLowerSpDef(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef]))
score -= 2; score -= 2;
@ -3241,7 +3241,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
if (AI_DATA->hpPercents[battlerDef] <= 70) if (AI_DATA->hpPercents[battlerDef] <= 70)
score -= 2; score -= 2;
break; break;
case EFFECT_ACCURACY_DOWN: case EFFECT_ACCURACY_DOWN:
case EFFECT_ACCURACY_DOWN_2: case EFFECT_ACCURACY_DOWN_2:
if (ShouldLowerAccuracy(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef])) if (ShouldLowerAccuracy(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef]))
score -= 2; score -= 2;
@ -3262,7 +3262,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
else if (AI_DATA->hpPercents[battlerAtk] < 40 || AI_DATA->hpPercents[battlerDef] < 40 || !AI_RandLessThan(70)) else if (AI_DATA->hpPercents[battlerAtk] < 40 || AI_DATA->hpPercents[battlerDef] < 40 || !AI_RandLessThan(70))
score -= 2; score -= 2;
break; break;
case EFFECT_EVASION_DOWN: case EFFECT_EVASION_DOWN:
case EFFECT_EVASION_DOWN_2: case EFFECT_EVASION_DOWN_2:
if (!ShouldLowerEvasion(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef])) if (!ShouldLowerEvasion(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef]))
score -= 2; score -= 2;
@ -3410,17 +3410,14 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
score += 5; score += 5;
break; break;
case EFFECT_TRAP: case EFFECT_TRAP:
if (HasMoveEffect(battlerDef, EFFECT_RAPID_SPIN))
break;
//fallthrough
case EFFECT_MEAN_LOOK: case EFFECT_MEAN_LOOK:
if (HasMoveEffect(battlerDef, EFFECT_RAPID_SPIN) if (IsBattlerTrapped(battlerDef, TRUE))
|| (B_GHOSTS_ESCAPE >= GEN_6 && IS_BATTLER_OF_TYPE(battlerDef, TYPE_GHOST))
|| gBattleMons[battlerDef].status2 & STATUS2_WRAPPED)
{
break; // in this case its a bad attacking move break; // in this case its a bad attacking move
}
else if (ShouldTrap(battlerAtk, battlerDef, move)) else if (ShouldTrap(battlerAtk, battlerDef, move))
{
score += 5; score += 5;
}
break; break;
case EFFECT_MIST: case EFFECT_MIST:
if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_SCREENER) if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_SCREENER)
@ -3464,7 +3461,6 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
score++; score++;
if (AI_DATA->abilities[battlerAtk] == ABILITY_SERENE_GRACE && AI_DATA->abilities[battlerDef] != ABILITY_CONTRARY) if (AI_DATA->abilities[battlerAtk] == ABILITY_SERENE_GRACE && AI_DATA->abilities[battlerDef] != ABILITY_CONTRARY)
score++; score++;
break;
if (ShouldLowerSpeed(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef])) if (ShouldLowerSpeed(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef]))
{ {
if (AI_DATA->abilities[battlerAtk] == ABILITY_SERENE_GRACE && AI_DATA->abilities[battlerDef] != ABILITY_CONTRARY) if (AI_DATA->abilities[battlerAtk] == ABILITY_SERENE_GRACE && AI_DATA->abilities[battlerDef] != ABILITY_CONTRARY)
@ -3558,7 +3554,7 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
if (gLastMoves[battlerDef] == predictedMove) if (gLastMoves[battlerDef] == predictedMove)
score += 3; score += 3;
else */if (CanMoveFaintBattler(gLastMoves[battlerDef], battlerDef, battlerAtk, 1)) else */if (CanMoveFaintBattler(gLastMoves[battlerDef], battlerDef, battlerAtk, 1))
score += 2;; //Disable move that can kill attacker score += 2; //Disable move that can kill attacker
} }
} }
else if (predictedMove != MOVE_NONE && IS_MOVE_STATUS(predictedMove)) else if (predictedMove != MOVE_NONE && IS_MOVE_STATUS(predictedMove))
@ -4302,8 +4298,8 @@ static s16 AI_CheckViability(u8 battlerAtk, u8 battlerDef, u16 move, s16 score)
IncreaseStatUpScore(battlerAtk, battlerDef, STAT_SPDEF, &score); IncreaseStatUpScore(battlerAtk, battlerDef, STAT_SPDEF, &score);
break; break;
case EFFECT_SHELL_SMASH: case EFFECT_SHELL_SMASH:
if (AI_DATA->holdEffects[battlerAtk] == HOLD_EFFECT_POWER_HERB) if (AI_DATA->holdEffects[battlerAtk] == HOLD_EFFECT_RESTORE_STATS)
score += 3; score += 1;
IncreaseStatUpScore(battlerAtk, battlerDef, STAT_SPEED, &score); IncreaseStatUpScore(battlerAtk, battlerDef, STAT_SPEED, &score);
IncreaseStatUpScore(battlerAtk, battlerDef, STAT_SPATK, &score); IncreaseStatUpScore(battlerAtk, battlerDef, STAT_SPATK, &score);