From 45b98298d91d6da1491409860fb3afe9196bff41 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 6 Feb 2021 02:45:23 -0800
Subject: [PATCH] Ring burst adjustment

Explosions and Tumble - 10 rings
SPB - 20 rings
---
 src/k_kart.c      | 7 ++++++-
 src/k_kart.h      | 2 +-
 src/lua_baselib.c | 4 ++--
 src/p_inter.c     | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index fd485a5cf..3ebbd89e3 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -2616,8 +2616,10 @@ static void K_HandleTumbleSound(player_t *player)
 	}
 }
 
-void K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source) // A bit of a hack, we just throw the player up higher here and extend their spinout timer
+int K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source) // A bit of a hack, we just throw the player up higher here and extend their spinout timer
 {
+	int ringburst = 10;
+
 	(void)source;
 
 	player->mo->momz = 18*mapobjectscale*P_MobjFlip(player->mo); // please stop forgetting mobjflip checks!!!!
@@ -2632,6 +2634,7 @@ void K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source) // A b
 		{
 			player->kartstuff[k_spinouttimer] = ((5*player->kartstuff[k_spinouttimer])/2)+1;
 			player->mo->momz *= 2;
+			ringburst = 20;
 		}
 	}
 
@@ -2642,6 +2645,8 @@ void K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source) // A b
 
 	if (P_IsDisplayPlayer(player))
 		P_StartQuake(64<<FRACBITS, 5);
+
+	return ringburst;
 }
 
 // This kind of wipeout happens with no rings -- doesn't remove a bumper, has no invulnerability, and is much shorter.
diff --git a/src/k_kart.h b/src/k_kart.h
index 9f18b4661..fdee34c8a 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -45,7 +45,7 @@ void K_DoInstashield(player_t *player);
 void K_BattleAwardHit(player_t *player, player_t *victim, mobj_t *inflictor, UINT8 bumpersRemoved);
 void K_SpinPlayer(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 type);
 void K_TumblePlayer(player_t *player, mobj_t *inflictor, mobj_t *source);
-void K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source);
+int K_ExplodePlayer(player_t *player, mobj_t *inflictor, mobj_t *source);
 void K_DebtStingPlayer(player_t *player, mobj_t *source);
 void K_HandleBumperChanges(player_t *player, UINT8 prevBumpers);
 void K_DestroyBumpers(player_t *player, UINT8 amount);
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index eff2264c1..b33db8728 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -3440,8 +3440,8 @@ static int lib_kExplodePlayer(lua_State *L)
 		inflictor = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
 	if (!lua_isnone(L, 3) && lua_isuserdata(L, 3))
 		source = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
-	K_ExplodePlayer(player, inflictor, source);
-	return 0;
+	lua_pushinteger(L, K_ExplodePlayer(player, inflictor, source));
+	return 1;
 }
 
 static int lib_kTakeBumpersFromPlayer(lua_State *L)
diff --git a/src/p_inter.c b/src/p_inter.c
index deb79df4a..e6e166b44 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2012,10 +2012,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 					break;
 				case DMG_TUMBLE:
 					K_TumblePlayer(player, inflictor, source);
+					ringburst = 10;
 					break;
 				case DMG_EXPLODE:
 				case DMG_KARMA:
-					K_ExplodePlayer(player, inflictor, source);
+					ringburst = K_ExplodePlayer(player, inflictor, source);
 					break;
 				case DMG_WIPEOUT:
 					if (P_IsDisplayPlayer(player))