From b0b843445eac568016d0286a1d3194f84230a1a0 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Thu, 10 Feb 2011 20:22:52 +0200 Subject: [PATCH] After intensively testing the code today, and not receiving any complaints for weeks, I'm concluding this feature is finished. Revert reload settings to default balance, and mark the code as ready to merge on my end. --- balanceXonotic.cfg | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index f594d5ef7..c2862e298 100644 --- 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_ammo 6 +set g_balance_laser_reload_ammo 0 //default: 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 5 +set g_balance_shotgun_reload_ammo 0 //default: 5 set g_balance_shotgun_reload_time 2 // }}} // {{{ uzi @@ -299,7 +299,7 @@ set g_balance_uzi_sustained_ammo 1 set g_balance_uzi_speed 18000 set g_balance_uzi_bulletconstant 115 // 13.1qu -set g_balance_uzi_reload_ammo 30 +set g_balance_uzi_reload_ammo 0 //default: 30 set g_balance_uzi_reload_time 2 // }}} // {{{ mortar @@ -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 12 +set g_balance_grenadelauncher_reload_ammo 0 //default: 12 set g_balance_grenadelauncher_reload_time 2 // }}} // {{{ minelayer @@ -367,7 +367,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 15 +set g_balance_minelayer_reload_ammo 0 //default: 15 set g_balance_minelayer_reload_time 2 // }}} // {{{ electro @@ -412,7 +412,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 20 +set g_balance_electro_reload_ammo 0 //default: 20 set g_balance_electro_reload_time 2 // }}} // {{{ crylink @@ -471,7 +471,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 10 +set g_balance_crylink_reload_ammo 0 //default: 10 set g_balance_crylink_reload_time 2 // }}} // {{{ nex @@ -515,15 +515,15 @@ set g_balance_nex_charge_velocity_rate 0 set g_balance_nex_charge_minspeed 600 set g_balance_nex_charge_maxspeed 1000 -set g_balance_nex_reload_ammo 25 +set g_balance_nex_reload_ammo 0 //default: 25 set g_balance_nex_reload_time 2 // }}} // {{{ minstanex 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 50 +set g_balance_minstanex_laser_ammo 0 +set g_balance_minstanex_reload_ammo 0 //default: 50 set g_balance_minstanex_reload_time 2 // }}} // {{{ hagar @@ -547,7 +547,7 @@ set g_balance_hagar_secondary_lifetime_min 5 set g_balance_hagar_secondary_lifetime_rand 0 set g_balance_hagar_secondary_refire 0.12 set g_balance_hagar_secondary_ammo 1 -set g_balance_hagar_reload_ammo 25 +set g_balance_hagar_reload_ammo 0 //default: 25 set g_balance_hagar_reload_time 2 // }}} // {{{ rocketlauncher @@ -574,7 +574,7 @@ set g_balance_rocketlauncher_remote_damage 60 set g_balance_rocketlauncher_remote_edgedamage 20 set g_balance_rocketlauncher_remote_radius 120 set g_balance_rocketlauncher_remote_force 350 -set g_balance_rocketlauncher_reload_ammo 25 +set g_balance_rocketlauncher_reload_ammo 0 //default: 25 set g_balance_rocketlauncher_reload_time 2 // }}} // {{{ porto @@ -638,7 +638,7 @@ set g_balance_hlac_secondary_animtime 0.4 set g_balance_hlac_secondary_ammo 4 set g_balance_hlac_secondary_shots 6 -set g_balance_hlac_reload_ammo 20 +set g_balance_hlac_reload_ammo 0 //default: 20 set g_balance_hlac_reload_time 2 // }}} // {{{ sniperrifle @@ -671,7 +671,7 @@ set g_balance_sniperrifle_secondary_ammo 10 set g_balance_sniperrifle_secondary_bulletconstant 110 // 15.5qu set g_balance_sniperrifle_secondary_burstcost 0 set g_balance_sniperrifle_secondary_bullethail 0 // empty magazine on shot -set g_balance_sniperrifle_reload_ammo 60 +set g_balance_sniperrifle_reload_ammo 60 //default: 60 set g_balance_sniperrifle_reload_time 2 // }}} // {{{ tuba @@ -722,7 +722,7 @@ set g_balance_fireball_secondary_speed 900 set g_balance_fireball_secondary_speed_up 100 set g_balance_fireball_secondary_speed_z 0 set g_balance_fireball_secondary_spread 0 -set g_balance_fireball_reload_ammo 60 +set g_balance_fireball_reload_ammo 0 //default: 60 set g_balance_fireball_reload_time 2 // }}} // {{{ seeker @@ -774,6 +774,6 @@ set g_balance_seeker_tag_lifetime 15 set g_balance_seeker_tag_refire 0.75 // LOG: 0.7 -> 0.75 set g_balance_seeker_tag_speed 5000 set g_balance_seeker_tag_spread 0 -set g_balance_seeker_reload_ammo 15 +set g_balance_seeker_reload_ammo 0 //default: 15 set g_balance_seeker_reload_time 2 // End new seeker -- 2.39.2