Merge branch 'master' into drjaska/spread-pattern

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

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index a1fea0c38726e2dd3042ecabcdeca6ad491b4b73..c5c8ca4741bc7592e0312dc536b2a25293c607f6 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -36,10 +36,16 @@ set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_animtime 0.2
 set g_balance_shotgun_primary_bullets 12
 set g_balance_shotgun_primary_damage 4
+set g_balance_shotgun_primary_damagefalloff_forcehalflife 0
+set g_balance_shotgun_primary_damagefalloff_halflife 0
+set g_balance_shotgun_primary_damagefalloff_maxdist 0
+set g_balance_shotgun_primary_damagefalloff_mindist 0
 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_primary_spread_pattern 0
+set g_balance_shotgun_primary_spread_pattern_scale 0
 set g_balance_shotgun_reload_ammo 0
 set g_balance_shotgun_reload_time 2
 set g_balance_shotgun_secondary 1
@@ -72,6 +78,10 @@ set g_balance_machinegun_burst_animtime 0.3
 set g_balance_machinegun_burst_refire 0.06
 set g_balance_machinegun_burst_refire2 0.45
 set g_balance_machinegun_burst_spread 0.03
+set g_balance_machinegun_damagefalloff_forcehalflife 0
+set g_balance_machinegun_damagefalloff_halflife 0
+set g_balance_machinegun_damagefalloff_maxdist 0
+set g_balance_machinegun_damagefalloff_mindist 0
 set g_balance_machinegun_first 1
 set g_balance_machinegun_first_ammo 1
 set g_balance_machinegun_first_damage 14
@@ -216,14 +226,16 @@ set g_balance_electro_secondary_edgedamage 15
 set g_balance_electro_secondary_force 200
 set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_lifetime 3
+set g_balance_electro_secondary_limit 0
 set g_balance_electro_secondary_radius 150
-set g_balance_electro_secondary_refire 0.2
-set g_balance_electro_secondary_refire2 1.5
+set g_balance_electro_secondary_refire 1.1
+set g_balance_electro_secondary_refire2 0.2
 set g_balance_electro_secondary_speed 900
 set g_balance_electro_secondary_speed_up 200
 set g_balance_electro_secondary_speed_z 0
 set g_balance_electro_secondary_spread 0
 set g_balance_electro_secondary_stick 0
+set g_balance_electro_secondary_stick_lifetime -1
 set g_balance_electro_secondary_touchexplode 0
 set g_balance_electro_switchdelay_drop 0
 set g_balance_electro_switchdelay_raise 0
@@ -235,10 +247,10 @@ set g_balance_electro_weaponthrowable 1
 // {{{ #7: Crylink
 set g_balance_crylink_primary_ammo 3
 set g_balance_crylink_primary_animtime 0.3
-set g_balance_crylink_primary_bouncedamagefactor 0.5
+set g_balance_crylink_primary_bouncedamagefactor 1
 set g_balance_crylink_primary_bounces 1
 set g_balance_crylink_primary_damage 10
-set g_balance_crylink_primary_edgedamage 5
+set g_balance_crylink_primary_edgedamage 10
 set g_balance_crylink_primary_force -50
 set g_balance_crylink_primary_joindelay 0.1
 set g_balance_crylink_primary_joinexplode 1
@@ -253,7 +265,7 @@ set g_balance_crylink_primary_middle_lifetime 5
 set g_balance_crylink_primary_other_fadetime 5
 set g_balance_crylink_primary_other_lifetime 5
 set g_balance_crylink_primary_radius 80
-set g_balance_crylink_primary_refire 0.7
+set g_balance_crylink_primary_refire 0.8
 set g_balance_crylink_primary_shots 6
 set g_balance_crylink_primary_speed 2000
 set g_balance_crylink_primary_spread 0.08
@@ -444,6 +456,10 @@ 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_damagefalloff_forcehalflife 0
+set g_balance_vaporizer_primary_damagefalloff_halflife 0
+set g_balance_vaporizer_primary_damagefalloff_maxdist 0
+set g_balance_vaporizer_primary_damagefalloff_mindist 0
 set g_balance_vaporizer_primary_force 800
 set g_balance_vaporizer_primary_refire 1
 set g_balance_vaporizer_reload_ammo 0
@@ -556,6 +572,10 @@ set g_balance_rifle_primary_animtime 0.4
 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_damagefalloff_forcehalflife 0
+set g_balance_rifle_primary_damagefalloff_halflife 0
+set g_balance_rifle_primary_damagefalloff_maxdist 0
+set g_balance_rifle_primary_damagefalloff_mindist 0
 set g_balance_rifle_primary_force 100
 set g_balance_rifle_primary_headshot_multiplier 0
 set g_balance_rifle_primary_refire 1.2
@@ -571,6 +591,10 @@ set g_balance_rifle_secondary_animtime 0.3
 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_damagefalloff_forcehalflife 0
+set g_balance_rifle_secondary_damagefalloff_halflife 0
+set g_balance_rifle_secondary_damagefalloff_maxdist 0
+set g_balance_rifle_secondary_damagefalloff_mindist 0
 set g_balance_rifle_secondary_force 50
 set g_balance_rifle_secondary_headshot_multiplier 0
 set g_balance_rifle_secondary_refire 0.9
@@ -827,6 +851,10 @@ set g_balance_okhmg_weaponstartoverride 0
 set g_balance_okhmg_weaponthrowable 0
 // }}}
 // {{{ #22: Overkill MachineGun (MUTATOR WEAPON)
+set g_balance_okmachinegun_damagefalloff_forcehalflife 0
+set g_balance_okmachinegun_damagefalloff_halflife 0
+set g_balance_okmachinegun_damagefalloff_maxdist 0
+set g_balance_okmachinegun_damagefalloff_mindist 0
 set g_balance_okmachinegun_primary_ammo 1
 set g_balance_okmachinegun_primary_damage 25
 set g_balance_okmachinegun_primary_force 5
@@ -953,10 +981,16 @@ set g_balance_okshotgun_primary_animtime 0.65
 set g_balance_okshotgun_primary_bot_range 512
 set g_balance_okshotgun_primary_bullets 10
 set g_balance_okshotgun_primary_damage 17
+set g_balance_okshotgun_primary_damagefalloff_forcehalflife 0
+set g_balance_okshotgun_primary_damagefalloff_halflife 0
+set g_balance_okshotgun_primary_damagefalloff_maxdist 0
+set g_balance_okshotgun_primary_damagefalloff_mindist 0
 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.07
+set g_balance_okshotgun_primary_spread_pattern 0
+set g_balance_okshotgun_primary_spread_pattern_scale 0
 set g_balance_okshotgun_reload_ammo 24
 set g_balance_okshotgun_reload_time 2
 set g_balance_okshotgun_secondary_animtime 0.2