Merge branch 'divVerent/ballistic2' into samual/weapons

[xonotic/xonotic-data.pk3dir.git] / bal-wep-xonotic.cfg

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index e395278bd13d7094d49d58b2a54adc4da6380ef4..277809b164f8411e032e4dc1466246c71084b58e 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -79,7 +79,6 @@ set g_balance_shockwave_weaponstart 1
 set g_balance_shockwave_weaponstartoverride -1
 // }}}
 // {{{ #3: Machine Gun
-set g_balance_uzi_bulletconstant 115
 set g_balance_uzi_burst 3
 set g_balance_uzi_burst_ammo 3
 set g_balance_uzi_burst_animtime 0.3
@@ -95,7 +94,7 @@ set g_balance_uzi_first_spread 0.03
 set g_balance_uzi_mode 1
 set g_balance_uzi_reload_ammo 60
 set g_balance_uzi_reload_time 2
-set g_balance_uzi_speed 18000
+set g_balance_uzi_solidpenetration 13.1
 set g_balance_uzi_spread_add 0.012
 set g_balance_uzi_spread_max 0.05
 set g_balance_uzi_spread_min 0.02
@@ -550,15 +549,13 @@ set g_balance_tuba_weaponstartoverride -1
 set g_balance_rifle_bursttime 0
 set g_balance_rifle_primary_ammo 10
 set g_balance_rifle_primary_animtime 0.4
-set g_balance_rifle_primary_bulletconstant 110
 set g_balance_rifle_primary_bullethail 0
 set g_balance_rifle_primary_burstcost 0
 set g_balance_rifle_primary_damage 80
 set g_balance_rifle_primary_force 100
-set g_balance_rifle_primary_lifetime 5
 set g_balance_rifle_primary_refire 1.2
 set g_balance_rifle_primary_shots 1
-set g_balance_rifle_primary_speed 40000
+set g_balance_rifle_primary_solidpenetration 62.2
 set g_balance_rifle_primary_spread 0
 set g_balance_rifle_primary_tracer 1
 set g_balance_rifle_reload_ammo 80
@@ -566,16 +563,14 @@ set g_balance_rifle_reload_time 2
 set g_balance_rifle_secondary 1
 set g_balance_rifle_secondary_ammo 10
 set g_balance_rifle_secondary_animtime 0.3
-set g_balance_rifle_secondary_bulletconstant 110
 set g_balance_rifle_secondary_bullethail 0
 set g_balance_rifle_secondary_burstcost 0
 set g_balance_rifle_secondary_damage 20
 set g_balance_rifle_secondary_force 50
-set g_balance_rifle_secondary_lifetime 5
 set g_balance_rifle_secondary_refire 0.9
 set g_balance_rifle_secondary_reload 0
 set g_balance_rifle_secondary_shots 4
-set g_balance_rifle_secondary_speed 20000
+set g_balance_rifle_secondary_solidpenetration 15.5
 set g_balance_rifle_secondary_spread 0.04
 set g_balance_rifle_secondary_tracer 0
 set g_balance_rifle_switchdelay_drop 0.2
@@ -686,12 +681,11 @@ set g_balance_seeker_weaponstartoverride -1
 // {{{ #20: Shotgun (MUTATOR WEAPON)
 set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_animtime 0.2
-set g_balance_shotgun_primary_bulletconstant 75
 set g_balance_shotgun_primary_bullets 14
 set g_balance_shotgun_primary_damage 4
 set g_balance_shotgun_primary_force 15
 set g_balance_shotgun_primary_refire 0.75
-set g_balance_shotgun_primary_speed 8000
+set g_balance_shotgun_primary_solidpenetration 3.8
 set g_balance_shotgun_primary_spread 0.12
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2