From bc15392514066a6d76ec41a246bb6ad434d3d291 Mon Sep 17 00:00:00 2001
From: TehRealSalt <tehrealsalt@gmail.com>
Date: Thu, 6 Sep 2018 13:02:08 -0400
Subject: [PATCH] Boost tweaks

Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
---
 src/d_player.h |  1 +
 src/dehacked.c |  1 +
 src/k_kart.c   | 29 +++++++++++++++--------------
 src/p_user.c   |  4 ++++
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index 3262defa..34eb385c 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -298,6 +298,7 @@ typedef enum
 	k_brakestop,		// Wait until you've made a complete stop for a few tics before letting brake go in reverse.
 	k_waterskip,		// Water skipping counter
 	k_dashpadcooldown,	// Separate the vanilla SA-style dash pads from using pw_flashing
+	k_boostpower,		// Base boost value, for offroad
 	k_speedboost,		// Boost value smoothing for max speed
 	k_accelboost,		// Boost value smoothing for acceleration
 	k_boostcam,			// Camera push forward on boost
diff --git a/src/dehacked.c b/src/dehacked.c
index 3473eb87..39188f9e 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -7682,6 +7682,7 @@ static const char *const KARTSTUFF_LIST[] = {
 	"BRAKESTOP",
 	"WATERSKIP",
 	"DASHPADCOOLDOWN",
+	"BOOSTPOWER",
 	"SPEEDBOOST",
 	"ACCELBOOST",
 	"BOOSTCAM",
diff --git a/src/k_kart.c b/src/k_kart.c
index 8d206bf4..dcb7aa26 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -1533,7 +1533,7 @@ static void K_GetKartBoostPower(player_t *player)
 
 	if (player->kartstuff[k_spinouttimer] && player->kartstuff[k_wipeoutslow] == 1) // Slow down after you've been bumped
 	{
-		player->kartstuff[k_speedboost] = player->kartstuff[k_accelboost] = 0;
+		player->kartstuff[k_boostpower] = player->kartstuff[k_speedboost] = player->kartstuff[k_accelboost] = 0;
 		return;
 	}
 
@@ -1584,13 +1584,15 @@ static void K_GetKartBoostPower(player_t *player)
 	// don't average them anymore, this would make a small boost and a high boost less useful
 	// just take the highest we want instead
 
-	if (boostpower + speedboost > player->kartstuff[k_speedboost])
-		player->kartstuff[k_speedboost] = boostpower + speedboost; // Immediate increase if higher
-	else
-		player->kartstuff[k_speedboost] += ((boostpower + speedboost) - player->kartstuff[k_speedboost])/TICRATE; // Smoothly decrease if lower
+	player->kartstuff[k_boostpower] = boostpower;
 
-	// Accel isn't affected by boostpower, hence the FRACUNIT. Probably for making acceleration feel consistent in offroad.
-	player->kartstuff[k_accelboost] = FRACUNIT + accelboost;
+	// value smoothing
+	if (speedboost > player->kartstuff[k_speedboost])
+		player->kartstuff[k_speedboost] = speedboost;
+	else
+		player->kartstuff[k_speedboost] += (speedboost - player->kartstuff[k_speedboost])/(TICRATE/2);
+
+	player->kartstuff[k_accelboost] = accelboost;
 }
 
 fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
@@ -1625,7 +1627,7 @@ fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
 	finalspeed = FixedMul(FixedMul(k_speed<<14, g_cc), player->mo->scale);
 
 	if (doboostpower)
-		return FixedMul(finalspeed, player->kartstuff[k_speedboost]);
+		return FixedMul(finalspeed, player->kartstuff[k_boostpower]+player->kartstuff[k_speedboost]);
 	return finalspeed;
 }
 
@@ -1640,7 +1642,7 @@ fixed_t K_GetKartAccel(player_t *player)
 	//k_accel += 3 * (9 - kartspeed); // 36 - 60
 	k_accel += 4 * (9 - kartspeed); // 32 - 64
 
-	return FixedMul(k_accel, player->kartstuff[k_accelboost]);
+	return FixedMul(k_accel, FRACUNIT+player->kartstuff[k_accelboost]);
 }
 
 UINT16 K_GetKartFlashing(player_t *player)
@@ -2768,9 +2770,8 @@ void K_DoSneaker(player_t *player, boolean doPFlag)
 	K_PlayTauntSound(player->mo);
 
 	K_GetKartBoostPower(player);
-
-	// Push the camera forward, the amount depending on how much the speed boost increases
-	player->kartstuff[k_destboostcam] = FixedMul(FRACUNIT, player->kartstuff[k_speedboost]-prevboost);
+	if (player->kartstuff[k_speedboost] > prevboost)
+		player->kartstuff[k_destboostcam] = FRACUNIT;
 }
 
 static void K_DoShrink(player_t *player)
@@ -3333,13 +3334,13 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 		if (player->kartstuff[k_boostcam] < player->kartstuff[k_destboostcam]
 			&& player->kartstuff[k_destboostcam] != 0)
 		{
-			player->kartstuff[k_boostcam] += FRACUNIT/8;
+			player->kartstuff[k_boostcam] += FRACUNIT/5;
 			if (player->kartstuff[k_boostcam] >= player->kartstuff[k_destboostcam])
 				player->kartstuff[k_destboostcam] = 0;
 		}
 		else
 		{
-			player->kartstuff[k_boostcam] -= FRACUNIT/8;
+			player->kartstuff[k_boostcam] -= FRACUNIT/5;
 			if (player->kartstuff[k_boostcam] < player->kartstuff[k_destboostcam])
 				player->kartstuff[k_boostcam] = player->kartstuff[k_destboostcam] = 0;
 		}
diff --git a/src/p_user.c b/src/p_user.c
index d2631010..30370dc8 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8373,8 +8373,12 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 
 	if (player->speed > K_GetKartSpeed(player, false))
 		dist += 4*(player->speed - K_GetKartSpeed(player, false));
+
 	if (player->kartstuff[k_boostcam])
+	{
 		dist -= FixedMul(dist/2, player->kartstuff[k_boostcam]);
+		height -= FixedMul(height, player->kartstuff[k_boostcam]);
+	}
 
 	if (player->climbing || player->playerstate == PST_DEAD || (player->pflags & (PF_MACESPIN|PF_ITEMHANG|PF_ROPEHANG)))
 		dist <<= 1;