Merge remote branch 'origin/tzork/uzifix' into fruitiex/fruitbalance

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

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 778ad88946410e7986dd54196a61611304ee10c9..fc99647f614d2cb1671eaed30247eab8723d48a1 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -104,7 +104,7 @@ set g_pickup_respawntimejitter_ammo 0
 // }}}
 
 // {{{ regen/rot
-set g_balance_health_regen 0.1
+set g_balance_health_regen 0.05
 set g_balance_health_regenlinear 0
 set g_balance_pause_health_regen 5
 set g_balance_pause_health_regen_spawn 0
@@ -316,25 +316,25 @@ set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 0
 set g_balance_electro_primary_refire 0.03333333
 set g_balance_electro_primary_animtime 0.03333333
-set g_balance_electro_primary_ammo 6
+set g_balance_electro_primary_ammo 10
 set g_balance_electro_primary_range 800
-set g_balance_electro_secondary_damage 40
+set g_balance_electro_secondary_damage 25
 set g_balance_electro_secondary_spread 0
 set g_balance_electro_secondary_edgedamage 0
 set g_balance_electro_secondary_force 100
 set g_balance_electro_secondary_radius 100
-set g_balance_electro_secondary_speed 675
+set g_balance_electro_secondary_speed 700
 set g_balance_electro_secondary_speed_up 200
 set g_balance_electro_secondary_speed_z 0
 set g_balance_electro_secondary_spread 0.08
 set g_balance_electro_secondary_lifetime 3.5
-set g_balance_electro_secondary_refire 0.5
-set g_balance_electro_secondary_refire2 0
-set g_balance_electro_secondary_animtime 0.5
+set g_balance_electro_secondary_refire 0.2
+set g_balance_electro_secondary_refire2 1
+set g_balance_electro_secondary_animtime 0.2
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 10
 set g_balance_electro_secondary_damageforcescale 4
-set g_balance_electro_secondary_count 1
+set g_balance_electro_secondary_count 3
 set g_balance_electro_combo_damage 40
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 80
@@ -386,7 +386,7 @@ set g_balance_crylink_secondary_line_fadetime 2
 set g_balance_nex_damage 80
 set g_balance_nex_force -300
 set g_balance_nex_refire 1.25
-set g_balance_nex_animtime 1
+set g_balance_nex_animtime 0.75
 set g_balance_nex_ammo 5
 set g_balance_nex_damagefalloff_mindist 1000
 set g_balance_nex_damagefalloff_maxdist 3000