From d1070f5180591e213db87b4fb3921a7353d7e9f4 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sat, 4 May 2024 20:46:16 -0700 Subject: [PATCH] Reduce speed-based droptarget deflect dampening --- src/k_collide.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/k_collide.cpp b/src/k_collide.cpp index ef47d6beb..eb9c788e0 100644 --- a/src/k_collide.cpp +++ b/src/k_collide.cpp @@ -559,17 +559,16 @@ boolean K_DropTargetCollide(mobj_t *t1, mobj_t *t2) } fixed_t bumppower = FRACUNIT; - const fixed_t minbumppower = FRACUNIT/2; if (t2->player) { fixed_t speeddampen = FixedDiv(t2->player->speed, 2*K_GetKartSpeed(t2->player, false, false)); bumppower = Easing_InQuad( std::min(speeddampen, FRACUNIT), FRACUNIT, - minbumppower + 3*FRACUNIT/4 ); - if (t2->player->tripwireLeniency) - bumppower = minbumppower; + if (t2->player->tripwireLeniency || t2->player->tripwirePass != TRIPWIRE_NONE) + bumppower = FRACUNIT/2; } if (t2->type == MT_INSTAWHIP)