Merge branch 'master' into Mario/electro_combo_over_time

[xonotic/xonotic-data.pk3dir.git] / bal-wep-nexuiz25.cfg

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index 1cbfe88e9801504a1c1daa8e1880e2f68408003b..3dbe7fc67168e7c33843b85999e69069a02deb63 100644 (file)
--- a/bal-wep-nexuiz25.cfg
+++ b/bal-wep-nexuiz25.cfg
@@ -179,8 +179,12 @@ set g_balance_minelayer_weaponthrowable 1
 set g_balance_electro_combo_comboradius 0
 set g_balance_electro_combo_comboradius_thruwall 0
 set g_balance_electro_combo_damage 80
+set g_balance_electro_combo_damage_interval 0.05
+set g_balance_electro_combo_damage_linear 0
+set g_balance_electro_combo_duration 0
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 200
+set g_balance_electro_combo_power 3
 set g_balance_electro_combo_radius 250
 set g_balance_electro_combo_safeammocheck 0
 set g_balance_electro_combo_speed 2000