X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=bal-wep-xonotic.cfg;h=aea4a1a5f87b7fb81b4761e251deb8759643de1d;hp=b204dffe1945d4f6537e616198499717754a22d0;hb=2e96bd3f374953fcb40468bf47bcb55785e1f8db;hpb=70fd2f493601e6a143e67cf9bb941861c6955456

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index b204dffe1..aea4a1a5f 100644
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -778,16 +778,29 @@ set g_balance_arc_weaponstartoverride -1
 set g_balance_arc_weaponthrowable 1
 // }}}
 // {{{ #21: Heavy Machine Gun
-set g_balance_hmg_ammo 1
-set g_balance_hmg_damage 10
-set g_balance_hmg_force 5
-set g_balance_hmg_refire 0.05
+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_solidpenetration 32
-set g_balance_hmg_spread_add 0.01
-set g_balance_hmg_spread_max 0.05
-set g_balance_hmg_spread_min 0.02
+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 ""
@@ -796,21 +809,34 @@ set g_balance_hmg_weaponstartoverride 0
 set g_balance_hmg_weaponthrowable 0
 // }}}
 // {{{ #22: Rocket Propelled Chainsaw
-set g_balance_rpc_ammo 10
-set g_balance_rpc_animtime 1
-set g_balance_rpc_damage 150
-set g_balance_rpc_damage2 500
-set g_balance_rpc_damageforcescale 2
-set g_balance_rpc_edgedamage 50
-set g_balance_rpc_force 400
-set g_balance_rpc_health 25
-set g_balance_rpc_lifetime 30
-set g_balance_rpc_radius 300
-set g_balance_rpc_refire 1
+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_speed 1250
-set g_balance_rpc_speedaccel 5000
+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 ""
@@ -819,26 +845,27 @@ set g_balance_rpc_weaponstartoverride 0
 set g_balance_rpc_weaponthrowable 0
 // }}}
 // {{{ Overkill Shotgun
-set g_balance_okshotgun_primary_ammo 1
-set g_balance_okshotgun_primary_animtime 0.2
+set g_balance_okshotgun_primary_ammo 3
+set g_balance_okshotgun_primary_animtime 0.65
 set g_balance_okshotgun_primary_bot_range 512
-set g_balance_okshotgun_primary_bullets 12
-set g_balance_okshotgun_primary_damage 4
-set g_balance_okshotgun_primary_force 15
+set g_balance_okshotgun_primary_bullets 10
+set g_balance_okshotgun_primary_damage 17
+set g_balance_okshotgun_primary_force 80
 set g_balance_okshotgun_primary_refire 0.75
 set g_balance_okshotgun_primary_solidpenetration 3.8
-set g_balance_okshotgun_primary_spread 0.12
-set g_balance_okshotgun_reload_ammo 0
+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 20
+set g_balance_okshotgun_secondary_damage 25
 set g_balance_okshotgun_secondary_delay 0
-set g_balance_okshotgun_secondary_edgedamage 10
+set g_balance_okshotgun_secondary_edgedamage 12.5
 set g_balance_okshotgun_secondary_force 300
 set g_balance_okshotgun_secondary_lifetime 5
-set g_balance_okshotgun_secondary_radius 60
+set g_balance_okshotgun_secondary_radius 70
 set g_balance_okshotgun_secondary_refire 0.7
+set g_balance_okshotgun_secondary_refire_type 1
 set g_balance_okshotgun_secondary_shotangle 0
 set g_balance_okshotgun_secondary_speed 6000
 set g_balance_okshotgun_secondary_spread 0
@@ -859,34 +886,34 @@ 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 3
+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_reload_ammo 60
-set g_balance_okmachinegun_reload_time 2
+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 20
+set g_balance_okmachinegun_secondary_damage 25
 set g_balance_okmachinegun_secondary_delay 0
-set g_balance_okmachinegun_secondary_edgedamage 10
+set g_balance_okmachinegun_secondary_edgedamage 12.5
 set g_balance_okmachinegun_secondary_force 300
 set g_balance_okmachinegun_secondary_lifetime 5
-set g_balance_okmachinegun_secondary_radius 60
+set g_balance_okmachinegun_secondary_radius 70
 set g_balance_okmachinegun_secondary_refire 0.7
+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_secondary_type 1
 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.02
+set g_balance_okmachinegun_spread_min 0
 set g_balance_okmachinegun_sustained_ammo 1
-set g_balance_okmachinegun_sustained_damage 10
-set g_balance_okmachinegun_sustained_force 3
+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.03
+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 ""
@@ -895,7 +922,7 @@ set g_balance_okmachinegun_weaponstartoverride -1
 set g_balance_okmachinegun_weaponthrowable 1
 // }}}
 // {{{ Overkill Vortex
-set g_balance_okvortex_charge 1
+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
@@ -907,34 +934,35 @@ 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 6
-set g_balance_okvortex_primary_animtime 0.4
-set g_balance_okvortex_primary_damage 80
+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 400
-set g_balance_okvortex_primary_refire 1.5
-set g_balance_okvortex_reload_ammo 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 0
-set g_balance_okvortex_secondary_ammo 2
-set g_balance_okvortex_secondary_animtime 0
+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 0
+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 0
-set g_balance_okvortex_secondary_refire 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 10
+set g_balance_okvortex_secondary_edgedamage 12.5
 set g_balance_okvortex_secondary_lifetime 5
-set g_balance_okvortex_secondary_radius 60
+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