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

Better multiability support.

Browse source 
* CA_TWINSPIN - you can do it multiple times
* CA_DOUBLEJUMP - your jump height is reduced each time, like in Kirby games. The number of extra jumps once you've left the ground that are available is determined by the character's actionspd.
This commit is contained in:
toasterbabe 2016-07-17 17:41:44 +01:00
parent df8568642e
commit 4bd56b82be
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/p_user.c
View file

@ -3641,13 +3641,10 @@ void P_DoJump(player_t *player, boolean soundandstate)
} }
} }
else if (player->charability2 == CA2_MULTIABILITY && else if (player->charability2 == CA2_MULTIABILITY &&
(player->charability == CA_DOUBLEJUMP || player->charability == CA_FLOAT || player->charability == CA_SLOWFALL)) (player->charability == CA_FLOAT || player->charability == CA_SLOWFALL))
{ {
// Multiability exceptions, since some abilities cannot effectively use it and need a boost. // Multiability exceptions, since some abilities cannot effectively use it and need a boost.
if (player->charability == CA_DOUBLEJUMP) player->mo->momz = 12*FRACUNIT; // Increased jump height due to ineffective repeat.
player->mo->momz = 23*(FRACUNIT/2); // Increased jump height instead of infinite jumps.
else if (player->charability == CA_FLOAT || player->charability == CA_SLOWFALL)
player->mo->momz = 12*FRACUNIT; // Increased jump height due to ineffective repeat.
} }
else else
{ {
@ -3673,6 +3670,9 @@ void P_DoJump(player_t *player, boolean soundandstate)
if (twodlevel || (player->mo->flags2 & MF2_TWOD)) if (twodlevel || (player->mo->flags2 & MF2_TWOD))
factor += player->jumpfactor / 10; factor += player->jumpfactor / 10;
if (player->charability2 == CA2_MULTIABILITY && player->charability == CA_DOUBLEJUMP)
factor -= max(0, player->secondjump * player->jumpfactor / ((player->actionspd >> FRACBITS) + 1)); // Reduce the jump height each time
P_SetObjectMomZ(player->mo, FixedMul(factor, player->mo->momz), false); // Custom height P_SetObjectMomZ(player->mo, FixedMul(factor, player->mo->momz), false); // Custom height
// set just an eensy above the ground // set just an eensy above the ground
@ -4111,14 +4111,17 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
} }
break; break;
case CA_DOUBLEJUMP: // Double-Jump case CA_DOUBLEJUMP: // Double-Jump
if (!(player->pflags & PF_THOKKED)) if (!(player->pflags & PF_THOKKED) || ((player->charability2 == CA2_MULTIABILITY) && (player->secondjump < (player->actionspd >> FRACBITS))))
{ {
player->pflags &= ~PF_JUMPED;
P_DoJump(player, true);
// Allow infinite double jumping if super. // Allow infinite double jumping if super.
if (!player->powers[pw_super]) if (!player->powers[pw_super])
player->pflags |= PF_THOKKED; player->pflags |= PF_THOKKED;
else
player->secondjump = 0;
player->pflags &= ~PF_JUMPED;
P_DoJump(player, true);
player->secondjump++;
} }
break; break;
case CA_FLOAT: // Float case CA_FLOAT: // Float
@ -4151,7 +4154,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
} }
break; break;
case CA_TWINSPIN: case CA_TWINSPIN:
if(!(player->pflags & PF_THOKKED)) if (!(player->pflags & PF_THOKKED) || player->charability2 == CA2_MULTIABILITY)
{ {
player->pflags |= PF_THOKKED; player->pflags |= PF_THOKKED;
S_StartSound(player->mo, sfx_s3k42); S_StartSound(player->mo, sfx_s3k42);