Merge branch 'nights-nerfjump' into 'master'

Nights nerfjump

See merge request STJr/SRB2Internal!206
This commit is contained in:
Digiku 2018-11-21 21:25:14 -05:00
commit 9ff8881e95

View file

@ -3965,7 +3965,7 @@ void P_DoJump(player_t *player, boolean soundandstate)
}
}
else if (maptol & TOL_NIGHTS)
player->mo->momz = 24*FRACUNIT;
player->mo->momz = 18*FRACUNIT;
else if (player->powers[pw_super])
{
player->mo->momz = 13*FRACUNIT;
@ -4006,6 +4006,9 @@ void P_DoJump(player_t *player, boolean soundandstate)
if (player->charflags & SF_MULTIABILITY && player->charability == CA_DOUBLEJUMP)
factor -= max(0, player->secondjump * player->jumpfactor / ((player->actionspd >> FRACBITS) + 1)); // Reduce the jump height each time
//if (maptol & TOL_NIGHTS)
// factor = player->jumpfactor; // all skins jump the same. if you nerf jumping abilities, you may want this.
P_SetObjectMomZ(player->mo, FixedMul(factor, player->mo->momz), false); // Custom height
// set just an eensy above the ground