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 563ce731127dcb05bba7205697da0207799b5139..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
@@ -247,8 +246,6 @@ set g_balance_arc_primary_falloff_mindist 0
 set g_balance_arc_primary_force 0
 set g_balance_arc_primary_range 0
 set g_balance_arc_primary_refire 0
-set g_balance_arc_reload_ammo 0
-set g_balance_arc_reload_time 0
 set g_balance_arc_secondary_ammo 0
 set g_balance_arc_switchdelay_drop 0
 set g_balance_arc_switchdelay_raise 0
@@ -438,8 +435,6 @@ set g_balance_porto_primary_animtime 0.3
 set g_balance_porto_primary_lifetime 5
 set g_balance_porto_primary_refire 1.5
 set g_balance_porto_primary_speed 1000
-set g_balance_porto_reload_ammo 0
-set g_balance_porto_reload_time 0
 set g_balance_porto_secondary 1
 set g_balance_porto_secondary_animtime 0.3
 set g_balance_porto_secondary_lifetime 5
@@ -482,9 +477,6 @@ set g_balance_hook_primary_hooked_ammo 5
 set g_balance_hook_primary_hooked_time_free 2
 set g_balance_hook_primary_hooked_time_max 0
 set g_balance_hook_primary_refire 0
-set g_balance_hook_reload_ammo 0
-set g_balance_hook_reload_time 0
-set g_balance_hook_secondary_ammo 30
 set g_balance_hook_secondary_animtime 0.3
 set g_balance_hook_secondary_damage 25
 set g_balance_hook_secondary_damageforcescale 0
@@ -547,8 +539,6 @@ set g_balance_tuba_edgedamage 0
 set g_balance_tuba_force 40
 set g_balance_tuba_radius 200
 set g_balance_tuba_refire 0.05
-set g_balance_tuba_reload_ammo 0
-set g_balance_tuba_reload_time 0
 set g_balance_tuba_switchdelay_drop 0.2
 set g_balance_tuba_switchdelay_raise 0.2
 set g_balance_tuba_weaponreplace ""
@@ -559,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
@@ -575,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
@@ -613,8 +599,6 @@ set g_balance_fireball_primary_refire 2
 set g_balance_fireball_primary_refire2 0
 set g_balance_fireball_primary_speed 1200
 set g_balance_fireball_primary_spread 0
-set g_balance_fireball_reload_ammo 0
-set g_balance_fireball_reload_time 0
 set g_balance_fireball_secondary_animtime 0.3
 set g_balance_fireball_secondary_damage 40
 set g_balance_fireball_secondary_damageforcescale 4
@@ -694,3 +678,34 @@ set g_balance_seeker_weaponreplace ""
 set g_balance_seeker_weaponstart 0
 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_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_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
+set g_balance_shotgun_secondary 1
+set g_balance_shotgun_secondary_animtime 1
+set g_balance_shotgun_secondary_damage 80
+set g_balance_shotgun_secondary_force 200
+set g_balance_shotgun_secondary_melee_delay 0.25
+set g_balance_shotgun_secondary_melee_multihit 1
+set g_balance_shotgun_secondary_melee_no_doubleslap 1
+set g_balance_shotgun_secondary_melee_nonplayerdamage 40
+set g_balance_shotgun_secondary_melee_range 120
+set g_balance_shotgun_secondary_melee_swing_side 120
+set g_balance_shotgun_secondary_melee_swing_up 30
+set g_balance_shotgun_secondary_melee_time 0.15
+set g_balance_shotgun_secondary_melee_traces 10
+set g_balance_shotgun_secondary_refire 1.25
+set g_balance_shotgun_switchdelay_drop 0.2
+set g_balance_shotgun_switchdelay_raise 0.2
+set g_balance_shotgun_weaponreplace ""
+set g_balance_shotgun_weaponstart 0
+set g_balance_shotgun_weaponstartoverride -1
+// }}}