More extremely scaled grow & shrink players!

- Grow is x2 instead of x1.5.
- Shrink is x0.5 instead of x0.75.
- Physics were left ALONE!! This is purely a HITBOX / VISUAL change!! Grow isn't any faster, and Shrink isn't any slower!! The only potential worry is low ceilings in maps!!

src/k_kart.c

@@ -2905,6 +2905,30 @@ static void K_GetKartBoostPower(player_t *player)
 	player->numboosts = numboosts;
 }
 
+fixed_t K_GrowShrinkSpeedMul(player_t *player)
+{
+	fixed_t scaleDiff = player->mo->scale - mapobjectscale;
+	fixed_t physicsScale = mapobjectscale;
+	fixed_t speedMul = FRACUNIT;
+
+	if (scaleDiff > 0)
+	{
+		// Grown
+		// Change x2 speed into x1.5
+		physicsScale = FixedMul(GROW_PHYSICS_SCALE, mapobjectscale);
+		speedMul = FixedDiv(physicsScale, player->mo->scale);
+	}
+	else if (scaleDiff < 0)
+	{
+		// Shrunk
+		// Change x0.5 speed into x0.75
+		physicsScale = FixedMul(SHRINK_PHYSICS_SCALE, mapobjectscale);
+		speedMul = FixedDiv(physicsScale, player->mo->scale);
+	}
+
+	return speedMul;
+}
+
 // Returns kart speed from a stat. Boost power and scale are NOT taken into account, no player or object is necessary.
 fixed_t K_GetKartSpeedFromStat(UINT8 kartspeed)
 {
@@ -2921,9 +2945,8 @@ fixed_t K_GetKartSpeedFromStat(UINT8 kartspeed)
 
 fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
 {
-	fixed_t finalspeed;
+	const boolean mobjValid = (player->mo != NULL && P_MobjWasRemoved(player->mo) == false);
-
+	fixed_t finalspeed = K_GetKartSpeedFromStat(player->kartspeed);
-	finalspeed = K_GetKartSpeedFromStat(player->kartspeed);
 
 	if (player->spheres > 0)
 	{
@@ -2944,17 +2967,24 @@ fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
 		}
 	}
 
-	if (player->mo && !P_MobjWasRemoved(player->mo))
+	if (mobjValid == true)
+	{
 		finalspeed = FixedMul(finalspeed, player->mo->scale);
+		finalspeed = FixedMul(finalspeed, K_GrowShrinkSpeedMul(player));
+	}
+	else
+	{
+		finalspeed = FixedMul(finalspeed, mapobjectscale);
+	}
 
-	if (doboostpower)
+	if (doboostpower == true)
 	{
 		if (K_PlayerUsesBotMovement(player))
 		{
 			finalspeed = FixedMul(finalspeed, K_BotTopSpeedRubberband(player));
 		}
 
-		return FixedMul(finalspeed, player->boostpower+player->speedboost);
+		finalspeed = FixedMul(finalspeed, player->boostpower + player->speedboost);
 	}
 
 	return finalspeed;
@@ -3266,8 +3296,11 @@ static void K_RemoveGrowShrink(player_t *player)
 
 		player->mo->scalespeed = mapobjectscale/TICRATE;
 		player->mo->destscale = mapobjectscale;
+
 		if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
-			player->mo->destscale = (6*player->mo->destscale)/8;
+		{
+			player->mo->destscale = FixedMul(player->mo->destscale, SHRINK_SCALE);
+		}
 	}
 
 	player->growshrinktimer = 0;
@@ -5209,9 +5242,13 @@ static void K_DoShrink(player_t *user)
 				if (players[i].mo && !P_MobjWasRemoved(players[i].mo))
 				{
 					players[i].mo->scalespeed = mapobjectscale/TICRATE;
-					players[i].mo->destscale = (6*mapobjectscale)/8;
+					players[i].mo->destscale = FixedMul(mapobjectscale, SHRINK_SCALE);
+
 					if (cv_kartdebugshrink.value && !modeattacking && !players[i].bot)
-						players[i].mo->destscale = (6*players[i].mo->destscale)/8;
+					{
+						players[i].mo->destscale = FixedMul(players[i].mo->destscale, SHRINK_SCALE);
+					}
+
 					S_StartSound(players[i].mo, sfx_kc59);
 				}
 			}
@@ -9051,23 +9088,39 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 						case KITEM_GROW:
 							if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
 							{
-								if (player->growshrinktimer < 0) // If you're shrunk, then "grow" will just make you normal again.
+								if (player->growshrinktimer < 0)
+								{
+									// If you're shrunk, then "grow" will just make you normal again.
 									K_RemoveGrowShrink(player);
+								}
 								else
 								{
 									K_PlayPowerGloatSound(player->mo);
+
 									player->mo->scalespeed = mapobjectscale/TICRATE;
-									player->mo->destscale = (3*mapobjectscale)/2;
+									player->mo->destscale = FixedMul(mapobjectscale, GROW_SCALE);
+
 									if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
-										player->mo->destscale = (6*player->mo->destscale)/8;
+									{
+										player->mo->destscale = FixedMul(player->mo->destscale, SHRINK_SCALE);
+									}
+
 									player->growshrinktimer = itemtime+(4*TICRATE); // 12 seconds
-									if (P_IsLocalPlayer(player))
+
+									if (P_IsLocalPlayer(player) == true)
+									{
 										S_ChangeMusicSpecial("kgrow");
-									if (! P_IsDisplayPlayer(player))
+									}
+
+									if (P_IsDisplayPlayer(player) == false)
+									{
 										S_StartSound(player->mo, (cv_kartinvinsfx.value ? sfx_alarmg : sfx_kgrow));
+									}
+
 									P_RestoreMusic(player);
 									S_StartSound(player->mo, sfx_kc5a);
 								}
+
 								player->itemamount--;
 							}
 							break;

src/k_kart.h

@@ -22,6 +22,12 @@ Make sure this matches the actual number of states
 #define MAXHITLAGTICS 18 //12
 #define HITLAGJITTERS (FRACUNIT / 20)
 
+#define GROW_SCALE (2*FRACUNIT)
+#define SHRINK_SCALE (FRACUNIT/2)
+
+#define GROW_PHYSICS_SCALE (3*FRACUNIT/2)
+#define SHRINK_PHYSICS_SCALE (3*FRACUNIT/4)
+
 player_t *K_GetItemBoxPlayer(mobj_t *mobj);
 angle_t K_ReflectAngle(angle_t angle, angle_t against, fixed_t maxspeed, fixed_t yourspeed);
 
@@ -115,6 +121,7 @@ boolean K_WaterRun(player_t *player);
 void K_ApplyTripWire(player_t *player, tripwirestate_t state);
 INT16 K_GetSpindashChargeTime(player_t *player);
 fixed_t K_GetSpindashChargeSpeed(player_t *player);
+fixed_t K_GrowShrinkSpeedMul(player_t *player);
 fixed_t K_GetKartSpeedFromStat(UINT8 kartspeed);
 fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower);
 fixed_t K_GetKartAccel(player_t *player);

src/k_respawn.c

@@ -672,11 +672,11 @@ static void K_HandleDropDash(player_t *player)
 	if (player->growshrinktimer < 0)
 	{
 		player->mo->scalespeed = mapobjectscale/TICRATE;
-		player->mo->destscale = (6*mapobjectscale)/8;
+		player->mo->destscale = FixedMul(mapobjectscale, SHRINK_SCALE);
 
 		if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
 		{
-			player->mo->destscale = (6*player->mo->destscale)/8;
+			player->mo->destscale = FixedMul(player->mo->destscale, SHRINK_SCALE);
 		}
 	}
 

src/p_mobj.c

@@ -10867,9 +10867,12 @@ void P_SpawnPlayer(INT32 playernum)
 
 	P_SetTarget(&p->follower, NULL);	// cleanse follower from existence
 
-	// set the scale to the mobj's destscale so settings get correctly set.  if we don't, they sometimes don't.
 	if (cv_kartdebugshrink.value && !modeattacking && !p->bot)
-		mobj->destscale = 6*mobj->destscale/8;
+	{
+		mobj->destscale = FixedMul(mobj->destscale, SHRINK_SCALE);
+	}
+
+	// set the scale to the mobj's destscale so settings get correctly set.  if we don't, they sometimes don't.
 	P_SetScale(mobj, mobj->destscale);
 	P_FlashPal(p, 0, 0); // Resets