From b416568c7c206048b9dad259076906627612bd11 Mon Sep 17 00:00:00 2001 From: cypress Date: Mon, 17 Jul 2023 16:52:58 -0400 Subject: [PATCH] SERVER: Slight fall damage fixes --- source/server/weapons/weapon_core.qc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/source/server/weapons/weapon_core.qc b/source/server/weapons/weapon_core.qc index 833b46b..db36436 100644 --- a/source/server/weapons/weapon_core.qc +++ b/source/server/weapons/weapon_core.qc @@ -2158,15 +2158,12 @@ void() CheckPlayer = self.dive = 0; } - if (fabs(vlen(self.oldz - self.origin_z)) > 176 && !(self.perks & P_FLOP)) { - float height = fabs(vlen(self.oldz - self.origin_z)) - 176 + 64; - float damage; + if (fabs(self.oldz - self.origin_z) + 64 > 176 && !(self.perks & P_FLOP)) { + float height = fabs(self.oldz - self.origin_z) + 64; + float damage = height*(0.68); - if (height > 326) { - damage = 98; - } else { - damage = height*(0.68); - } + if (damage > 98) damage = 98; + DamageHandler (self, other, damage, S_ZOMBIE); if (self.health <= 10)