From f822eb94cfdf474ee4c568af15dcf6f5cdd4b854 Mon Sep 17 00:00:00 2001
From: James <jameshall.yahoosucks@gmail.com>
Date: Tue, 19 Feb 2019 20:19:01 -0500
Subject: [PATCH] Reduce explosion radius, lives forever, longer startup

---
 src/info.c   |  6 +++---
 src/k_kart.c |  2 +-
 src/p_mobj.c | 20 +++-----------------
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/info.c b/src/info.c
index 5701f1c9..270e21fd 100644
--- a/src/info.c
+++ b/src/info.c
@@ -15574,10 +15574,10 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		1,						// spawnhealth
 		S_NULL,					// seestate
 		sfx_tossed,				// seesound
-		6*TICRATE,				// reactiontime
+		0,						// reactiontime
 		sfx_None,				// attacksound
 		S_NULL,					// painstate
-		192*FRACUNIT,			// painchance
+		128*FRACUNIT,			// painchance
 		sfx_None,				// painsound
 		S_NULL,					// meleestate
 		S_NULL,					// missilestate
@@ -15604,7 +15604,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		8,              // reactiontime
 		sfx_None,       // attacksound
 		S_NULL,         // painstate
-		192*FRACUNIT,   // painchance
+		128*FRACUNIT,   // painchance
 		sfx_None,       // painsound
 		S_NULL,         // meleestate
 		S_NULL,         // missilestate
diff --git a/src/k_kart.c b/src/k_kart.c
index 855e0903..b94341bb 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3085,7 +3085,7 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
 				mo->eflags |= MFE_VERTICALFLIP;
 
 			if (mapthing == MT_SSMINE)
-				mo->extravalue1 = 14; // Pads the start-up length from 21 frames to a full second
+				mo->extravalue1 = 49; // Pads the start-up length from 21 frames to a full 2 seconds
 		}
 	}
 
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 8a290fdf..6898053d 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8194,31 +8194,17 @@ void P_MobjThinker(mobj_t *mobj)
 			if (mobj->momx || mobj->momy)
 				P_SpawnGhostMobj(mobj);
 
-			if (P_IsObjectOnGround(mobj))
+			if (P_IsObjectOnGround(mobj) && (mobj->state == &states[S_SSMINE_AIR1] || mobj->state == &states[S_SSMINE_AIR2]))
 			{
 				if (mobj->extravalue1 > 0)
 					mobj->extravalue1--;
 				else
 				{
-					if (mobj->state == &states[S_SSMINE_AIR1] || mobj->state == &states[S_SSMINE_AIR2])
-						P_SetMobjState(mobj, S_SSMINE_DEPLOY1);
-
-					if (mobj->reactiontime >= mobj->info->reactiontime)
-					{
-						mobj->momx = mobj->momy = 0;
-						S_StartSound(mobj, mobj->info->activesound);
-						mobj->reactiontime--;
-					}
+					mobj->momx = mobj->momy = 0;
+					S_StartSound(mobj, mobj->info->activesound);
 				}
 			}
 
-			if (mobj->reactiontime && mobj->reactiontime < mobj->info->reactiontime)
-			{
-				mobj->reactiontime--;
-				if (!mobj->reactiontime)
-					P_KillMobj(mobj, NULL, NULL);
-			}
-
 			if ((mobj->state >= &states[S_SSMINE1] && mobj->state <= &states[S_SSMINE4])
 				|| (mobj->state >= &states[S_SSMINE_DEPLOY8] && mobj->state <= &states[S_SSMINE_DEPLOY13]))
 				A_GrenadeRing(mobj);