From 782d4b1b736752a4f1cbc3c37a7e6e6faa6a8416 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 5 Nov 2008 09:06:23 +0000 Subject: [PATCH] g_balance_electro_combo_speed git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4986 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/w_electro.qc | 3 +++ data/weapons.cfg | 1 + 2 files changed, 4 insertions(+) diff --git a/data/qcsrc/server/w_electro.qc b/data/qcsrc/server/w_electro.qc index 11fb0ceaa..a372b8965 100644 --- a/data/qcsrc/server/w_electro.qc +++ b/data/qcsrc/server/w_electro.qc @@ -59,6 +59,8 @@ void W_Plasma_TouchExplode (void) 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 @@ void W_Plasma_Damage (entity inflictor, entity attacker, float damage, float dea 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; diff --git a/data/weapons.cfg b/data/weapons.cfg index 4d72d325d..7fd806f8d 100644 --- a/data/weapons.cfg +++ b/data/weapons.cfg @@ -134,6 +134,7 @@ set g_balance_electro_combo_damage 70 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 -- 2.39.2