From 530de8814339a4cb79f79889e85fab57d10b3162 Mon Sep 17 00:00:00 2001
From: Antonio Martinez <aj@worldsbe.st>
Date: Fri, 18 Jul 2025 20:18:03 -0400
Subject: [PATCH] Whoops

---
 src/k_roulette.c | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/k_roulette.c b/src/k_roulette.c
index a09d58c3b..c58cfbbfe 100644
--- a/src/k_roulette.c
+++ b/src/k_roulette.c
@@ -96,14 +96,15 @@ static UINT32 K_DynamicItemOddsRace[NUMKARTRESULTS-1][2] =
 	{1, 1}, // lightningshield
 	{25, 4}, // bubbleshield
 	{66, 9}, // flameshield
-	{1, 3}, // hyudoro
+	{1, 2}, // hyudoro
 	{0, 0}, // pogospring
 	{30, 8}, // superring (SPECIAL! distance value specifies when this can NO LONGER appear)
 	{0, 0}, // kitchensink
-	{1, 3}, // droptarget
+	{1, 2}, // droptarget
 	{43, 5}, // gardentop
 	{0, 0}, // gachabom
-	{1, 3}, // stoneshoe
+	{1, 2}, // stoneshoe
+	{1, 2}, // toxomister 
 	{45, 6}, // dualsneaker
 	{55, 8}, // triplesneaker
 	{25, 2}, // triplebanana
@@ -140,6 +141,7 @@ static UINT32 K_DynamicItemOddsBattle[NUMKARTRESULTS-1][2] =
 	{0, 0}, // gardentop
 	{10, 5}, // gachabom
 	{0, 0}, // stoneshoe
+	{0, 0}, // toxomister 
 	{0, 0}, // dualsneaker
 	{20, 1}, // triplesneaker
 	{0, 0}, // triplebanana
@@ -176,6 +178,7 @@ static UINT32 K_DynamicItemOddsSpecial[NUMKARTRESULTS-1][2] =
 	{0, 0}, // gardentop
 	{0, 0}, // gachabom
 	{0, 0}, // stoneshoe
+	{0, 0}, // toxomister 
 	{35, 2}, // dualsneaker
 	{0, 0}, // triplesneaker
 	{0, 0}, // triplebanana
@@ -212,6 +215,7 @@ static UINT8 K_KartLegacyBattleOdds[NUMKARTRESULTS-1][2] =
 	{ 0, 0 }, // Garden Top
 	{ 5, 0 }, // Gachabom
 	{ 0, 1 }, // Stone Shoe
+	{ 0, 1 }, // Toxomister
 	{ 0, 0 }, // Sneaker x2
 	{ 0, 1 }, // Sneaker x3
 	{ 0, 0 }, // Banana x3
@@ -373,6 +377,7 @@ botItemPriority_e K_GetBotItemPriority(kartitems_t result)
 		case KITEM_EGGMAN:
 		case KITEM_GACHABOM:
 		case KITEM_STONESHOE:
+		case KITEM_TOXOMISTER:
 		case KITEM_KITCHENSINK:
 		{
 			// Used when in 1st place and relatively far from players.
@@ -887,6 +892,9 @@ void K_PushToRouletteItemList(itemroulette_t *const roulette, INT32 item)
 --------------------------------------------------*/
 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)
@@ -1007,6 +1015,7 @@ static boolean K_IsItemFirstOnly(kartitems_t item)
 		case KITEM_HYUDORO:
 		case KITEM_DROPTARGET:
 		case KITEM_STONESHOE:
+		case KITEM_TOXOMISTER:
 			return true;
 		default:
 			return false;
@@ -1184,6 +1193,22 @@ static boolean K_TimingPermitsItem(kartitems_t item, const itemroulette_t *roule
 	return true;
 }
 
+static void K_FixEmptyRoulette(const player_t *player, itemroulette_t *const roulette)
+{
+	if (roulette->itemList.len > 0)
+		return;
+
+	if (K_PlayerUsesBotMovement(player)) // Bots can't use certain items. Give them _something_.
+		K_PushToRouletteItemList(roulette, KITEM_SUPERRING);
+	else // Players can use all items, so this should never happen.
+		K_PushToRouletteItemList(roulette, KITEM_SAD);
+}
+
+/*--------------------------------------------------
+	void K_FillItemRouletteData(const player_t *player, itemroulette_t *const roulette, boolean ringbox)
+
+		See header file for description.
+--------------------------------------------------*/
 void K_FillItemRoulette(player_t *const player, itemroulette_t *const roulette, boolean ringbox)
 {
 	K_InitRoulette(roulette);
@@ -1367,6 +1392,7 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo
 	if (K_ForcedSPB(player, roulette) == true)
 	{
 		K_AddItemToReel(player, roulette, KITEM_SPB);
+		K_FixEmptyRoulette(player, roulette);
 		return;
 	}
 
@@ -1391,6 +1417,7 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo
 		// singleItem = KITEM_SAD by default,
 		// so it will be used when all items are turned off.
 		K_AddItemToReel(player, roulette, singleItem);
+		K_FixEmptyRoulette(player, roulette);
 		return;
 	}
 
@@ -1746,6 +1773,8 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo
 
 		totalSpawnChance--;
 	}
+
+	K_FixEmptyRoulette(player, roulette);
 }
 
 /*--------------------------------------------------