From a6ecb25ed5f51bd76f63d4a5f4224d7229117530 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 6 Apr 2023 21:04:38 +0100
Subject: [PATCH] hyudoro_set_held_item_from_player

- Handles putting an object into the hyuu's inventory.
- Permits Sink conversion for items which are a little too powerful to give to someone who was JUST in first place.
    - For now, the item to convert is an SPB.
---
 src/objects/hyudoro.c | 44 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/objects/hyudoro.c b/src/objects/hyudoro.c
index 7b40ce61e..730ce6ede 100644
--- a/src/objects/hyudoro.c
+++ b/src/objects/hyudoro.c
@@ -15,6 +15,7 @@
 #include "../info.h"
 #include "../k_kart.h"
 #include "../k_objects.h"
+#include "../k_roulette.h"
 #include "../m_random.h"
 #include "../p_local.h"
 #include "../r_main.h"
@@ -379,6 +380,45 @@ pop_hyudoro (mobj_t **head)
 	*head = hyu;
 }
 
+static void hyudoro_set_held_item_from_player
+(		mobj_t * hyu,
+		player_t *player)
+{
+	if (K_ItemEnabled(KITEM_KITCHENSINK))
+	{
+		boolean convert = false;
+
+		switch (player->itemtype)
+		{
+			// The following permits a case-by-case balancing for items
+			// we don't want ending up in 2nd place's hands too often...
+			case KITEM_SPB:
+				convert = true;
+				break;
+			default:
+				break;
+		}
+
+		if (convert == true)
+		{
+			if (player->itemtype > 0 && player->itemtype < NUMKARTITEMS)
+			{
+				// A conversion has occoured, this is no longer on the
+				// playing field... someone else must manifest it!?
+				itemCooldowns[player->itemtype - 1] = 0;
+			}
+
+			hyudoro_itemtype(hyu) = KITEM_KITCHENSINK;
+			hyudoro_itemcount(hyu) = 1;
+
+			return;
+		}
+	}
+
+	hyudoro_itemtype(hyu) = player->itemtype;
+	hyudoro_itemcount(hyu) = player->itemamount;
+}
+
 static boolean
 hyudoro_patrol_hit_player
 (		mobj_t * hyu,
@@ -409,8 +449,8 @@ hyudoro_patrol_hit_player
 	K_AddHitLag(toucher, TICRATE/2, false);
 
 	hyudoro_mode(hyu) = HYU_RETURN;
-	hyudoro_itemtype(hyu) = player->itemtype;
-	hyudoro_itemcount(hyu) = player->itemamount;
+
+	hyudoro_set_held_item_from_player(hyu, player);
 
 	K_StripItems(player);