From 16bb4fa3faba111fe3d7a3f171e4ed2419b0d5fd Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sun, 8 Dec 2013 23:40:57 -0500 Subject: [PATCH] Fix config stuff --- bal-wep-xonotic.cfg | 3 ++- qcsrc/common/weapons/w_electro.qc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index 2f264d1c0..a8bb7f5d6 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -194,6 +194,7 @@ set g_balance_electro_primary_damage 40 set g_balance_electro_primary_edgedamage 20 set g_balance_electro_primary_force 200 set g_balance_electro_primary_lifetime 5 +set g_balance_electro_primary_midaircombo_explode 1 set g_balance_electro_primary_midaircombo_interval 0.1 set g_balance_electro_primary_midaircombo_radius 100 set g_balance_electro_primary_radius 100 @@ -221,7 +222,7 @@ set g_balance_electro_secondary_speed 1000 set g_balance_electro_secondary_speed_up 200 set g_balance_electro_secondary_speed_z 0 set g_balance_electro_secondary_spread 0.04 -set g_balance_electro_secondary_takedamageexplode 0 +set g_balance_electro_secondary_touchexplode 0 set g_balance_electro_switchdelay_drop 0.2 set g_balance_electro_switchdelay_raise 0.2 // }}} diff --git a/qcsrc/common/weapons/w_electro.qc b/qcsrc/common/weapons/w_electro.qc index fecfa3de0..ae474c0f8 100644 --- a/qcsrc/common/weapons/w_electro.qc +++ b/qcsrc/common/weapons/w_electro.qc @@ -31,11 +31,11 @@ REGISTER_WEAPON( w_cvar(WEP_ELECTRO, electro, MO_SEC, count) \ w_cvar(WEP_ELECTRO, electro, MO_SEC, damageforcescale) \ w_cvar(WEP_ELECTRO, electro, MO_SEC, damagedbycontents) \ - w_cvar(WEP_ELECTRO, electro, MO_SEC, takedamageexplode) \ w_cvar(WEP_ELECTRO, electro, MO_SEC, health) \ w_cvar(WEP_ELECTRO, electro, MO_SEC, refire2) \ w_cvar(WEP_ELECTRO, electro, MO_SEC, speed_up) \ w_cvar(WEP_ELECTRO, electro, MO_SEC, speed_z) \ + w_cvar(WEP_ELECTRO, electro, MO_SEC, touchexplode) \ w_cvar(WEP_ELECTRO, electro, MO_NONE, combo_comboradius) \ w_cvar(WEP_ELECTRO, electro, MO_NONE, combo_comboradius_thruwall) \ w_cvar(WEP_ELECTRO, electro, MO_NONE, combo_damage) \ @@ -179,7 +179,7 @@ void W_Plasma_Touch(void) { PROJECTILE_TOUCH; if(other.takedamage == DAMAGE_AIM) - { if(WEP_CVAR_SEC(electro, takedamageexplode)) { W_Plasma_Explode(); } } + { if(WEP_CVAR_SEC(electro, touchexplode)) { W_Plasma_Explode(); } } else { //UpdateCSQCProjectile(self); -- 2.39.2