thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-22 02:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Spindash charge (WIP)

Browse source
This commit is contained in:
lachwright 2020-07-06 08:10:03 +08:00
parent 8087352f9e
commit 8ab98011f6
5 changed files with 87 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_ticcmd.h
View file

@ -34,6 +34,8 @@ typedef enum
BT_BACKWARD = 1<<6, // Aim Item Backward
BT_LOOKBACK = 1<<7, // Look Backward
BT_EBRAKEMASK = (BT_ACCELERATE|BT_BRAKE),
// free: 1<<8 to 1<<12
// Lua garbage
@ -42,8 +44,6 @@ typedef enum
BT_CUSTOM3 = 1<<15,
} buttoncode_t;
#define BT_SPINDASHMASK (BT_ACCELERATE|BT_BRAKE)
// The data sampled per tick (single player)
// and transmitted to other peers (multiplayer).
// Mainly movements/button commands per game tick,

102
src/k_kart.c
View file

@ -1588,7 +1588,7 @@ void K_SpawnDashDustRelease(player_t *player)
if (!P_IsObjectOnGround(player->mo))
return;
if (!player->speed && !player->kartstuff[k_startboost])
if (!player->speed && !player->kartstuff[k_startboost] && !player->kartstuff[k_spindash])
return;
travelangle = player->mo->angle;
@ -6682,6 +6682,83 @@ static INT32 K_FlameShieldMax(player_t *player)
return min(16, 1 + (disttofinish / distv));
}
boolean K_PlayerEBrake(player_t *player)
{
return (player->cmd.buttons & BT_EBRAKEMASK) == BT_EBRAKEMASK
&& !player->kartstuff[k_drift]
&& !player->kartstuff[k_spinouttimer]
&& !player->kartstuff[k_boostcharge]
&& !(player->kartstuff[k_spindash] < 0)
&& !player->powers[pw_nocontrol]
&& leveltime > starttime;
}
tic_t K_GetSpindashChargeTime(player_t *player)
{
return (player->kartspeed + 4)*TICRATE/3; // more charge time for higher speed: Tails = 2s, Mighty = 3s, Fang = 4s
}
fixed_t K_GetSpindashChargeSpeed(player_t *player)
{
return FixedMul(FRACUNIT + (player->kartweight - 5)*FRACUNIT/12, K_GetKartSpeed(player, false)); // more speed for higher weight: Tails = 75%, Fang = 100%, Mighty = 125%
}
void K_KartSpindash(player_t *player)
{
ticcmd_t *cmd = &player->cmd;
if (!(K_PlayerEBrake(player) || (player->kartstuff[k_spindash] && !(cmd->buttons & BT_BRAKE))))
{
if (player->kartstuff[k_spindash])
player->kartstuff[k_spindash] = 0;
return;
}
if (player->speed < 6*mapobjectscale)
{
const tic_t MAXCHARGETIME = K_GetSpindashChargeTime(player);
const fixed_t MAXCHARGESPEED = K_GetSpindashChargeSpeed(player);
if (cmd->driftturn != 0 && leveltime % 8 == 0)
S_StartSound(player->mo, sfx_ruburn);
if ((cmd->buttons & (BT_DRIFT|BT_BRAKE)) == (BT_DRIFT|BT_BRAKE))
{
INT16 chargetime = MAXCHARGETIME - ++player->kartstuff[k_spindash];
if (chargetime > 0)
{
UINT16 soundcharge = 0;
UINT8 add = 0;
while ((soundcharge += ++add) < chargetime);
if (soundcharge == chargetime)
{
K_SpawnDashDustRelease(player);
S_StartSound(player->mo, sfx_s3kab);
}
}
else if (chargetime < -TICRATE)
K_SpinPlayer(player, NULL, 0, NULL, false);
else
{
if (player->kartstuff[k_spindash] % 4 == 0)
{
K_SpawnDashDustRelease(player);
K_FlameDashLeftoverSmoke(player->mo);
}
}
}
else if (player->kartstuff[k_spindash])
{
fixed_t speed = player->kartstuff[k_spindash]*MAXCHARGESPEED/MAXCHARGETIME;
player->kartstuff[k_spindash] = 0;
S_StartSound(player->mo, sfx_s23c);
}
}
else
if (leveltime % 4 == 0)
S_StartSound(player->mo, sfx_kc2b);
}
//
// K_MoveKartPlayer
//
@ -7389,6 +7466,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
}
}
K_KartDrift(player, P_IsObjectOnGround(player->mo)); // Not using onground, since we don't want this affected by spring pads
if (onground)
{
fixed_t prevfriction = player->mo->friction;
@ -7404,8 +7483,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->mo->friction += 4608;
}
if ((cmd->buttons & BT_SPINDASHMASK) == BT_SPINDASHMASK
&& !player->kartstuff[k_drift])
if (K_PlayerEBrake(player))
player->mo->friction -= 3072;
else if (player->speed > 0 && cmd->forwardmove < 0) // change friction while braking no matter what, otherwise it's not any more effective than just letting go off accel
player->mo->friction -= 2048;
@ -7451,24 +7529,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{
player->mo->friction = K_BotFrictionRubberband(player, player->mo->friction);
}
}
K_KartDrift(player, P_IsObjectOnGround(player->mo)); // Not using onground, since we don't want this affected by spring pads
// Spindash
if ((cmd->buttons & BT_SPINDASHMASK) == BT_SPINDASHMASK
&& !player->kartstuff[k_drift]
&& !player->kartstuff[k_spinouttimer]
&& leveltime > starttime)
{
if (player->speed < 6*mapobjectscale)
{
if (cmd->driftturn != 0 && leveltime % 8 == 0)
S_StartSound(player->mo, sfx_ruburn);
}
else
if (leveltime % 4 == 0)
S_StartSound(player->mo, sfx_s3k36);
K_KartSpindash(player);
}
// Squishing

1
src/k_kart.h
View file

@ -70,6 +70,7 @@ fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower);
fixed_t K_GetKartAccel(player_t *player);
UINT16 K_GetKartFlashing(player_t *player);
fixed_t K_3dKartMovement(player_t *player, boolean onground, fixed_t forwardmove);
boolean K_PlayerEBrake(player_t *player);
void K_MoveKartPlayer(player_t *player, boolean onground);
void K_CheckSpectateStatus(void);

4
src/p_slopes.c
View file

@ -884,9 +884,7 @@ void P_ButteredSlope(mobj_t *mo)
if (mo->player) {
// SRB2Kart - spindash negates slopes
if (((mo->player->cmd.buttons & BT_SPINDASHMASK) == BT_SPINDASHMASK)
&& !mo->player->kartstuff[k_drift]
&& !mo->player->kartstuff[k_spinouttimer])
if (K_PlayerEBrake(mo->player))
return;
// Changed in kart to only not apply physics on very slight slopes (I think about 4 degree angles)

2
src/p_user.c
View file

@ -5785,7 +5785,7 @@ static void P_MovePlayer(player_t *player)
// Kart: store the current turn range for later use
if ((player->mo && player->speed > 0) // Moving
|| (leveltime > starttime && (cmd->buttons & BT_SPINDASHMASK) == BT_SPINDASHMASK) // Rubber-burn turn
|| (leveltime > starttime && (cmd->buttons & BT_EBRAKEMASK) == BT_EBRAKEMASK) // Rubber-burn turn
|| (player->respawn.state != RESPAWNST_NONE) // Respawning
|| (player->spectator || objectplacing)) // Not a physical player
{