thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Physics changes for players in ice cube state

Browse source 
- Cancel offroad
- Inputs do not work
  - Cannot accelerate
  - Drift/Brake does not work (side-effect of P_PlayerInPain)
- Sprite shakes if icecube.shaketimer
- Sprite is colorized Cyan
- Max friction (slippery)
- Player is considered to be in a pain state
- Sprite slowly turns clockwise
- Sprite tilting is disabled
This commit is contained in:
James R 2023-11-22 18:52:30 -08:00
parent e89c34ac74
commit ea697d2048
2 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/k_kart.c
View file

@ -1168,7 +1168,8 @@ static void K_UpdateOffroad(player_t *player)
fixed_t offroadstrength = 0; fixed_t offroadstrength = 0;
// If tiregrease is active, don't // If tiregrease is active, don't
if (player->tiregrease == 0) // If inside an ice cube, don't
if (player->tiregrease == 0 && player->icecube.frozen == false)
{ {
// TODO: Make this use actual special touch code. // TODO: Make this use actual special touch code.
if (terrain != NULL && terrain->offroad > 0) if (terrain != NULL && terrain->offroad > 0)
@ -3599,6 +3600,7 @@ SINT8 K_GetForwardMove(player_t *player)
} }
if (player->spinouttimer != 0 if (player->spinouttimer != 0
|| player->icecube.frozen
|| K_PressingEBrake(player) == true || K_PressingEBrake(player) == true
|| K_PlayerEBrake(player) == true) || K_PlayerEBrake(player) == true)
{ {
@ -8865,6 +8867,15 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
K_HandleDelayedHitByEm(player); K_HandleDelayedHitByEm(player);
player->pflags &= ~PF_POINTME; player->pflags &= ~PF_POINTME;
if (player->icecube.frozen && player->icecube.shaketimer)
{
player->mo->sprxoff += P_RandomRange(PR_DECORATION, -4, 4) * player->mo->scale;
player->mo->spryoff += P_RandomRange(PR_DECORATION, -4, 4) * player->mo->scale;
player->mo->sprzoff += P_RandomRange(PR_DECORATION, -4, 4) * player->mo->scale;
player->icecube.shaketimer--;
}
} }
void K_KartResetPlayerColor(player_t *player) void K_KartResetPlayerColor(player_t *player)
@ -8953,12 +8964,17 @@ void K_KartResetPlayerColor(player_t *player)
fullbright = true; fullbright = true;
goto finalise; goto finalise;
} }
else
if (player->icecube.frozen)
{ {
player->mo->colorized = (player->dye != 0); player->mo->colorized = true;
player->mo->color = player->dye ? player->dye : player->skincolor; player->mo->color = SKINCOLOR_CYAN;
goto finalise;
} }
player->mo->colorized = (player->dye != 0);
player->mo->color = player->dye ? player->dye : player->skincolor;
finalise: finalise:
if (player->curshield && player->curshield != KSHIELD_TOP) if (player->curshield && player->curshield != KSHIELD_TOP)
@ -11233,6 +11249,11 @@ void K_AdjustPlayerFriction(player_t *player)
player->mo->friction -= 9824; player->mo->friction -= 9824;
} }
if (player->icecube.frozen)
{
player->mo->friction = FRACUNIT;
}
// Cap between intended values // Cap between intended values
if (player->mo->friction > FRACUNIT) if (player->mo->friction > FRACUNIT)
player->mo->friction = FRACUNIT; player->mo->friction = FRACUNIT;

11
src/p_user.c
View file

@ -461,7 +461,7 @@ UINT8 P_FindHighestLap(void)
// //
boolean P_PlayerInPain(player_t *player) boolean P_PlayerInPain(player_t *player)
{ {
if (player->spinouttimer || (player->tumbleBounces > 0) || (player->pflags & PF_FAULT)) if (player->spinouttimer || (player->tumbleBounces > 0) || (player->pflags & PF_FAULT) || player->icecube.frozen)
return true; return true;
return false; return false;
@ -2420,7 +2420,14 @@ void P_MovePlayer(player_t *player)
} }
// Kart frames // Kart frames
if (player->tumbleBounces > 0) if (player->icecube.frozen)
{
INT32 spd = FixedMul(player->mo->scale, FixedHypot(player->mo->momx, player->mo->momy)) / FRACUNIT;
P_SetPlayerMobjState(player->mo, S_KART_SPINOUT);
player->drawangle -= max(2, spd / 6) * ANG1;
P_ResetPitchRoll(player->mo);
}
else if (player->tumbleBounces > 0)
{ {
fixed_t playerSpeed = P_AproxDistance(player->mo->momx, player->mo->momy); // maybe momz too? fixed_t playerSpeed = P_AproxDistance(player->mo->momx, player->mo->momy); // maybe momz too?