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

Merge branch 'air-spark-experiment' into 'master'

Browse source 
Air spark experiment

See merge request KartKrew/Kart!217
This commit is contained in:
Sal 2020-03-22 14:26:33 -04:00
commit 6e02982e7d
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/k_kart.c
View file

@ -6504,12 +6504,11 @@ static void K_KartDrift(player_t *player, boolean onground)
// Holding the Jump button will enable drifting.
// Drift Release (Moved here so you can't "chain" drifts)
if ((player->kartstuff[k_drift] != -5 && player->kartstuff[k_drift] != 5)
// || (player->kartstuff[k_drift] >= 1 && player->kartstuff[k_turndir] != 1) || (player->kartstuff[k_drift] <= -1 && player->kartstuff[k_turndir] != -1))
&& onground)
if (player->kartstuff[k_drift] != -5 && player->kartstuff[k_drift] != 5)
{
if (player->kartstuff[k_driftcharge] < 0 || player->kartstuff[k_driftcharge] >= dsone)
{
angle_t pushdir = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
//mobj_t *overlay = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_DRIFTEXPLODE);
//P_SetTarget(&overlay->target, player->mo);
//P_SetScale(overlay, (overlay->destscale = player->mo->scale));
@ -6521,6 +6520,9 @@ static void K_KartDrift(player_t *player, boolean onground)
if (player->kartstuff[k_driftcharge] < 0)
{
// Stage 0: Yellow sparks
if (!onground)
P_Thrust(player->mo, pushdir, player->speed / 8);
if (player->kartstuff[k_driftboost] < 15)
player->kartstuff[k_driftboost] = 15;
@ -6530,6 +6532,9 @@ static void K_KartDrift(player_t *player, boolean onground)
else if (player->kartstuff[k_driftcharge] >= dsone && player->kartstuff[k_driftcharge] < dstwo)
{
// Stage 1: Red sparks
if (!onground)
P_Thrust(player->mo, pushdir, player->speed / 4);
if (player->kartstuff[k_driftboost] < 20)
player->kartstuff[k_driftboost] = 20;
@ -6539,6 +6544,9 @@ static void K_KartDrift(player_t *player, boolean onground)
else if (player->kartstuff[k_driftcharge] < dsthree)
{
// Stage 2: Blue sparks
if (!onground)
P_Thrust(player->mo, pushdir, player->speed / 3);
if (player->kartstuff[k_driftboost] < 50)
player->kartstuff[k_driftboost] = 50;
@ -6548,6 +6556,9 @@ static void K_KartDrift(player_t *player, boolean onground)
else if (player->kartstuff[k_driftcharge] >= dsthree)
{
// Stage 3: Rainbow sparks
if (!onground)
P_Thrust(player->mo, pushdir, player->speed / 2);
if (player->kartstuff[k_driftboost] < 125)
player->kartstuff[k_driftboost] = 125;