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

Fixing Refresh AI scoring (#7539)

Browse Source
This commit is contained in:
surskitty 2025-08-12 17:16:43 -04:00 committed by GitHub
parent 7fb5d98bf6
commit 69cbd866aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_ai_main.c
View File

@ -2067,7 +2067,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score)
ADJUST_SCORE(-10);
break;
case EFFECT_REFRESH:
if (!(gBattleMons[battlerDef].status1 & STATUS1_CAN_MOVE))
if (!(gBattleMons[battlerAtk].status1 & STATUS1_CAN_MOVE))
ADJUST_SCORE(-10);
break;
case EFFECT_PSYCHO_SHIFT:
@ -4861,7 +4861,7 @@ static u32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move)
ADJUST_SCORE(WEAK_EFFECT);
break;
case EFFECT_REFRESH:
if (gBattleMons[battlerAtk].status1 & STATUS1_ANY)
if (gBattleMons[battlerAtk].status1 & STATUS1_CAN_MOVE)
ADJUST_SCORE(DECENT_EFFECT);
break;
case EFFECT_TAKE_HEART:

24
test/battle/ai/ai_check_viability.c
View File

@ -197,12 +197,22 @@ AI_SINGLE_BATTLE_TEST("AI chooses moves with secondary effect that have a 100% c
AI_DOUBLE_BATTLE_TEST("AI chooses moves that cure self or partner")
{
u32 status1_0, status1_1, partnerAbility;
u32 status1_0, status1_1, partnerAbility, move;
PARAMETRIZE { status1_0 = STATUS1_NONE; status1_1 = STATUS1_NONE;
move = MOVE_HEAL_BELL; partnerAbility = ABILITY_SCRAPPY; }
PARAMETRIZE { status1_0 = STATUS1_TOXIC_POISON; status1_1 = STATUS1_NONE;
move = MOVE_HEAL_BELL; partnerAbility = ABILITY_SCRAPPY; }
PARAMETRIZE { status1_0 = STATUS1_NONE; status1_1 = STATUS1_PARALYSIS;
move = MOVE_HEAL_BELL; partnerAbility = ABILITY_SCRAPPY; }
PARAMETRIZE { status1_0 = STATUS1_NONE; status1_1 = STATUS1_PARALYSIS;
move = MOVE_HEAL_BELL; partnerAbility = ABILITY_SOUNDPROOF; }
PARAMETRIZE { status1_0 = STATUS1_NONE; status1_1 = STATUS1_NONE;
move = MOVE_REFRESH; partnerAbility = ABILITY_SCRAPPY; }
PARAMETRIZE { status1_0 = STATUS1_TOXIC_POISON; status1_1 = STATUS1_NONE;
move = MOVE_REFRESH; partnerAbility = ABILITY_SCRAPPY; }
PARAMETRIZE { status1_0 = STATUS1_NONE; status1_1 = STATUS1_NONE; partnerAbility = ABILITY_SCRAPPY; }
PARAMETRIZE { status1_0 = STATUS1_TOXIC_POISON; status1_1 = STATUS1_NONE; partnerAbility = ABILITY_SCRAPPY; }
PARAMETRIZE { status1_0 = STATUS1_NONE; status1_1 = STATUS1_PARALYSIS; partnerAbility = ABILITY_SCRAPPY; }
PARAMETRIZE { status1_0 = STATUS1_NONE; status1_1 = STATUS1_PARALYSIS; partnerAbility = ABILITY_SOUNDPROOF; }
GIVEN {
ASSUME(GetMoveEffect(MOVE_HEAL_BELL) == EFFECT_HEAL_BELL);
@ -210,11 +220,11 @@ AI_DOUBLE_BATTLE_TEST("AI chooses moves that cure self or partner")
AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT);
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_REGIROCK) { Moves(MOVE_ROCK_SLIDE, MOVE_HEAL_BELL, MOVE_ACID); Status1(status1_0); }
OPPONENT(SPECIES_REGIROCK) { Moves(MOVE_ROCK_SLIDE, move, MOVE_ACID); Status1(status1_0); }
OPPONENT(SPECIES_EXPLOUD) { Status1(status1_1); Ability(partnerAbility); }
} WHEN {
if (status1_0 != STATUS1_NONE || (status1_1 != STATUS1_NONE && partnerAbility != ABILITY_SOUNDPROOF))
TURN { EXPECT_MOVE(opponentLeft, MOVE_HEAL_BELL); }
TURN { EXPECT_MOVE(opponentLeft, move); }
else
TURN { EXPECT_MOVE(opponentLeft, MOVE_ROCK_SLIDE); }
}