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

fixed damage calculations in CanTargetFaintAiWithMod() (#6446)

Browse Source 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
This commit is contained in:
wiz1989 2025-04-10 14:56:49 +02:00 committed by GitHub
parent 89da80b9d1
commit 60a4e191ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/battle_ai_switch_items.c
View File

@ -30,6 +30,7 @@ static bool32 AI_ShouldHeal(u32 battler, u32 healAmount);
static bool32 AI_OpponentCanFaintAiWithMod(u32 battler, u32 healAmount);
static u32 GetSwitchinHazardsDamage(u32 battler, struct BattlePokemon *battleMon);
static bool32 CanAbilityTrapOpponent(u16 ability, u32 opponent);
static u32 GetHPHealAmount(u8 itemEffectParam, struct Pokemon *mon);
static void InitializeSwitchinCandidate(struct Pokemon *mon)
{
@ -2250,6 +2251,7 @@ static bool32 ShouldUseItem(u32 battler)
s32 i;
u8 validMons = 0;
bool32 shouldUse = FALSE;
u32 healAmount = 0;
if (IsAiVsAiBattle())
return FALSE;
@ -2291,10 +2293,12 @@ static bool32 ShouldUseItem(u32 battler)
switch (ItemId_GetBattleUsage(item))
{
case EFFECT_ITEM_HEAL_AND_CURE_STATUS:
shouldUse = AI_ShouldHeal(battler, 0);
healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], &gEnemyParty[gBattlerPartyIndexes[battler]]);
shouldUse = AI_ShouldHeal(battler, healAmount);
break;
case EFFECT_ITEM_RESTORE_HP:
shouldUse = AI_ShouldHeal(battler, itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)]);
healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], &gEnemyParty[gBattlerPartyIndexes[battler]]);
shouldUse = AI_ShouldHeal(battler, healAmount);
break;
case EFFECT_ITEM_CURE_STATUS:
if (itemEffects[3] & ITEM3_SLEEP && gBattleMons[battler].status1 & STATUS1_SLEEP)
@ -2360,6 +2364,9 @@ static bool32 ShouldUseItem(u32 battler)
static bool32 AI_ShouldHeal(u32 battler, u32 healAmount)
{
bool32 shouldHeal = FALSE;
u8 opponent;
u32 maxDamage = 0;
u32 dmg = 0;
if (gBattleMons[battler].hp < gBattleMons[battler].maxHP / 4
|| gBattleMons[battler].hp == 0
@ -2369,6 +2376,30 @@ static bool32 AI_ShouldHeal(u32 battler, u32 healAmount)
shouldHeal = !AI_OpponentCanFaintAiWithMod(battler, healAmount); // if target can kill us even after we heal, why bother
}
//calculate max expected damage from the opponent
for (opponent = 0; opponent < gBattlersCount; opponent++)
{
if (GetBattlerSide(opponent) == B_SIDE_PLAYER)
{
dmg = GetBestDmgFromBattler(opponent, battler, AI_DEFENDING);
if (dmg > maxDamage)
maxDamage = dmg;
}
}
// also heal if a 2HKO is outhealed
if (AI_OpponentCanFaintAiWithMod(battler, 0)
&& !AI_OpponentCanFaintAiWithMod(battler, healAmount)
&& healAmount > 2*maxDamage)
return TRUE;
// also heal, if the expected damage is outhealed and it's the last remaining mon
if (AI_OpponentCanFaintAiWithMod(battler, 0)
&& !AI_OpponentCanFaintAiWithMod(battler, healAmount)
&& CountUsablePartyMons(battler) == 0)
return TRUE;
return shouldHeal;
}
@ -2386,3 +2417,28 @@ static bool32 AI_OpponentCanFaintAiWithMod(u32 battler, u32 healAmount)
}
return FALSE;
}
static u32 GetHPHealAmount(u8 itemEffectParam, struct Pokemon *mon)
{
switch (itemEffectParam)
{
case ITEM6_HEAL_HP_FULL:
itemEffectParam = GetMonData(mon, MON_DATA_MAX_HP, NULL) - GetMonData(mon, MON_DATA_HP, NULL);
break;
case ITEM6_HEAL_HP_HALF:
itemEffectParam = GetMonData(mon, MON_DATA_MAX_HP, NULL) / 2;
if (itemEffectParam == 0)
itemEffectParam = 1;
break;
case ITEM6_HEAL_HP_LVL_UP:
itemEffectParam = gBattleScripting.levelUpHP;
break;
case ITEM6_HEAL_HP_QUARTER:
itemEffectParam = GetMonData(mon, MON_DATA_MAX_HP, NULL) / 4;
if (itemEffectParam == 0)
itemEffectParam = 1;
break;
}
return itemEffectParam;
}

2
src/battle_ai_util.c
View File

@ -1350,7 +1350,7 @@ bool32 CanTargetFaintAiWithMod(u32 battlerDef, u32 battlerAtk, s32 hpMod, s32 dm
if (IsMoveUnusable(moveIndex, moves[moveIndex], moveLimitations))
continue;
dmg = AI_GetDamage(battlerAtk, battlerDef, moveIndex, AI_DEFENDING, aiData);
dmg = AI_GetDamage(battlerDef, battlerAtk, moveIndex, AI_DEFENDING, aiData);
if (dmgMod)
dmg *= dmgMod;