From c8718b25ffd38b947b1bb404021c3b3fb3d2d121 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 22 May 2022 21:14:02 -0400
Subject: [PATCH] REMOVE hyubgone + all of the other bullshit we did to try and
 make it show up less

---
 src/doomstat.h   |  1 -
 src/g_game.c     |  1 -
 src/k_kart.c     | 11 +----------
 src/lua_script.c |  5 -----
 src/p_saveg.c    |  2 --
 src/p_setup.c    |  1 -
 src/p_tick.c     |  2 --
 7 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/doomstat.h b/src/doomstat.h
index 163bfee96..8c2671c96 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -685,7 +685,6 @@ extern boolean comeback;
 extern SINT8 battlewanted[4];
 extern tic_t wantedcalcdelay;
 extern tic_t indirectitemcooldown;
-extern tic_t hyubgone;
 extern tic_t mapreset;
 extern boolean thwompsactive;
 extern UINT8 lastLowestLap;
diff --git a/src/g_game.c b/src/g_game.c
index 21467e592..6eae4df17 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -314,7 +314,6 @@ SINT8 pickedvote; // What vote the host rolls
 SINT8 battlewanted[4]; // WANTED players in battle, worth x2 points
 tic_t wantedcalcdelay; // Time before it recalculates WANTED
 tic_t indirectitemcooldown; // Cooldown before any more Shrink, SPB, or any other item that works indirectly is awarded
-tic_t hyubgone; // Cooldown before hyudoro is allowed to be rerolled
 tic_t mapreset; // Map reset delay when enough players have joined an empty game
 boolean thwompsactive; // Thwomps activate on lap 2
 UINT8 lastLowestLap; // Last lowest lap, for activating race lap executors
diff --git a/src/k_kart.c b/src/k_kart.c
index 08bd77101..a1f9ac788 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -458,9 +458,6 @@ static void K_KartGetItemResult(player_t *player, SINT8 getitem)
 	if (getitem == KITEM_SPB || getitem == KITEM_SHRINK) // Indirect items
 		indirectitemcooldown = 20*TICRATE;
 
-	if (getitem == KITEM_HYUDORO) // Hyudoro cooldown
-		hyubgone = 5*TICRATE;
-
 	player->botvars.itemdelay = TICRATE;
 	player->botvars.itemconfirm = 0;
 
@@ -682,6 +679,7 @@ INT32 K_KartGetItemOdds(
 		case KITEM_LANDMINE:
 		case KITEM_DROPTARGET:
 		case KITEM_BALLHOG:
+		case KITEM_HYUDORO:
 		case KRITEM_TRIPLESNEAKER:
 		case KRITEM_TRIPLEORBINAUT:
 		case KRITEM_QUADORBINAUT:
@@ -742,13 +740,6 @@ INT32 K_KartGetItemOdds(
 			if (spbplace != -1)
 				newodds = 0;
 			break;
-		case KITEM_HYUDORO:
-			cooldownOnStart = true;
-			notNearEnd = true;
-
-			if (hyubgone > 0)
-				newodds = 0;
-			break;
 		default:
 			break;
 	}
diff --git a/src/lua_script.c b/src/lua_script.c
index 3f919439f..8aea589db 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -378,9 +378,6 @@ int LUA_PushGlobals(lua_State *L, const char *word)
 	} else if (fastcmp(word,"indirectitemcooldown")) {
 		lua_pushinteger(L, indirectitemcooldown);
 		return 1;
-	} else if (fastcmp(word,"hyubgone")) {
-		lua_pushinteger(L, hyubgone);
-		return 1;
 	} else if (fastcmp(word,"thwompsactive")) {
 		lua_pushboolean(L, thwompsactive);
 		return 1;
@@ -468,8 +465,6 @@ int LUA_WriteGlobals(lua_State *L, const char *word)
 		exitcountdown = (tic_t)luaL_checkinteger(L, 2);
 	else if (fastcmp(word,"indirectitemcooldown"))
 		indirectitemcooldown = (tic_t)luaL_checkinteger(L, 2);
-	else if (fastcmp(word,"hyubgone"))
-		hyubgone = (tic_t)luaL_checkinteger(L, 2);
 	else
 		return 0;
 
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 8b4604c8a..3cb65e7a7 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -4505,7 +4505,6 @@ static void P_NetArchiveMisc(boolean resending)
 
 	WRITEUINT32(save_p, wantedcalcdelay);
 	WRITEUINT32(save_p, indirectitemcooldown);
-	WRITEUINT32(save_p, hyubgone);
 	WRITEUINT32(save_p, mapreset);
 
 	for (i = 0; i < MAXPLAYERS; i++)
@@ -4655,7 +4654,6 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading)
 
 	wantedcalcdelay = READUINT32(save_p);
 	indirectitemcooldown = READUINT32(save_p);
-	hyubgone = READUINT32(save_p);
 	mapreset = READUINT32(save_p);
 
 	for (i = 0; i < MAXPLAYERS; i++)
diff --git a/src/p_setup.c b/src/p_setup.c
index c1da43eef..2f23d6c1f 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4405,7 +4405,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
 
 	wantedcalcdelay = wantedfrequency*2;
 	indirectitemcooldown = 0;
-	hyubgone = 0;
 	mapreset = 0;
 
 	for (i = 0; i < MAXPLAYERS; i++)
diff --git a/src/p_tick.c b/src/p_tick.c
index c7dae9030..843461db6 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -685,8 +685,6 @@ void P_Ticker(boolean run)
 
 		if (indirectitemcooldown > 0)
 			indirectitemcooldown--;
-		if (hyubgone > 0)
-			hyubgone--;
 
 		K_BossInfoTicker();