From 69d5d368cac575cb933404e0978b83047fd5a1db Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sun, 10 Sep 2023 17:05:47 -0700 Subject: [PATCH 1/3] Don't bubbledash when throwing --- src/k_kart.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 10269b818..b5f8bd38f 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -11428,9 +11428,12 @@ void K_MoveKartPlayer(player_t *player, boolean onground) if (player->bubbleblowup > bubbletime*2) { K_ThrowKartItem(player, (player->throwdir > 0), MT_BUBBLESHIELDTRAP, -1, 0, 0); - P_InstaThrust(player->mo, player->mo->angle, player->speed + (80 * mapobjectscale)); - player->sliptideZipBoost += TICRATE; // Just for keeping speed briefly vs. tripwire etc. - // If this doesn't turn out to be reliable, I'll change it to directly set leniency or something. + if (player->throwdir == -1) + { + P_InstaThrust(player->mo, player->mo->angle, player->speed + (80 * mapobjectscale)); + player->sliptideZipBoost += TICRATE; // Just for keeping speed briefly vs. tripwire etc. + // If this doesn't turn out to be reliable, I'll change it to directly set leniency or something. + } K_PlayAttackTaunt(player->mo); player->bubbleblowup = 0; player->bubblecool = 0; From a49ad03d5d80855524d65039faf57f3787ae749a Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sun, 10 Sep 2023 17:18:03 -0700 Subject: [PATCH 2/3] Stronger bubblebounce --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index b5f8bd38f..2c4364911 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10551,7 +10551,7 @@ boolean K_FastFallBounce(player_t *player) if (player->curshield == KSHIELD_BUBBLE) { S_StartSound(player->mo, sfx_s3k44); - P_InstaThrust(player->mo, player->mo->angle, max(player->speed, abs(player->fastfall))); + P_InstaThrust(player->mo, player->mo->angle, 11*max(player->speed, abs(player->fastfall))/10); bounce += 3 * player->mo->scale; } else From 18bc0d22e5aa9aa4d9fa1f1b8d5ab2321c6b1c9a Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sun, 10 Sep 2023 18:08:25 -0700 Subject: [PATCH 3/3] Higher fastfall gravity with bubble --- src/p_mobj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/p_mobj.c b/src/p_mobj.c index 77e2872cf..dad3be9d8 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1172,6 +1172,8 @@ fixed_t P_GetMobjGravity(mobj_t *mo) const fixed_t mult = 3*FRACUNIT + (3 * FixedDiv(mo->player->fastfallBase, unit)); gravityadd = FixedMul(gravityadd, mult); + if (mo->player->curshield == KSHIELD_BUBBLE) + gravityadd *= 2; } } else