From a514a36128c3c828784e9863769af667eb5d04cd Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Wed, 24 Jan 2024 22:45:30 -0700 Subject: [PATCH] Less volatile bumper inflate --- src/k_kart.c | 5 +++-- src/p_map.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index eba4701bd..e84ff8aec 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -8783,8 +8783,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (player->bumperinflate && player->mo->health > 1 && player->mo->hitlag == 0) { - P_Thrust(player->mo, K_MomentumAngle(player->mo), BUMPER_THRUST); - if (player->tumbleBounces) + if (player->speed < K_GetKartSpeed(player, false, false)/2) + P_Thrust(player->mo, K_MomentumAngle(player->mo), BUMPER_THRUST); + if (player->tumbleBounces && player->tumbleBounces <= TUMBLEBOUNCES) player->mo->momz += BUMPER_FLOAT; player->bumperinflate--; } diff --git a/src/p_map.c b/src/p_map.c index 4d0aea282..957d376df 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -4181,6 +4181,7 @@ static void P_BouncePlayerMove(mobj_t *mo, TryMoveResult_t *result) if (mo->player && P_PlayerInPain(mo->player) && gametyperules & GTR_BUMPERS && mo->health > 1) { P_DamageMobj(mo, NULL, NULL, 1, DMG_STUMBLE); + mo->player->tumbleBounces = TUMBLEBOUNCES; } mo->momx = tmxmove;