From fc789790bb8747e053d2a12d083566c4e5fd4a39 Mon Sep 17 00:00:00 2001
From: Latapostrophe <hyperclassic3@gmail.com>
Date: Thu, 14 May 2020 17:28:33 +0200
Subject: [PATCH 1/3] Create a quick P_StartQuake without epicenter/radius
 support and clean up the grand total of 4 earthquake uses in the code

---
 src/k_kart.c      | 9 +++------
 src/lua_baselib.c | 3 +--
 src/p_inter.c     | 7 ++-----
 src/p_spec.c      | 8 ++++++++
 src/p_spec.h      | 4 ++++
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 2610de1f5..eac5c4bad 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3157,10 +3157,7 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b
 	K_PlayPainSound(player->mo);
 
 	if (P_IsDisplayPlayer(player))
-	{
-		quake.intensity = 64*FRACUNIT;
-		quake.time = 5;
-	}
+		P_StartQuake(64<<FRACBITS, 5);
 
 	player->kartstuff[k_instashield] = 15;
 	K_DropItems(player);
@@ -5244,7 +5241,7 @@ static void K_MoveHeldObjects(player_t *player)
 					if (cur->type == MT_EGGMANITEM_SHIELD)
 					{
 						// Decided that this should use their "canon" color.
-						cur->color = SKINCOLOR_BLACK; 
+						cur->color = SKINCOLOR_BLACK;
 					}
 
 					cur->flags &= ~MF_NOCLIPTHING;
@@ -5613,7 +5610,7 @@ static void K_UpdateInvincibilitySounds(player_t *player)
 		{
 			if (player->kartstuff[k_invincibilitytimer] > 0) // Prioritize invincibility
 				sfxnum = sfx_alarmi;
-			else if (player->kartstuff[k_growshrinktimer] > 0) 
+			else if (player->kartstuff[k_growshrinktimer] > 0)
 				sfxnum = sfx_alarmg;
 		}
 		else
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 421af0238..21342d936 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -1518,8 +1518,7 @@ static int lib_pStartQuake(lua_State *L)
 	quake.radius = luaL_optinteger(L, 4, 512*FRACUNIT);
 
 	// These things are actually used in 2.1.
-	quake.intensity = q_intensity;
-	quake.time = q_time;
+	P_StartQuake(q_intensity, q_time);
 	return 0;
 }
 
diff --git a/src/p_inter.c b/src/p_inter.c
index 56885f56f..8286b6e3d 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -638,7 +638,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			P_SetTarget(&special->tracer, toucher);
 			toucher->flags |= MF_NOGRAVITY;
 			toucher->momz = (8*toucher->scale) * P_MobjFlip(toucher);
-			S_StartSound(toucher, sfx_s1b2); 
+			S_StartSound(toucher, sfx_s1b2);
 			return;
 
 // ***************************************** //
@@ -3192,10 +3192,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 				K_KartPainEnergyFling(player);
 
 				if (P_IsDisplayPlayer(player))
-				{
-					quake.intensity = 32*FRACUNIT;
-					quake.time = 5;
-				}
+					P_StartQuake(32<<FRACBITS, 5);
 			}
 			else
 				K_SpinPlayer(player, source, 0, inflictor, false);
diff --git a/src/p_spec.c b/src/p_spec.c
index 298d07068..f83efe18e 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -8273,3 +8273,11 @@ static void P_SearchForDisableLinedefs(void)
 		}
 	}
 }
+
+// Rudimentary function to start a earthquake.
+// epicenter and radius are not yet used.
+void P_StartQuake(fixed_t intensity, tic_t time)
+{
+	quake.intensity = intensity;
+	quake.time = time;
+}
diff --git a/src/p_spec.h b/src/p_spec.h
index a49946c2a..6c918ef11 100644
--- a/src/p_spec.h
+++ b/src/p_spec.h
@@ -19,6 +19,10 @@
 
 extern mobj_t *skyboxmo[2];
 
+// Something that should've been done long ago???
+// We won't be using epicenter or radius anytime soon so I don't think it's worth it yet.
+void P_StartQuake(fixed_t intensity, tic_t time);
+
 // GETSECSPECIAL (specialval, section)
 //
 // Pulls out the special # from a particular section.

From 6c68c956547c5b6b92d4fb41a7b8662829261f48 Mon Sep 17 00:00:00 2001
From: Latapostrophe <hyperclassic3@gmail.com>
Date: Thu, 14 May 2020 17:55:33 +0200
Subject: [PATCH 2/3] Make explosions cause earthquakes and initiate flashpals

---
 src/doomstat.h |  1 +
 src/g_game.c   |  1 +
 src/k_kart.c   | 26 ++++++++++++++++++++++++++
 src/p_tick.c   |  3 +++
 4 files changed, 31 insertions(+)

diff --git a/src/doomstat.h b/src/doomstat.h
index 9971fdfc5..cffecce9a 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -513,6 +513,7 @@ extern tic_t mapreset;
 extern boolean thwompsactive;
 extern SINT8 spbplace;
 
+extern tic_t bombflashtimer;	// Used to avoid causing seizures if multiple mines explode close to you :)
 extern boolean legitimateexit;
 extern boolean comebackshowninfo;
 extern tic_t curlap, bestlap;
diff --git a/src/g_game.c b/src/g_game.c
index 11cc2fbe8..4eafb9103 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -288,6 +288,7 @@ boolean thwompsactive; // Thwomps activate on lap 2
 SINT8 spbplace; // SPB exists, give the person behind better items
 
 // Client-sided, unsynched variables (NEVER use in anything that needs to be synced with other players)
+tic_t bombflashtimer = 0;	// Cooldown before another FlashPal can be intialized by a bomb exploding near a displayplayer. Avoids seizures.
 boolean legitimateexit; // Did this client actually finish the match?
 boolean comebackshowninfo; // Have you already seen the "ATTACK OR PROTECT" message?
 tic_t curlap; // Current lap time
diff --git a/src/k_kart.c b/src/k_kart.c
index eac5c4bad..e8b126e43 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3321,6 +3321,8 @@ void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32
 	}
 }
 
+#define MINEQUAKEDIST 4096
+
 // Spawns the purely visual explosion
 void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
 {
@@ -3329,6 +3331,28 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
 	mobj_t *dust;
 	mobj_t *truc;
 	INT32 speed, speed2;
+	INT32 pnum;
+	player_t *p;
+
+	// check for potential display players near the source so we can have a sick earthquake / flashpal.
+	for (pnum = 0; pnum < MAXPLAYERS; pnum++)
+	{
+		p = &players[pnum];
+
+		if (!playeringame[pnum] || !P_IsDisplayPlayer(p))
+			continue;
+
+		if (R_PointToDist2(p->mo->x, p->mo->y, source->x, source->y) < mapobjectscale*MINEQUAKEDIST)
+		{
+			P_StartQuake(55<<FRACBITS, 12);
+			if (!bombflashtimer && P_CheckSight(p->mo, source))
+			{
+				bombflashtimer = TICRATE*5;
+				P_FlashPal(p, 1, 1);
+			}
+			break;	// we can break right now because quakes are global to all split players somehow.
+		}
+	}
 
 	K_MatchGenericExtraFlags(smoldering, source);
 	smoldering->tics = TICRATE*3;
@@ -3399,6 +3423,8 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
 	}
 }
 
+#undef MINEQUAKEDIST
+
 static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, INT32 flags2, fixed_t speed)
 {
 	mobj_t *th;
diff --git a/src/p_tick.c b/src/p_tick.c
index 385985c34..d57a6dc43 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -722,6 +722,9 @@ void P_Ticker(boolean run)
 				K_CalculateBattleWanted();
 		}
 
+		if (bombflashtimer)
+			bombflashtimer--;	// Bomb seizure prevention
+
 		if (quake.time)
 		{
 			fixed_t ir = quake.intensity>>1;

From 8b0aa9e3333bffb98db4066d26144a43582aeb8a Mon Sep 17 00:00:00 2001
From: Latapostrophe <hyperclassic3@gmail.com>
Date: Wed, 20 May 2020 14:21:50 +0200
Subject: [PATCH 3/3] Change flash cooldown from 5 to 2 seconds

---
 src/k_kart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index e8b126e43..673c66822 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3347,7 +3347,7 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color)
 			P_StartQuake(55<<FRACBITS, 12);
 			if (!bombflashtimer && P_CheckSight(p->mo, source))
 			{
-				bombflashtimer = TICRATE*5;
+				bombflashtimer = TICRATE*2;
 				P_FlashPal(p, 1, 1);
 			}
 			break;	// we can break right now because quakes are global to all split players somehow.