From ffe3b8e9ed723157e2c75ebda77017f1cbeb006e Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Sat, 8 Feb 2025 18:08:29 -0500
Subject: [PATCH] Nerf tripwire knockback to account for the lack of hitlag

---
 src/k_kart.c | 2 +-
 src/p_map.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/k_kart.c b/src/k_kart.c
index f49ee5c55..2fac039eb 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3767,7 +3767,7 @@ void K_ApplyTripWire(player_t *player, tripwirestate_t state)
 {
 	// We are either softlocked or wildly misbehaving. Stop that!
 	if (state == TRIPSTATE_BLOCKED && player->tripwireReboundDelay && (player->speed > 5 * K_GetKartSpeed(player, false, false)))
-		P_DamageMobj(player->mo, NULL, NULL, 1, DMG_STING);
+		P_DamageMobj(player->mo, NULL, NULL, 1, DMG_NORMAL);
 
 	if (state == TRIPSTATE_PASSED)
 	{
diff --git a/src/p_map.c b/src/p_map.c
index 5db02d99f..b83e7c378 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -3145,8 +3145,8 @@ static void P_PlayerHitBounceLine(line_t *ld, vector2_t* normal)
 
 	if (ld && P_IsLineTripWire(ld))
 	{
-		tmxmove = x * 4;
-		tmymove = y * 4;
+		tmxmove = FixedMul(x, FRACUNIT+(FRACUNIT/2));
+		tmymove = FixedMul(y, FRACUNIT+(FRACUNIT/2));
 	}
 	else
 	{