Merge branch 'master' into mirceakitsune/universal_reload_system

[xonotic/xonotic-data.pk3dir.git] / balanceXonotic.cfg

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 7e5327c335d490d03050d7c0f442a2b56892f419..03712f87075052f4904d9d474fcbc5e07069b67d 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -243,7 +243,7 @@ set g_balance_laser_secondary_gauntlet 1
 set g_balance_laser_secondary_force_zscale 1.25
 set g_balance_laser_secondary_force_velocitybias 0
 set g_balance_laser_secondary_force_other_scale 0
-set g_balance_laser_reload_count 5
+set g_balance_laser_reload_ammo 6
 set g_balance_laser_reload_time 2
 // }}}
 // {{{ shotgun
@@ -265,7 +265,7 @@ set g_balance_shotgun_secondary_damage 110
 set g_balance_shotgun_secondary_force 150
 set g_balance_shotgun_secondary_refire 1.1
 set g_balance_shotgun_secondary_animtime 1
-set g_balance_shotgun_reload_ammo 4
+set g_balance_shotgun_reload_ammo 5
 set g_balance_shotgun_reload_time 2
 // }}}
 // {{{ uzi
@@ -342,7 +342,7 @@ set g_balance_grenadelauncher_secondary_remote_detonateprimary 0
 set g_balance_grenadelauncher_bouncefactor 0.5
 set g_balance_grenadelauncher_bouncestop 0.12
 
-set g_balance_grenadelauncher_reload_ammo 15
+set g_balance_grenadelauncher_reload_ammo 12
 set g_balance_grenadelauncher_reload_time 2
 // }}}
 // {{{ minelayer
@@ -366,7 +366,7 @@ set g_balance_minelayer_remote_damage 45
 set g_balance_minelayer_remote_edgedamage 40
 set g_balance_minelayer_remote_radius 200
 set g_balance_minelayer_remote_force 300
-set g_balance_minelayer_reload_ammo 10
+set g_balance_minelayer_reload_ammo 15
 set g_balance_minelayer_reload_time 2
 // }}}
 // {{{ electro
@@ -411,7 +411,7 @@ set g_balance_electro_combo_force 80
 set g_balance_electro_combo_radius 250
 set g_balance_electro_combo_comboradius 0
 set g_balance_electro_combo_speed 400
-set g_balance_electro_reload_ammo 15
+set g_balance_electro_reload_ammo 20
 set g_balance_electro_reload_time 2
 // }}}
 // {{{ crylink
@@ -470,7 +470,7 @@ set g_balance_crylink_secondary_middle_fadetime 5
 set g_balance_crylink_secondary_line_lifetime 2 // range: 4000 full, fades to 8000
 set g_balance_crylink_secondary_line_fadetime 0.25
 
-set g_balance_crylink_reload_ammo 15
+set g_balance_crylink_reload_ammo 10
 set g_balance_crylink_reload_time 2
 // }}}
 // {{{ nex
@@ -521,7 +521,7 @@ set g_balance_minstanex_refire 1
 set g_balance_minstanex_animtime 0.50
 set g_balance_minstanex_ammo 10
 set g_balance_minstanex_laser_ammo 5
-set g_balance_minstanex_reload_ammo 40
+set g_balance_minstanex_reload_ammo 50
 set g_balance_minstanex_reload_time 2
 // }}}
 // {{{ hagar
@@ -640,7 +640,6 @@ set g_balance_hlac_reload_ammo 20
 set g_balance_hlac_reload_time 2
 // }}}
 // {{{ sniperrifle
-set g_balance_sniperrifle_auto_reload_on_switch 0
 set g_balance_sniperrifle_bursttime 0
 set g_balance_sniperrifle_primary_tracer 1
 set g_balance_sniperrifle_primary_damage 60
@@ -773,6 +772,6 @@ set g_balance_seeker_tag_lifetime 15
 set g_balance_seeker_tag_refire 0.7
 set g_balance_seeker_tag_speed 5000
 set g_balance_seeker_tag_spread 0
-set g_balance_seeker_reload_ammo 20
+set g_balance_seeker_reload_ammo 15
 set g_balance_seeker_reload_time 2
 // End new seeker