Merge branch 'master' into Mario/electro_combo_over_time

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

diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg
index 09e00727c9791086a737c5e74ca78c687957b974..d205effcf1336dfbc708a477bb5210264dfa60ca 100644 (file)
--- a/bal-wep-mario.cfg
+++ b/bal-wep-mario.cfg
@@ -220,14 +220,16 @@ set g_balance_electro_secondary_edgedamage 15
 set g_balance_electro_secondary_force 50
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_lifetime 4
+set g_balance_electro_secondary_limit 0
 set g_balance_electro_secondary_radius 150
-set g_balance_electro_secondary_refire 0.2
-set g_balance_electro_secondary_refire2 1.6
+set g_balance_electro_secondary_refire 1.2
+set g_balance_electro_secondary_refire2 0.2
 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
 set g_balance_electro_secondary_stick 0
+set g_balance_electro_secondary_stick_lifetime -1
 set g_balance_electro_secondary_touchexplode 1
 set g_balance_electro_switchdelay_drop 0.2
 set g_balance_electro_switchdelay_raise 0.2