Merge branch 'master' into terencehill/crosshair_colors

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

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 1f8caf4d71cb5db3bb483832ccde3e0c25b57fce..1dc5e511b58817dd80890283ecdac54fb10303ef 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -270,20 +270,20 @@ set g_balance_uzi_spread_add 0.008
 
 set g_balance_uzi_burst 3                              // # of bullets in a burst (if set to 2 or more)
 set g_balance_uzi_burst_refire 0.05            // refire between burst bullets
-set g_balance_uzi_burst_refire2 0.4    // refire after burst
+set g_balance_uzi_burst_refire2 0.45   // refire after burst
 set g_balance_uzi_burst_spread 0.05
-set g_balance_uzi_burst_damage 18              
+set g_balance_uzi_burst_damage 20       // 100 dps, delivered in 0.15s 
 set g_balance_uzi_burst_force 50
 set g_balance_uzi_burst_ammo 3
 
 set g_balance_uzi_first 1
-set g_balance_uzi_first_damage 20
-set g_balance_uzi_first_force 35
+set g_balance_uzi_first_damage 20       // 100 dps
+set g_balance_uzi_first_force 50
 set g_balance_uzi_first_spread 0.03
 set g_balance_uzi_first_refire 0.2
 set g_balance_uzi_first_ammo 2
 
-set g_balance_uzi_sustained_damage 12
+set g_balance_uzi_sustained_damage 12   // 120 dps
 set g_balance_uzi_sustained_force 12
 set g_balance_uzi_sustained_spread 0.08
 set g_balance_uzi_sustained_refire 0.1
@@ -298,7 +298,7 @@ set g_balance_grenadelauncher_primary_damage 50
 set g_balance_grenadelauncher_primary_edgedamage 32
 set g_balance_grenadelauncher_primary_force 300
 set g_balance_grenadelauncher_primary_radius 115
-set g_balance_grenadelauncher_primary_speed 1400
+set g_balance_grenadelauncher_primary_speed 1500
 set g_balance_grenadelauncher_primary_speed_up 225
 set g_balance_grenadelauncher_primary_speed_z 0
 set g_balance_grenadelauncher_primary_spread 0