From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 4 Jan 2012 20:40:33 +0000 (+0200)
Subject: Make damage effects last longer
X-Git-Tag: xonotic-v0.6.0~110^2^2~63
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa267f19bc1f0e0c985b70f547a67d2158397be3;p=xonotic%2Fxonotic-data.pk3dir.git

Make damage effects last longer
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 130f1754f..acdff456a 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -369,8 +369,9 @@ set g_teleport_maxspeed 0 "maximum speed that a player can keep when going throu
 
 set cl_damageeffect 0.05 "enable weapon damage effects on players, value specifies how often to show the effect"
 set cl_damageeffect_limit 3 "how many damages to show on a player at once"
-set cl_damageeffect_lifetime 0.04 "how much a damage effect lasts, multiplied by damage amount"
-set cl_damageeffect_lifetime_max 5 "maximum amount of lifetime a damage effect may have at a time"
+set cl_damageeffect_lifetime 0.1 "how much a damage effect lasts, multiplied by damage amount"
+set cl_damageeffect_lifetime_min 2 "minimum amount of life a damage effect may have"
+set cl_damageeffect_lifetime_max 6 "maximum amount of life a damage effect may have"
 
 set g_respawn_ghosts 1 "if 1 dead bodies become ghosts and float away when the player respawns"
 set g_respawn_ghosts_speed 5 "the speed with which respawn ghosts float and rotate"
diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 248166e68..0087c5096 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -376,6 +376,7 @@ string autocvar__togglezoom;
 float autocvar_cl_damageeffect;
 float autocvar_cl_damageeffect_limit;
 float autocvar_cl_damageeffect_lifetime;
+float autocvar_cl_damageeffect_lifetime_min;
 float autocvar_cl_damageeffect_lifetime_max;
 float autocvar_cl_playerdetailreduction;
 float autocvar_cl_loddistance1 = 1024;
diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index ffa11e0b6..37030cef0 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -287,7 +287,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum, float ent
 		return;
 
 	specstr = species_prefix(specnum);
-	life = bound(0, dmg * autocvar_cl_damageeffect_lifetime, autocvar_cl_damageeffect_lifetime_max);
+	life = bound(autocvar_cl_damageeffect_lifetime_min, dmg * autocvar_cl_damageeffect_lifetime, autocvar_cl_damageeffect_lifetime_max);
 
 	e = get_weaponinfo(type);
 	effectnum = strcat("weapondamage_", e.netname);