Unsuck start boosts

src/k_kart.c

@@ -930,7 +930,7 @@ void K_LakituChecker(player_t *player)
 			player->kartstuff[k_lakitu]--;
 			// Quick! You only have three tics to boost!
 			if (cmd->buttons & BT_ACCELERATE)
-				K_DoMushroom(player, true, false);
+				K_DoMushroom(player, true);
 		}
 	}
 }
@@ -2231,14 +2231,10 @@ static void K_DoBooSteal(player_t *player)
 	}
 }
 
-void K_DoMushroom(player_t *player, boolean doPFlag, boolean startboost)
+void K_DoMushroom(player_t *player, boolean doPFlag)
 {
-	sfxenum_t boostsound = sfx_mush;
-	if (startboost)
-		boostsound = sfx_sboost;
-
 	if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
-		S_StartSound(player->mo, boostsound);
+		S_StartSound(player->mo, sfx_mush);
 
 	player->kartstuff[k_mushroomtimer] = mushroomtime;
 
@@ -2798,14 +2794,14 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 		if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && player->kartstuff[k_goldshroom] == 1
 			&& player->kartstuff[k_goldshroomtimer] == 0 && NO_BOO)
 		{
-			K_DoMushroom(player, true, false);
+			K_DoMushroom(player, true);
 			player->kartstuff[k_goldshroomtimer] = itemtime;
 			player->kartstuff[k_goldshroom] = 0;
 		}
 		// GoldenMushroom power
 		else if (ATTACK_IS_DOWN && player->kartstuff[k_goldshroomtimer] > 1 && onground && NO_BOO)
 		{
-			K_DoMushroom(player, true, false);
+			K_DoMushroom(player, true);
 			player->kartstuff[k_goldshroomtimer] -= 10;
 			if (player->kartstuff[k_goldshroomtimer] < 1)
 				player->kartstuff[k_goldshroomtimer] = 1;
@@ -2813,19 +2809,19 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 		// TripleMushroom power
 		else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_mushroom] == 4 && onground && NO_BOO)
 		{
-			K_DoMushroom(player, true, false);
+			K_DoMushroom(player, true);
 			player->kartstuff[k_mushroom] = 2;
 		}
 		// DoubleMushroom power
 		else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_mushroom] == 2 && onground && NO_BOO)
 		{
-			K_DoMushroom(player, true, false);
+			K_DoMushroom(player, true);
 			player->kartstuff[k_mushroom] = 1;
 		}
 		// Mushroom power
 		else if (ATTACK_IS_DOWN && !HOLDING_ITEM && player->kartstuff[k_mushroom] == 1 && onground && NO_BOO)
 		{
-			K_DoMushroom(player, true, false);
+			K_DoMushroom(player, true);
 			player->kartstuff[k_mushroom] = 0;
 		}
 		// Star power
@@ -3364,24 +3360,33 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 	if (leveltime == (TICRATE)*4)
 		S_StartSound(NULL, sfx_lkt2);
 	// Start charging once you're given the opportunity.
-	if (leveltime >= 70 && leveltime <= 140 && cmd->buttons & BT_ACCELERATE && leveltime % 5 == 0)
+	if (leveltime >= 70 && leveltime <= 140 && cmd->buttons & BT_ACCELERATE)
 		player->kartstuff[k_boostcharge]++;
 	if (leveltime >= 70 && leveltime <= 140 && !(cmd->buttons & BT_ACCELERATE))
 		player->kartstuff[k_boostcharge] = 0;
 	// Increase your size while charging your engine.
 	if (leveltime < 150)
-		player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale) + (player->kartstuff[k_boostcharge]*655);
+		player->mo->destscale = (mapheaderinfo[gamemap-1]->mobj_scale) + (player->kartstuff[k_boostcharge]*131);
 
 	// Determine the outcome of your charge.
 	if (leveltime > 140 && player->kartstuff[k_boostcharge])
 	{
 		// Get an instant boost!
-		if (player->kartstuff[k_boostcharge] >= 7 && player->kartstuff[k_boostcharge] <= 10)
+		if (player->kartstuff[k_boostcharge] >= 35 && player->kartstuff[k_boostcharge] <= 50)
 		{
-			K_DoMushroom(player, false, true);
+			if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
+				S_StartSound(player->mo, sfx_sboost);
+
+			player->kartstuff[k_mushroomtimer] = -((21*(player->kartstuff[k_boostcharge]*player->kartstuff[k_boostcharge]))/425)+131; // max time is 70, min time is 7; yay parabooolas
+
+			if (!player->kartstuff[k_sounds]) // Prevents taunt sounds from playing every time the button is pressed
+			{
+				K_PlayTauntSound(player->mo);
+				player->kartstuff[k_sounds] = 50;
+			}
 		}
 		// You overcharged your engine? Those things are expensive!!!
-		if (player->kartstuff[k_boostcharge] > 10)
+		else if (player->kartstuff[k_boostcharge] > 50)
 		{
 			player->powers[pw_nocontrol] = 40;
 			S_StartSound(player->mo, sfx_slip);

src/k_kart.h

@@ -30,7 +30,7 @@ void K_StealBalloon(player_t *player, player_t *victim, boolean force);
 void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, angle_t rotangle, boolean spawncenter, boolean ghostit, mobj_t *source);
 void K_SpawnBobombExplosion(mobj_t *source, UINT8 color);
 void K_SpawnDriftTrail(player_t *player);
-void K_DoMushroom(player_t *player, boolean doPFlag, boolean startboost);
+void K_DoMushroom(player_t *player, boolean doPFlag);
 void K_DoBouncePad(mobj_t *mo, fixed_t vertispeed);
 boolean K_CheckPlayersRespawnColliding(INT32 playernum, fixed_t x, fixed_t y);
 INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue);

src/lua_baselib.c

@@ -2094,11 +2094,10 @@ static int lib_kDoMushroom(lua_State *L)
 {
 	player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
 	boolean doPFlag = luaL_checkboolean(L, 2);
-	boolean startboost = luaL_checkboolean(L, 3);
 	NOHUD
 	if (!player)
 		return LUA_ErrInvalid(L, "player_t");
-	K_DoMushroom(player, doPFlag, startboost);
+	K_DoMushroom(player, doPFlag);
 	return 0;
 }