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 d205effcf1336dfbc708a477bb5210264dfa60ca..35a7bf81eb1d031fb7d0f7e728febddd8b090059 100644 (file)
--- a/bal-wep-mario.cfg
+++ b/bal-wep-mario.cfg
@@ -180,10 +180,10 @@ 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_damage_linear 1
 set g_balance_electro_combo_duration 1.5
-set g_balance_electro_combo_edgedamage 45
-set g_balance_electro_combo_force -100
+set g_balance_electro_combo_edgedamage 25
+set g_balance_electro_combo_force 0
 set g_balance_electro_combo_power 3
 set g_balance_electro_combo_radius 150
 set g_balance_electro_combo_safeammocheck 1