AI battle tests + AI logic fixes (rh-hideout#3361)

Kasenn · Dec 29, 2023 · 6745f13 · 6745f13
1 parent f20850e
commit 6745f13
Show file tree

Hide file tree

Showing 17 changed files with 2,332 additions and 1,031 deletions.
diff --git a/include/battle_ai_main.h b/include/battle_ai_main.h
@@ -1,21 +1,38 @@
 #ifndef GUARD_BATTLE_AI_MAIN_H
 #define GUARD_BATTLE_AI_MAIN_H
 
-// return values for BattleAI_ChooseMoveOrAction
+// return vals for BattleAI_ChooseMoveOrAction
 // 0 - 3 are move idx
 #define AI_CHOICE_FLEE 4
 #define AI_CHOICE_WATCH 5
 #define AI_CHOICE_SWITCH 7
 
+#include "test_runner.h"
+
+// Logs for debugging AI tests.
+#define SET_SCORE(battler, movesetIndex, val) \
+    do \
+    { \
+        TestRunner_Battle_AISetScore(__FILE__, __LINE__, battler, movesetIndex, val); \
+        AI_THINKING_STRUCT->score[movesetIndex] = val; \
+    } while (0) \
+
+#define ADJUST_SCORE(val) \
+    do \
+    { \
+        TestRunner_Battle_AIAdjustScore(__FILE__, __LINE__, sBattler_AI, AI_THINKING_STRUCT->movesetIndex, val); \
+        score += val; \
+    } while (0) \
+
 #define RETURN_SCORE_PLUS(val)      \
 {                                   \
-    score += val;                   \
+    ADJUST_SCORE(val);              \
     return score;                   \
 }
 
 #define RETURN_SCORE_MINUS(val)     \
 {                                   \
-    score -= val;                   \
+    ADJUST_SCORE(-val);             \
     return score;                   \
 }
 

diff --git a/include/battle_ai_util.h b/include/battle_ai_util.h
@@ -36,7 +36,6 @@ bool32 CanTargetMoveFaintAi(u32 move, u32 battlerDef, u32 battlerAtk, u32 nHits)
 bool32 CanTargetFaintAiWithMod(u32 battlerDef, u32 battlerAtk, s32 hpMod, s32 dmgMod);
 s32 AI_DecideKnownAbilityForTurn(u32 battlerId);
 u32 AI_DecideHoldEffectForTurn(u32 battlerId);
-u32 AI_GetMoveAccuracy(u32 battlerAtk, u32 battlerDef, u32 move);
 bool32 DoesBattlerIgnoreAbilityChecks(u32 atkAbility, u32 move);
 u32 AI_GetWeather(struct AiLogicData *aiData);
 bool32 CanAIFaintTarget(u32 battlerAtk, u32 battlerDef, u32 numHits);
@@ -85,7 +84,7 @@ bool32 ShouldLowerEvasion(u32 battlerAtk, u32 battlerDef, u32 defAbility);
 // move checks
 bool32 IsAffectedByPowder(u32 battler, u32 ability, u32 holdEffect);
 bool32 MovesWithSplitUnusable(u32 attacker, u32 target, u32 split);
-u32 AI_WhichMoveBetter(u32 move1, u32 move2, u32 battlerAtk, u32 battlerDef);
+u32 AI_WhichMoveBetter(u32 move1, u32 move2, u32 battlerAtk, u32 battlerDef, s32 noOfHitsToKo);
 s32 AI_CalcDamageSaveBattlers(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectiveness, bool32 considerZPower);
 s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectiveness, bool32 considerZPower, u32 weather);
 bool32 AI_IsDamagedByRecoil(u32 battler);
@@ -169,7 +168,7 @@ bool32 IsTargetingPartner(u32 battlerAtk, u32 battlerDef);
 bool32 DoesPartnerHaveSameMoveEffect(u32 battlerAtkPartner, u32 battlerDef, u32 move, u32 partnerMove);
 bool32 PartnerHasSameMoveEffectWithoutTarget(u32 battlerAtkPartner, u32 move, u32 partnerMove);
 bool32 PartnerMoveEffectIsStatusSameTarget(u32 battlerAtkPartner, u32 battlerDef, u32 partnerMove);
-bool32 PartnerMoveEffectIsWeather(u32 battlerAtkPartner, u32 partnerMove);
+bool32 IsMoveEffectWeather(u32 move);
 bool32 PartnerMoveEffectIsTerrain(u32 battlerAtkPartner, u32 partnerMove);
 bool32 PartnerMoveIs(u32 battlerAtkPartner, u32 partnerMove, u32 moveCheck);
 bool32 PartnerMoveIsSameAsAttacker(u32 battlerAtkPartner, u32 battlerDef, u32 move, u32 partnerMove);

diff --git a/include/battle_util.h b/include/battle_util.h
@@ -147,6 +147,7 @@ bool32 TryChangeBattleWeather(u32 battler, u32 weatherEnumId, bool32 viaAbility)
 u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 moveArg);
 bool32 TryPrimalReversion(u32 battler);
 bool32 IsNeutralizingGasOnField(void);
+bool32 IsMoldBreakerTypeAbility(u32 ability);
 u32 GetBattlerAbility(u32 battler);
 u32 IsAbilityOnSide(u32 battler, u32 ability);
 u32 IsAbilityOnOpposingSide(u32 battler, u32 ability);

diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h
@@ -24,14 +24,6 @@
 #define AI_EFFECTIVENESS_x0_125 1
 #define AI_EFFECTIVENESS_x0     0
 
-// ai weather
-#define AI_WEATHER_NONE 0
-#define AI_WEATHER_SUN 1
-#define AI_WEATHER_RAIN 2
-#define AI_WEATHER_SANDSTORM 3
-#define AI_WEATHER_HAIL 4
-#define AI_WEATHER_SNOW 5
-
 // get_how_powerful_move_is
 #define MOVE_POWER_OTHER  0
 #define MOVE_POWER_BEST   1
@@ -67,4 +59,6 @@
 #define AI_FLAG_SAFARI                (1 << 30)
 #define AI_FLAG_FIRST_BATTLE          (1 << 31)
 
+#define AI_SCORE_DEFAULT 100 // Default score for all AI moves.
+
 #endif // GUARD_CONSTANTS_BATTLE_AI_H