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

Improve AI's handling of player's Encore (#6305)

Browse Source 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
This commit is contained in:
Pawkkie 2025-03-04 08:26:07 -05:00 committed by GitHub
parent 8041f6978b
commit 3398d75fe8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/battle_ai_util.c
View File

@ -3831,6 +3831,7 @@ static u32 IncreaseStatUpScoreInternal(u32 battlerAtk, u32 battlerDef, u32 statI
u32 noOfHitsToFaint = NoOfHitsForTargetToFaintAI(battlerDef, battlerAtk);
u32 aiIsFaster = AI_IsFaster(battlerAtk, battlerDef, TRUE);
u32 shouldSetUp = ((noOfHitsToFaint >= 2 && aiIsFaster) || (noOfHitsToFaint >= 3 && !aiIsFaster) || noOfHitsToFaint == UNKNOWN_NO_OF_HITS);
u32 i;
if (considerContrary && AI_DATA->abilities[battlerAtk] == ABILITY_CONTRARY)
return NO_INCREASE;
@ -3851,9 +3852,30 @@ static u32 IncreaseStatUpScoreInternal(u32 battlerAtk, u32 battlerDef, u32 statI
if (AI_DATA->abilities[battlerDef] == ABILITY_OPPORTUNIST)
return NO_INCREASE;
// If predicting switch, stat increases are great momentum
// Don't increase stats if opposing battler has Encore
if (HasMoveEffect(battlerDef, EFFECT_ENCORE))
return NO_INCREASE;
if (IsDoubleBattle() && HasMoveEffect(GetPartnerBattler(battlerDef), EFFECT_ENCORE))
return NO_INCREASE;
// Predicting switch
if (IsBattlerPredictedToSwitch(battlerDef))
{
struct Pokemon *playerParty = GetBattlerParty(battlerDef);
// If expected switchin outspeeds and has Encore, don't increase
for (i = 0; i < MAX_MON_MOVES; i++)
{
if (GetMoveEffect(GetMonData(&playerParty[AI_DATA->mostSuitableMonId[battlerDef]], MON_DATA_MOVE1 + i, NULL)) == EFFECT_ENCORE
&& GetMonData(&playerParty[AI_DATA->mostSuitableMonId[battlerDef]], MON_DATA_PP1 + i, NULL) > 0);
{
if (GetMonData(&playerParty[AI_DATA->mostSuitableMonId[battlerDef]], MON_DATA_SPEED, NULL) > gBattleMons[battlerAtk].speed)
return NO_INCREASE;
}
}
// Otherwise if predicting switch, stat increases are great momentum
tempScore += WEAK_EFFECT;
}
switch (statId)
{