From f3767c5e777f6dfcf9e6262e499a668fa3adb2b0 Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Fri, 30 Jan 2026 00:06:32 -0500
Subject: [PATCH] Disable Ring drop for now

We can discuss its fate later.
---
 src/d_player.h      |  2 +-
 src/k_kart.c        | 12 ++++++------
 src/lua_playerlib.c |  8 ++++----
 src/p_enemy.c       |  4 ++--
 src/p_saveg.c       |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index bd615c632..0e3d9193c 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -672,7 +672,7 @@ struct player_t
 	UINT8 ringtransparency; // When consuming lots of rings, fade out the rings again.
 
 	UINT8 airdroptime;		// Tracks how long airdrop has been active, used for delay before airdrop kicks in.
-	boolean ringdrop;		// Set when having ringdrop applied.
+	//boolean ringdrop;		// Set when having ringdrop applied.
 
 	mobj_t *shieldtracer;	// Blankart: Shield mobj
 
diff --git a/src/k_kart.c b/src/k_kart.c
index 500e6ee11..007eec8f4 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -6944,7 +6944,7 @@ static void K_AirDrop(player_t *player, ticcmd_t *cmd)
 	{
 		// Conditions!
 		player->airdroptime = 0;
-		player->ringdrop = false;
+		//player->ringdrop = false;
 		return;
 	}
 
@@ -6953,16 +6953,16 @@ static void K_AirDrop(player_t *player, ticcmd_t *cmd)
 		SINT8 airbrakedelay = TICRATE/3;
 		if (player->airdroptime < airbrakedelay)
 		{
-			if (player->rings > 0)
+			/*if (player->rings > 0)
 			{
 				player->ringlock = 6;
 			}
 
-			player->ringdrop = false;
+			player->ringdrop = false;*/
 		}
 		else
 		{
-			if (!player->ringdelay && player->rings > 0)
+			/*if (!player->ringdelay && player->rings > 0)
 			{
 				mobj_t *ring = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_RING);
 				P_SetMobjState(ring, S_FASTRING1);
@@ -6985,9 +6985,9 @@ static void K_AirDrop(player_t *player, ticcmd_t *cmd)
 			if (player->rings <= 0)
 			{
 				player->ringdrop = false;
-			}
+			}*/
 
-			K_SpawnFallLines(player, player->ringdrop);
+			K_SpawnFallLines(player, /*player->ringdrop*/ false);
 			K_SpawnAirdropTrail(player);
 			player->mo->momz -= FixedMul(gravity, mapobjectscale)*P_MobjFlip(player->mo);
 		}
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 8570a8589..328feef5d 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -832,9 +832,9 @@ static int player_get(lua_State *L)
 	case player_airdroptime:
 		lua_pushinteger(L, plr->airdroptime);
 		break;
-	case player_ringdrop:
+	/*case player_ringdrop:
 		lua_pushinteger(L, plr->ringdrop);
-		break;
+		break;*/
 	case player_shieldtracer:
 		LUA_PushUserdata(L, plr->shieldtracer, META_MOBJ);
 		break;
@@ -1613,9 +1613,9 @@ static int player_set(lua_State *L)
 	case player_airdroptime:
 		plr->airdroptime = luaL_checkinteger(L, 3);
 		break;
-	case player_ringdrop:
+	/*case player_ringdrop:
 		plr->ringdrop = luaL_checkinteger(L, 3);
-		break;
+		break;*/
 	case player_shieldtracer:
 		return NOSET;
 	case player_bubblecool:
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 145fe458c..477cd0b00 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -3230,14 +3230,14 @@ void A_AttractChase(void *thing)
 			if (actor->extravalue1 >= 21)
 			{
 
-				if (actor->extravalue3 && !P_IsObjectOnGround(actor->target))
+				/*if (actor->extravalue3 && !P_IsObjectOnGround(actor->target))
 				{
 					actor->target->momz -= (FixedMul(gravity, mapobjectscale))*P_MobjFlip(actor->target);
 					actor->target->player->ringboost += 7;
 					actor->target->player->ringtime += 7;
 					actor->target->player->ringdrop = true;
 				}
-				else
+				else*/
 				{
 					// Base add is 4 tics for 9,9, adds 1 tic for each point closer to the 1,1 end
 					actor->target->player->ringboost += K_GetKartRingPower(actor->target->player, true);
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 0b8fb89dc..d48571bfe 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -685,7 +685,7 @@ static void P_NetSyncPlayers(savebuffer_t *save)
 		SYNC(players[i].ringtransparency);
 
 		SYNC(players[i].airdroptime);
-		SYNCBOOLEAN(players[i].ringdrop);
+		//SYNCBOOLEAN(players[i].ringdrop);
 
 		RSYNC(players[i].shieldtracer);