From 30207327c7a9067137a13490f15a34f26eca38db Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Sat, 1 Jul 2023 15:43:41 -0700
Subject: [PATCH] Use only Ring Box in SPB Attack

---
 src/k_kart.c              | 5 ++++-
 src/objects/random-item.c | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 0735baf58..150b14ac3 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -10869,7 +10869,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 		player->ringboxdelay--;
 		if (player->ringboxdelay == 0)
 		{
-			// TODO
 			UINT32 behind = K_GetItemRouletteDistance(player, player->itemRoulette.playing);
 			UINT32 behindMulti = behind / 1000;
 			behindMulti = min(behindMulti, 20);
@@ -10879,6 +10878,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 				award = 3 * award / 2;
 			award = award * (behindMulti + 10) / 10;
 
+			// SPB Attack is hard, but we're okay with that.
+			if (modeattacking & ATTACKING_SPB)
+				award = award / 2;
+
 			K_AwardPlayerRings(player, award, true);
 			player->ringboxaward = 0;
 		}
diff --git a/src/objects/random-item.c b/src/objects/random-item.c
index f392d9752..a9fdae254 100644
--- a/src/objects/random-item.c
+++ b/src/objects/random-item.c
@@ -114,7 +114,8 @@ void Obj_RandomItemVisuals(mobj_t *mobj)
 	// the player's cleared out a good portion of the map.
 	//
 	// Then extraval1 starts ticking up and triggers the transformation from Ringbox to Random Item.
-	if (mobj->fuse == 0 && !(mobj->flags & MF_NOCLIPTHING) && !cv_thunderdome.value)
+	if (mobj->fuse == 0 && !(mobj->flags & MF_NOCLIPTHING)
+		&& !cv_thunderdome.value && !(modeattacking & ATTACKING_SPB))
 	{
 		mobj->extravalue1++;
 		if (mobj->extravalue1 == RINGBOX_TIME)