From 34a7c2ee88c98cd1c76b9d3ea91e305c16aaced7 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Wed, 22 Jul 2020 19:09:14 -0700
Subject: [PATCH] Hammer cocks on rainbow sparks; hella bullet clips on rainbow
 boost + new sfx

---
 src/k_kart.c |  3 +++
 src/p_mobj.c | 18 ++++++++++++++++--
 src/sounds.c |  1 +
 src/sounds.h |  1 +
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index 8908cb724..5197f6d79 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3169,6 +3169,7 @@ static void K_SpawnDriftSparks(player_t *player)
 			{
 				// transition
 				P_SetScale(spark, (spark->destscale = spark->scale*3/2));
+				S_StartSound(player->mo, sfx_cock);
 			}
 			else
 			{
@@ -6428,6 +6429,8 @@ static void K_SpawnDriftBoostExplosion(player_t *player, int stage)
 			S_StartSound(player->mo, sfx_s3kc4l);
 			break;
 	}
+
+	overlay->extravalue1 = stage;
 }
 
 static void K_KartDrift(player_t *player, boolean onground)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index fb4196548..041f9ea0f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8347,8 +8347,22 @@ void P_MobjThinker(mobj_t *mobj)
 			else if (mobj->fuse > 32)
 				mobj->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
 
-			if (mobj->fuse == 17 || mobj->fuse == 33)/* to red/blue */
-				K_SpawnDriftBoostClip(mobj->target->player);
+			switch (mobj->extravalue1)
+			{
+				case 3:/* rainbow boost */
+					/* every 20 tics, bang! */
+					if (( 120 - mobj->fuse ) % 10 == 0)
+					{
+						K_SpawnDriftBoostClip(mobj->target->player);
+						S_StartSound(mobj->target, sfx_s3k77);
+					}
+					break;
+
+				case 2:/* blue boost */
+					if (mobj->fuse == 16)/* to red*/
+						K_SpawnDriftBoostClip(mobj->target->player);
+					break;
+			}
 
 			{
 				player_t *p = NULL;
diff --git a/src/sounds.c b/src/sounds.c
index b64dda5cb..5581ade45 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -820,6 +820,7 @@ sfxinfo_t S_sfx[NUMSFX] =
   {"sploss", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Down to yellow sparks
   {"itfree", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // :shitsfree:
   {"dbgsal", false, 255,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Debug notification
+  {"cock",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Hammer cocks, bang bang
 
   // SRB2Kart - Engine sounds
   // Engine class A
diff --git a/src/sounds.h b/src/sounds.h
index 3d6e4f007..d9b303044 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -897,6 +897,7 @@ typedef enum
 	sfx_sploss,
 	sfx_itfree,
 	sfx_dbgsal,
+	sfx_cock,
 
 	// Next up: UNIQUE ENGINE SOUNDS! Hoooooo boy...
 	// Engine class A - Low Speed, Low Weight