From ebc5393d1f39aaf9695c69f19781e747496fca45 Mon Sep 17 00:00:00 2001 From: lordhavoc Date: Tue, 28 Jun 2005 08:08:41 +0000 Subject: [PATCH] added g_balance_falldamage_minspeed g_balance_falldamage_deadminspeed g_balance_falldamage_factor g_balance_falldamage_maxdamage cvars based on a patch at http://www.nexuiz.com/forums/index.php?showtopic=731 (did not apply the 'only falling' damage hack as hitting a wall really is intended to hurt you) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@472 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- qcsrc/default.cfg | 8 ++++++++ qcsrc/gamec/sv_main.c | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/qcsrc/default.cfg b/qcsrc/default.cfg index 82841598e..2cd7cd42d 100755 --- a/qcsrc/default.cfg +++ b/qcsrc/default.cfg @@ -139,6 +139,14 @@ set g_balance_rocketlauncher_force 600 set g_balance_rocketlauncher_radius 170 set g_balance_rocketlauncher_speed 850 set g_balance_rocketlauncher_refire 1 +//set g_balance_falldamage_deadminspeed 100 +//set g_balance_falldamage_minspeed 600 +//set g_balance_falldamage_factor 0.05 +//set g_balance_falldamage_maxdamage 50 +set g_balance_falldamage_deadminspeed 100 +set g_balance_falldamage_minspeed 1200 +set g_balance_falldamage_factor 0.15 +set g_balance_falldamage_maxdamage 100 // effects cl_decals 1 diff --git a/qcsrc/gamec/sv_main.c b/qcsrc/gamec/sv_main.c index d9586aef1..fb0eb4862 100644 --- a/qcsrc/gamec/sv_main.c +++ b/qcsrc/gamec/sv_main.c @@ -73,10 +73,10 @@ void CreatureFrame (void) // check for falling damage dm = vlen(self.velocity - self.oldvelocity); if (self.deadflag) - dm = dm - 100; + dm = (dm - cvar("g_balance_falldamage_deadminspeed")) * cvar("g_balance_falldamage_factor"); else { - if (dm >= 100 && self.oldvelocity_z < self.velocity_z) + if (self.oldvelocity_z < self.velocity_z - 100) { local float soundrandom; soundrandom = random() * 4; @@ -89,10 +89,10 @@ void CreatureFrame (void) else if (soundrandom < 4) sound (self, CHAN_BODY, "misc/hitground4.wav", 1, ATTN_NORM); } - dm = min(dm - 600, 1000); + dm = min((dm - cvar("g_balance_falldamage_minspeed")) * cvar("g_balance_falldamage_factor"), cvar("g_balance_falldamage_maxdamage")); } if (dm > 0) - Damage (self, world, world, dm * 0.05, DEATH_FALL, self.origin, '0 0 0'); + Damage (self, world, world, dm, DEATH_FALL, self.origin, '0 0 0'); self.oldvelocity = self.velocity; } self = findfloat(self, iscreature, TRUE); -- 2.39.2