Merge remote branch 'origin/master' into samual/balance

[xonotic/xonotic-data.pk3dir.git] / balanceXonotic.cfg

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 182e66cb1ccb486be92967163d2036a128321033..6d308adfc76e53761daa874e97683c36574e0115 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -375,8 +375,8 @@ set g_balance_minelayer_reload_time 2
 // }}}
 // {{{ electro
 set g_balance_electro_lightning 0
-set g_balance_electro_primary_damage 55
-set g_balance_electro_primary_edgedamage 27.5
+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_force_up 0
 set g_balance_electro_primary_radius 100
@@ -409,8 +409,8 @@ set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_count 3
 set g_balance_electro_secondary_bouncefactor 0.4
 set g_balance_electro_secondary_bouncestop 0.05
-set g_balance_electro_combo_damage 40
-set g_balance_electro_combo_edgedamage 20
+set g_balance_electro_combo_damage 50
+set g_balance_electro_combo_edgedamage 25
 set g_balance_electro_combo_force 120
 set g_balance_electro_combo_radius 175
 set g_balance_electro_combo_comboradius 275