Merge branch 'master' into Mario/electro_combo_over_time

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

diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg
index d1c3c175c71e9908d4dd27173d15989305a251fd..5733f4e6ccdb8a7743374a0fcf56898dbf5916e2 100644 (file)
--- a/bal-wep-samual.cfg
+++ b/bal-wep-samual.cfg
@@ -179,8 +179,12 @@ set g_balance_minelayer_weaponthrowable 1
 set g_balance_electro_combo_comboradius 300
 set g_balance_electro_combo_comboradius_thruwall 200
 set g_balance_electro_combo_damage 50
+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 25
 set g_balance_electro_combo_force 120
+set g_balance_electro_combo_power 3
 set g_balance_electro_combo_radius 150
 set g_balance_electro_combo_safeammocheck 1
 set g_balance_electro_combo_speed 2000
@@ -225,6 +229,7 @@ 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_stick 0
+set g_balance_electro_secondary_stick_lifetime -1
 set g_balance_electro_secondary_touchexplode 0
 set g_balance_electro_switchdelay_drop 0.2
 set g_balance_electro_switchdelay_raise 0.2