r4986 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-11-05 04:06:23 -0500 (Wed, 05 Nov 2008)
New Revision: 4986

Modified:
   trunk/data/qcsrc/server/w_electro.qc
   trunk/data/weapons.cfg
Log:
g_balance_electro_combo_speed


Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc	2008-11-05 07:32:47 UTC (rev 4985)
+++ trunk/data/qcsrc/server/w_electro.qc	2008-11-05 09:06:23 UTC (rev 4986)
@@ -59,6 +59,8 @@
 
 void W_Plasma_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
+	if(self.health <= 0)
+		return;
 	self.health = self.health - damage;
 	if (self.health <= 0)
 	{
@@ -70,6 +72,7 @@
 			self.owner = inflictor.owner;
 			self.classname = "plasma_chain";
 			self.think = W_Plasma_Explode_Combo;
+			self.nextthink = time + vlen(self.origin - inflictor.origin) / cvar("g_balance_electro_combo_speed"); // delay combo chains, looks cooler
 		}
 		else
 			self.think = W_Plasma_Explode;

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2008-11-05 07:32:47 UTC (rev 4985)
+++ trunk/data/weapons.cfg	2008-11-05 09:06:23 UTC (rev 4986)
@@ -134,6 +134,7 @@
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200
 set g_balance_electro_combo_radius 250
+set g_balance_electro_combo_speed 2000
 
 set g_balance_crylink_primary_damage 20
 set g_balance_crylink_primary_edgedamage 0