Merge branch 'master' into Mario/overkill

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

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 28b552b5298d56450b98eed3be1373efaeb488f1..4e0462e758834770240a89ea9affb2261d2f9db2 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -271,8 +271,7 @@ set g_balance_shotgun_primary_spread 0.12
 set g_balance_shotgun_primary_refire 0.75
 set g_balance_shotgun_primary_animtime 0.2
 set g_balance_shotgun_primary_ammo 1
-set g_balance_shotgun_primary_speed 8000
-set g_balance_shotgun_primary_bulletconstant 75 // 3.8qu
+set g_balance_shotgun_primary_solidpenetration 3.8
 set g_balance_shotgun_secondary 1
 set g_balance_shotgun_secondary_melee_delay 0.25 // 0.35 was too slow
 set g_balance_shotgun_secondary_melee_range 120
@@ -320,8 +319,7 @@ set g_balance_uzi_sustained_spread 0.03
 set g_balance_uzi_sustained_refire 0.1
 set g_balance_uzi_sustained_ammo 1
 
-set g_balance_uzi_speed 18000
-set g_balance_uzi_bulletconstant 115 // 13.1qu
+set g_balance_uzi_solidpenetration 13.1
 
 set g_balance_uzi_switchdelay_drop 0.2
 set g_balance_uzi_switchdelay_raise 0.2
@@ -718,8 +716,7 @@ set g_balance_hmg_sustained_spread 0.03
 set g_balance_hmg_sustained_refire 0.05
 set g_balance_hmg_sustained_ammo 1
 
-set g_balance_hmg_speed 24000
-set g_balance_hmg_bulletconstant 115 // 13.1qu
+set g_balance_hmg_solidpenetration 32
 
 set g_balance_hmg_reload_ammo 120 //default: 30
 set g_balance_hmg_reload_time 1