From 719ba464af8a6e9a77f488a70e9db963a75f823a Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Mon, 7 Jul 2025 14:19:31 -0400 Subject: [PATCH] Disable bot ballhog --- src/k_bot.cpp | 7 +++++++ src/k_bot.h | 1 + src/k_kart.c | 5 +++++ src/k_roulette.c | 3 +++ 4 files changed, 16 insertions(+) diff --git a/src/k_bot.cpp b/src/k_bot.cpp index 1d827138a..5855e52a8 100644 --- a/src/k_bot.cpp +++ b/src/k_bot.cpp @@ -2160,3 +2160,10 @@ void K_UpdateBotGameplayVars(player_t *player) K_UpdateBotGameplayVarsItemUsage(player); } + +boolean K_BotUnderstandsItem(kartitems_t item) +{ + if (item == KITEM_BALLHOG) + return false; // Sorry. MRs welcome! + return true; +} diff --git a/src/k_bot.h b/src/k_bot.h index e58e4e8be..66d015ac7 100644 --- a/src/k_bot.h +++ b/src/k_bot.h @@ -401,6 +401,7 @@ void K_BotItemUsage(const player_t *player, ticcmd_t *cmd, INT16 turnamt); void K_BotPickItemPriority(player_t *player); +boolean K_BotUnderstandsItem(kartitems_t item); #ifdef __cplusplus } // extern "C" diff --git a/src/k_kart.c b/src/k_kart.c index 6e395a97f..6f04fc27a 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9579,6 +9579,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) player->pflags2 &= ~PF2_SUPERTRANSFERVFX; } + if (K_PlayerUsesBotMovement(player) && !K_BotUnderstandsItem(player->itemtype) && player->itemamount) + { + K_DropItems(player); + } + if (player->transfer) { if (player->fastfall) diff --git a/src/k_roulette.c b/src/k_roulette.c index 0ec6a8a71..d12ed65d5 100644 --- a/src/k_roulette.c +++ b/src/k_roulette.c @@ -924,6 +924,9 @@ static void K_PushToRouletteItemList(itemroulette_t *const roulette, INT32 item) --------------------------------------------------*/ static void K_AddItemToReel(const player_t *player, itemroulette_t *const roulette, kartitems_t item) { + if (player && K_PlayerUsesBotMovement(player) && !K_BotUnderstandsItem(item)) + return; + K_PushToRouletteItemList(roulette, item); if (player == NULL)