X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=bal-wep-xonotic.cfg;h=5c6ace7abd7c6649f82b9998570e562154431a8e;hp=aea4a1a5f87b7fb81b4761e251deb8759643de1d;hb=42573473e1c79e571eb9b75a79aa8b961f216696;hpb=6ea97246f03651c514be506bf57cbc0c2351e935

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index aea4a1a5f8..5c6ace7abd 100644
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -256,7 +256,7 @@ set g_balance_crylink_primary_spread 0.08
 set g_balance_crylink_reload_ammo 0
 set g_balance_crylink_reload_time 2
 set g_balance_crylink_secondary 1
-set g_balance_crylink_secondary_ammo 2
+set g_balance_crylink_secondary_ammo 3
 set g_balance_crylink_secondary_animtime 0.2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_bounces 0
@@ -303,6 +303,7 @@ set g_balance_vortex_charge_start 0.5
 set g_balance_vortex_charge_velocity_rate 0
 set g_balance_vortex_primary_ammo 6
 set g_balance_vortex_primary_animtime 0.4
+set g_balance_vortex_primary_armorpierce 0
 set g_balance_vortex_primary_damage 80
 set g_balance_vortex_primary_damagefalloff_forcehalflife 0
 set g_balance_vortex_primary_damagefalloff_halflife 0
@@ -315,6 +316,7 @@ set g_balance_vortex_reload_time 2
 set g_balance_vortex_secondary 0
 set g_balance_vortex_secondary_ammo 2
 set g_balance_vortex_secondary_animtime 0
+set g_balance_vortex_secondary_armorpierce 0
 set g_balance_vortex_secondary_chargepool 0
 set g_balance_vortex_secondary_chargepool_pause_regen 1
 set g_balance_vortex_secondary_chargepool_regen 0.15
@@ -436,6 +438,7 @@ set g_balance_porto_weaponthrowable 1
 set g_balance_vaporizer_primary_ammo 10
 set g_balance_vaporizer_primary_animtime 0.3
 set g_balance_vaporizer_primary_damage 150
+set g_balance_vaporizer_primary_force 800
 set g_balance_vaporizer_primary_refire 1
 set g_balance_vaporizer_reload_ammo 0
 set g_balance_vaporizer_reload_time 0
@@ -750,11 +753,11 @@ set g_balance_arc_beam_heat 0
 set g_balance_arc_burst_heat 5
 set g_balance_arc_beam_maxangle 10
 set g_balance_arc_beam_nonplayerdamage 80
-set g_balance_arc_beam_range 1000
+set g_balance_arc_beam_range 1500
 set g_balance_arc_beam_refire 0.25
 set g_balance_arc_beam_returnspeed 8
-set g_balance_arc_beam_tightness 0.5
-set g_balance_arc_bolt 0
+set g_balance_arc_beam_tightness 0.6
+set g_balance_arc_bolt 1
 set g_balance_arc_bolt_ammo 1
 set g_balance_arc_bolt_damage 25
 set g_balance_arc_bolt_damageforcescale 0
@@ -777,72 +780,72 @@ set g_balance_arc_weaponstart 0
 set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
-// {{{ #21: Heavy Machine Gun
-set g_balance_hmg_primary_ammo 1
-set g_balance_hmg_primary_damage 30
-set g_balance_hmg_primary_force 10
-set g_balance_hmg_primary_refire 0.05
-set g_balance_hmg_primary_solidpenetration 32
-set g_balance_hmg_primary_spread_add 0.005
-set g_balance_hmg_primary_spread_max 0.06
-set g_balance_hmg_primary_spread_min 0.01
-set g_balance_hmg_reload_ammo 120
-set g_balance_hmg_reload_time 1
-set g_balance_hmg_secondary_ammo 0
-set g_balance_hmg_secondary_animtime 0.2
-set g_balance_hmg_secondary_damage 25
-set g_balance_hmg_secondary_delay 0
-set g_balance_hmg_secondary_edgedamage 12.5
-set g_balance_hmg_secondary_force 300
-set g_balance_hmg_secondary_lifetime 5
-set g_balance_hmg_secondary_radius 70
-set g_balance_hmg_secondary_refire 0.7
-set g_balance_hmg_secondary_refire_type 1
-set g_balance_hmg_secondary_shotangle 0
-set g_balance_hmg_secondary_speed 6000
-set g_balance_hmg_secondary_spread 0
-set g_balance_hmg_switchdelay_drop 0.2
-set g_balance_hmg_switchdelay_raise 0.2
-set g_balance_hmg_weaponreplace ""
-set g_balance_hmg_weaponstart 0
-set g_balance_hmg_weaponstartoverride 0
-set g_balance_hmg_weaponthrowable 0
+// {{{ #21: Overkill Heavy Machine Gun
+set g_balance_okhmg_primary_ammo 1
+set g_balance_okhmg_primary_damage 30
+set g_balance_okhmg_primary_force 10
+set g_balance_okhmg_primary_refire 0.05
+set g_balance_okhmg_primary_solidpenetration 32
+set g_balance_okhmg_primary_spread_add 0.005
+set g_balance_okhmg_primary_spread_max 0.06
+set g_balance_okhmg_primary_spread_min 0.01
+set g_balance_okhmg_reload_ammo 120
+set g_balance_okhmg_reload_time 1
+set g_balance_okhmg_secondary_ammo 0
+set g_balance_okhmg_secondary_animtime 0.2
+set g_balance_okhmg_secondary_damage 25
+set g_balance_okhmg_secondary_delay 0
+set g_balance_okhmg_secondary_edgedamage 12.5
+set g_balance_okhmg_secondary_force 300
+set g_balance_okhmg_secondary_lifetime 5
+set g_balance_okhmg_secondary_radius 70
+set g_balance_okhmg_secondary_refire 0.7
+set g_balance_okhmg_secondary_refire_type 1
+set g_balance_okhmg_secondary_shotangle 0
+set g_balance_okhmg_secondary_speed 6000
+set g_balance_okhmg_secondary_spread 0
+set g_balance_okhmg_switchdelay_drop 0.2
+set g_balance_okhmg_switchdelay_raise 0.2
+set g_balance_okhmg_weaponreplace ""
+set g_balance_okhmg_weaponstart 0
+set g_balance_okhmg_weaponstartoverride 0
+set g_balance_okhmg_weaponthrowable 0
 // }}}
-// {{{ #22: Rocket Propelled Chainsaw
-set g_balance_rpc_primary_ammo 10
-set g_balance_rpc_primary_animtime 1
-set g_balance_rpc_primary_damage 150
-set g_balance_rpc_primary_damage2 500
-set g_balance_rpc_primary_damageforcescale 2
-set g_balance_rpc_primary_edgedamage 50
-set g_balance_rpc_primary_force 400
-set g_balance_rpc_primary_health 25
-set g_balance_rpc_primary_lifetime 30
-set g_balance_rpc_primary_radius 300
-set g_balance_rpc_primary_refire 1
-set g_balance_rpc_primary_speed 2500
-set g_balance_rpc_primary_speedaccel 5000
-set g_balance_rpc_reload_ammo 10
-set g_balance_rpc_reload_time 1
-set g_balance_rpc_secondary_ammo 0
-set g_balance_rpc_secondary_animtime 0.2
-set g_balance_rpc_secondary_damage 25
-set g_balance_rpc_secondary_delay 0
-set g_balance_rpc_secondary_edgedamage 12.5
-set g_balance_rpc_secondary_force 300
-set g_balance_rpc_secondary_lifetime 5
-set g_balance_rpc_secondary_radius 70
-set g_balance_rpc_secondary_refire 0.7
-set g_balance_rpc_secondary_refire_type 1
-set g_balance_rpc_secondary_shotangle 0
-set g_balance_rpc_secondary_speed 6000
-set g_balance_rpc_secondary_spread 0
-set g_balance_rpc_switchdelay_drop 0.2
-set g_balance_rpc_switchdelay_raise 0.2
-set g_balance_rpc_weaponreplace ""
-set g_balance_rpc_weaponstart 0
-set g_balance_rpc_weaponstartoverride 0
-set g_balance_rpc_weaponthrowable 0
+// {{{ #22: Overkill Rocket Propelled Chainsaw
+set g_balance_okrpc_primary_ammo 10
+set g_balance_okrpc_primary_animtime 1
+set g_balance_okrpc_primary_damage 150
+set g_balance_okrpc_primary_damage2 500
+set g_balance_okrpc_primary_damageforcescale 2
+set g_balance_okrpc_primary_edgedamage 50
+set g_balance_okrpc_primary_force 400
+set g_balance_okrpc_primary_health 25
+set g_balance_okrpc_primary_lifetime 30
+set g_balance_okrpc_primary_radius 300
+set g_balance_okrpc_primary_refire 1
+set g_balance_okrpc_primary_speed 2500
+set g_balance_okrpc_primary_speedaccel 5000
+set g_balance_okrpc_reload_ammo 10
+set g_balance_okrpc_reload_time 1
+set g_balance_okrpc_secondary_ammo 0
+set g_balance_okrpc_secondary_animtime 0.2
+set g_balance_okrpc_secondary_damage 25
+set g_balance_okrpc_secondary_delay 0
+set g_balance_okrpc_secondary_edgedamage 12.5
+set g_balance_okrpc_secondary_force 300
+set g_balance_okrpc_secondary_lifetime 5
+set g_balance_okrpc_secondary_radius 70
+set g_balance_okrpc_secondary_refire 0.7
+set g_balance_okrpc_secondary_refire_type 1
+set g_balance_okrpc_secondary_shotangle 0
+set g_balance_okrpc_secondary_speed 6000
+set g_balance_okrpc_secondary_spread 0
+set g_balance_okrpc_switchdelay_drop 0.2
+set g_balance_okrpc_switchdelay_raise 0.2
+set g_balance_okrpc_weaponreplace ""
+set g_balance_okrpc_weaponstart 0
+set g_balance_okrpc_weaponstartoverride 0
+set g_balance_okrpc_weaponthrowable 0
 // }}}
 // {{{ Overkill Shotgun
 set g_balance_okshotgun_primary_ammo 3
@@ -856,7 +859,6 @@ set g_balance_okshotgun_primary_solidpenetration 3.8
 set g_balance_okshotgun_primary_spread 0.07
 set g_balance_okshotgun_reload_ammo 24
 set g_balance_okshotgun_reload_time 2
-set g_balance_okshotgun_secondary_ammo 0
 set g_balance_okshotgun_secondary_animtime 0.2
 set g_balance_okshotgun_secondary_damage 25
 set g_balance_okshotgun_secondary_delay 0
@@ -877,22 +879,16 @@ set g_balance_okshotgun_weaponstartoverride -1
 set g_balance_okshotgun_weaponthrowable 1
 // }}}
 // {{{ Overkill Machine Gun
-set g_balance_okmachinegun_burst 3
-set g_balance_okmachinegun_burst_ammo 3
-set g_balance_okmachinegun_burst_animtime 0.3
-set g_balance_okmachinegun_burst_refire 0.06
-set g_balance_okmachinegun_burst_refire2 0.45
-set g_balance_okmachinegun_burst_speed 0
-set g_balance_okmachinegun_first 1
-set g_balance_okmachinegun_first_ammo 1
-set g_balance_okmachinegun_first_damage 14
-set g_balance_okmachinegun_first_force 5
-set g_balance_okmachinegun_first_refire 0.125
-set g_balance_okmachinegun_first_spread 0.03
-set g_balance_okmachinegun_mode 1
+set g_balance_okmachinegun_primary_ammo 1
+set g_balance_okmachinegun_primary_damage 25
+set g_balance_okmachinegun_primary_force 5
+set g_balance_okmachinegun_primary_refire 0.1
+set g_balance_okmachinegun_primary_solidpenetration 63
+set g_balance_okmachinegun_primary_spread_add 0.012
+set g_balance_okmachinegun_primary_spread_max 0.05
+set g_balance_okmachinegun_primary_spread_min 0
 set g_balance_okmachinegun_reload_ammo 30
 set g_balance_okmachinegun_reload_time 1.5
-set g_balance_okmachinegun_secondary_ammo 0
 set g_balance_okmachinegun_secondary_animtime 0.2
 set g_balance_okmachinegun_secondary_damage 25
 set g_balance_okmachinegun_secondary_delay 0
@@ -905,15 +901,6 @@ set g_balance_okmachinegun_secondary_refire_type 1
 set g_balance_okmachinegun_secondary_shotangle 0
 set g_balance_okmachinegun_secondary_speed 6000
 set g_balance_okmachinegun_secondary_spread 0
-set g_balance_okmachinegun_solidpenetration 13.1
-set g_balance_okmachinegun_spread_add 0.012
-set g_balance_okmachinegun_spread_max 0.05
-set g_balance_okmachinegun_spread_min 0
-set g_balance_okmachinegun_sustained_ammo 1
-set g_balance_okmachinegun_sustained_damage 25
-set g_balance_okmachinegun_sustained_force 5
-set g_balance_okmachinegun_sustained_refire 0.1
-set g_balance_okmachinegun_sustained_spread 0.01
 set g_balance_okmachinegun_switchdelay_drop 0.2
 set g_balance_okmachinegun_switchdelay_raise 0.2
 set g_balance_okmachinegun_weaponreplace ""
@@ -921,55 +908,55 @@ set g_balance_okmachinegun_weaponstart 0
 set g_balance_okmachinegun_weaponstartoverride -1
 set g_balance_okmachinegun_weaponthrowable 1
 // }}}
-// {{{ Overkill Vortex
-set g_balance_okvortex_charge 0
-set g_balance_okvortex_charge_animlimit 0.5
-set g_balance_okvortex_charge_limit 1
-set g_balance_okvortex_charge_maxspeed 800
-set g_balance_okvortex_charge_mindmg 40
-set g_balance_okvortex_charge_minspeed 400
-set g_balance_okvortex_charge_rate 0.6
-set g_balance_okvortex_charge_rot_pause 0
-set g_balance_okvortex_charge_rot_rate 0
-set g_balance_okvortex_charge_shot_multiplier 0
-set g_balance_okvortex_charge_start 0.5
-set g_balance_okvortex_charge_velocity_rate 0
-set g_balance_okvortex_primary_ammo 10
-set g_balance_okvortex_primary_animtime 0.65
-set g_balance_okvortex_primary_damage 100
-set g_balance_okvortex_primary_damagefalloff_forcehalflife 0
-set g_balance_okvortex_primary_damagefalloff_halflife 0
-set g_balance_okvortex_primary_damagefalloff_maxdist 0
-set g_balance_okvortex_primary_damagefalloff_mindist 0
-set g_balance_okvortex_primary_force 500
-set g_balance_okvortex_primary_refire 1
-set g_balance_okvortex_reload_ammo 50
-set g_balance_okvortex_reload_time 2
-set g_balance_okvortex_secondary 2
-set g_balance_okvortex_secondary_ammo 0
-set g_balance_okvortex_secondary_animtime 0.2
-set g_balance_okvortex_secondary_chargepool 0
-set g_balance_okvortex_secondary_chargepool_pause_regen 1
-set g_balance_okvortex_secondary_chargepool_regen 0.15
-set g_balance_okvortex_secondary_damage 25
-set g_balance_okvortex_secondary_damagefalloff_forcehalflife 0
-set g_balance_okvortex_secondary_damagefalloff_halflife 0
-set g_balance_okvortex_secondary_damagefalloff_maxdist 0
-set g_balance_okvortex_secondary_damagefalloff_mindist 0
-set g_balance_okvortex_secondary_force 300
-set g_balance_okvortex_secondary_refire 0.7
-set g_balance_okvortex_secondary_refire_type 1
-set g_balance_okvortex_secondary_delay 0
-set g_balance_okvortex_secondary_edgedamage 12.5
-set g_balance_okvortex_secondary_lifetime 5
-set g_balance_okvortex_secondary_radius 70
-set g_balance_okvortex_secondary_shotangle 0
-set g_balance_okvortex_secondary_speed 6000
-set g_balance_okvortex_secondary_spread 0
-set g_balance_okvortex_switchdelay_drop 0.2
-set g_balance_okvortex_switchdelay_raise 0.2
-set g_balance_okvortex_weaponreplace ""
-set g_balance_okvortex_weaponstart 0
-set g_balance_okvortex_weaponstartoverride -1
-set g_balance_okvortex_weaponthrowable 1
+// {{{ Overkill Nex
+set g_balance_oknex_charge 0
+set g_balance_oknex_charge_animlimit 0.5
+set g_balance_oknex_charge_limit 1
+set g_balance_oknex_charge_maxspeed 800
+set g_balance_oknex_charge_mindmg 40
+set g_balance_oknex_charge_minspeed 400
+set g_balance_oknex_charge_rate 0.6
+set g_balance_oknex_charge_rot_pause 0
+set g_balance_oknex_charge_rot_rate 0
+set g_balance_oknex_charge_shot_multiplier 0
+set g_balance_oknex_charge_start 0.5
+set g_balance_oknex_charge_velocity_rate 0
+set g_balance_oknex_primary_ammo 10
+set g_balance_oknex_primary_animtime 0.65
+set g_balance_oknex_primary_damage 100
+set g_balance_oknex_primary_damagefalloff_forcehalflife 0
+set g_balance_oknex_primary_damagefalloff_halflife 0
+set g_balance_oknex_primary_damagefalloff_maxdist 0
+set g_balance_oknex_primary_damagefalloff_mindist 0
+set g_balance_oknex_primary_force 500
+set g_balance_oknex_primary_refire 1
+set g_balance_oknex_reload_ammo 50
+set g_balance_oknex_reload_time 2
+set g_balance_oknex_secondary 2
+set g_balance_oknex_secondary_ammo 0
+set g_balance_oknex_secondary_animtime 0.2
+set g_balance_oknex_secondary_chargepool 0
+set g_balance_oknex_secondary_chargepool_pause_regen 1
+set g_balance_oknex_secondary_chargepool_regen 0.15
+set g_balance_oknex_secondary_damage 25
+set g_balance_oknex_secondary_damagefalloff_forcehalflife 0
+set g_balance_oknex_secondary_damagefalloff_halflife 0
+set g_balance_oknex_secondary_damagefalloff_maxdist 0
+set g_balance_oknex_secondary_damagefalloff_mindist 0
+set g_balance_oknex_secondary_force 300
+set g_balance_oknex_secondary_refire 0.7
+set g_balance_oknex_secondary_refire_type 1
+set g_balance_oknex_secondary_delay 0
+set g_balance_oknex_secondary_edgedamage 12.5
+set g_balance_oknex_secondary_lifetime 5
+set g_balance_oknex_secondary_radius 70
+set g_balance_oknex_secondary_shotangle 0
+set g_balance_oknex_secondary_speed 6000
+set g_balance_oknex_secondary_spread 0
+set g_balance_oknex_switchdelay_drop 0.2
+set g_balance_oknex_switchdelay_raise 0.2
+set g_balance_oknex_weaponreplace ""
+set g_balance_oknex_weaponstart 0
+set g_balance_oknex_weaponstartoverride -1
+set g_balance_oknex_weaponthrowable 1
 // }}}