Fix config stuff

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 2f264d1c09bd7da426d37f87618d1c43a599bad2..a8bb7f5d6c38ff2b24f5e358c8cefe5c8d1589c6 100644 (file)
--- 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 fecfa3de05548b98129d90cc85ee1a9b0364a069..ae474c0f845e76a67134f0925837c763460b02f4 100644 (file)
--- 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);