took over all tZork's changes from balancetZork to balanceTest other than the whitesp...

diff --git a/balanceTest.cfg b/balanceTest.cfg
index 66b3833979cb78b4f3cf119feb01fb9f9715a3f8..897b5698d8aec84b9ffb705b5b688a494c1671ed 100644 (file)
--- a/balanceTest.cfg
+++ b/balanceTest.cfg
@@ -214,7 +214,7 @@ set g_balance_grapplehook_health 130
 // {{{ laser
 set g_balance_laser_primary_damage 20 // dps 33, hope that's not too high
 set g_balance_laser_primary_edgedamage 20
-set g_balance_laser_primary_force 235
+set g_balance_laser_primary_force 270
 set g_balance_laser_primary_radius 60
 set g_balance_laser_primary_speed 4000
 set g_balance_laser_primary_spread 0
@@ -239,11 +239,11 @@ set g_balance_laser_secondary_delay 0
 set g_balance_laser_secondary_gauntlet 0
 // }}}
 // {{{ shotgun
-set g_balance_shotgun_primary_bullets 6
-set g_balance_shotgun_primary_damage 9
+set g_balance_shotgun_primary_bullets 10
+set g_balance_shotgun_primary_damage 5
 set g_balance_shotgun_primary_force 60
 set g_balance_shotgun_primary_spread 0.07
-set g_balance_shotgun_primary_refire 0.5
+set g_balance_shotgun_primary_refire 0.8
 set g_balance_shotgun_primary_animtime 0.2
 set g_balance_shotgun_primary_ammo 1
 set g_balance_shotgun_primary_speed 12000
@@ -263,11 +263,11 @@ set g_balance_uzi_first 1
 set g_balance_uzi_first_damage 30
 set g_balance_uzi_first_force 50
 set g_balance_uzi_first_spread 0.015
-set g_balance_uzi_first_refire 0.2
+set g_balance_uzi_first_refire 0.3
 set g_balance_uzi_first_ammo 1
 set g_balance_uzi_sustained_damage 15
-set g_balance_uzi_sustained_force 27
-set g_balance_uzi_sustained_spread 0.05
+set g_balance_uzi_sustained_force 10
+set g_balance_uzi_sustained_spread 0.08
 set g_balance_uzi_sustained_refire 0.1
 set g_balance_uzi_sustained_ammo 1
 set g_balance_uzi_speed 18000
@@ -275,7 +275,7 @@ set g_balance_uzi_bulletconstant 115 // 13.1qu
 // }}}
 // {{{ mortar
 set g_balance_grenadelauncher_primary_type 0
-set g_balance_grenadelauncher_primary_damage 70
+set g_balance_grenadelauncher_primary_damage 60
 set g_balance_grenadelauncher_primary_edgedamage 38
 set g_balance_grenadelauncher_primary_force 400
 set g_balance_grenadelauncher_primary_radius 140
@@ -338,12 +338,12 @@ set g_balance_minelayer_remote_force 300
 // }}}
 // {{{ electro
 set g_balance_electro_lightning 1
-set g_balance_electro_primary_damage 85
+set g_balance_electro_primary_damage 110
 set g_balance_electro_primary_edgedamage 0
 set g_balance_electro_primary_force 425
 set g_balance_electro_primary_force_up 125
 set g_balance_electro_primary_radius 850
-set g_balance_electro_primary_comboradius 75
+set g_balance_electro_primary_comboradius 150
 set g_balance_electro_primary_speed 0
 set g_balance_electro_primary_spread 0
 set g_balance_electro_primary_lifetime 0
@@ -358,19 +358,19 @@ set g_balance_electro_secondary_damage 25
 set g_balance_electro_secondary_edgedamage 0
 set g_balance_electro_secondary_force 100
 set g_balance_electro_secondary_radius 100
-set g_balance_electro_secondary_speed 700
-set g_balance_electro_secondary_speed_up 200
+set g_balance_electro_secondary_speed 500
+set g_balance_electro_secondary_speed_up 150
 set g_balance_electro_secondary_speed_z 0
 set g_balance_electro_secondary_spread 0.08
 set g_balance_electro_secondary_lifetime 3.5
-set g_balance_electro_secondary_refire 0.2
+set g_balance_electro_secondary_refire 0.1
 set g_balance_electro_secondary_refire2 2
 set g_balance_electro_secondary_animtime 0.2
 set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 10
 set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_count 3
-set g_balance_electro_combo_damage 40
+set g_balance_electro_combo_damage 60
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 80
 set g_balance_electro_combo_radius 250
@@ -378,15 +378,15 @@ set g_balance_electro_combo_comboradius 0
 set g_balance_electro_combo_speed 400
 // }}}
 // {{{ crylink
-set g_balance_crylink_primary_damage 8
-set g_balance_crylink_primary_edgedamage 6
-set g_balance_crylink_primary_force 40
-set g_balance_crylink_primary_radius 80
-set g_balance_crylink_primary_speed 1100
-set g_balance_crylink_primary_spread 0.05
-set g_balance_crylink_primary_shots 7
-set g_balance_crylink_primary_bounces 2
-set g_balance_crylink_primary_refire 0.8
+set g_balance_crylink_primary_damage 5
+set g_balance_crylink_primary_edgedamage 2.5
+set g_balance_crylink_primary_force 25
+set g_balance_crylink_primary_radius 50
+set g_balance_crylink_primary_speed 2500
+set g_balance_crylink_primary_spread 0.04
+set g_balance_crylink_primary_shots 12
+set g_balance_crylink_primary_bounces 1
+set g_balance_crylink_primary_refire 1
 set g_balance_crylink_primary_animtime 0.4
 set g_balance_crylink_primary_ammo 2
 set g_balance_crylink_primary_bouncedamagefactor 0.2
@@ -418,9 +418,9 @@ set g_balance_crylink_secondary_line_lifetime 2 // range: 4000 full, fades to 80
 set g_balance_crylink_secondary_line_fadetime 2
 // }}}
 // {{{ nex
-set g_balance_nex_primary_damage 120
+set g_balance_nex_primary_damage 100
 set g_balance_nex_primary_force 600
-set g_balance_nex_primary_refire 1.5
+set g_balance_nex_primary_refire 0.75
 set g_balance_nex_primary_animtime 0.3
 set g_balance_nex_primary_ammo 5
 set g_balance_nex_primary_damagefalloff_mindist 0
@@ -428,9 +428,9 @@ set g_balance_nex_primary_damagefalloff_maxdist 0
 set g_balance_nex_primary_damagefalloff_halflife 0
 set g_balance_nex_primary_damagefalloff_forcehalflife 0
 
-set g_balance_nex_secondary 0
+set g_balance_nex_secondary 1
 set g_balance_nex_secondary_charge 1
-set g_balance_nex_secondary_charge_rate 0.25
+set g_balance_nex_secondary_charge_rate 0.7
 set g_balance_nex_secondary_damage 100
 set g_balance_nex_secondary_force 600
 set g_balance_nex_secondary_refire 1.5
@@ -442,11 +442,11 @@ set g_balance_nex_secondary_damagefalloff_halflife 0
 set g_balance_nex_secondary_damagefalloff_forcehalflife 0
 
 set g_balance_nex_charge 1
-set g_balance_nex_charge_mindmg 40
+set g_balance_nex_charge_mindmg 10
 set g_balance_nex_charge_start 0
-set g_balance_nex_charge_rate 0.1
+set g_balance_nex_charge_rate 0.35
 set g_balance_nex_charge_limit 0.5
-set g_balance_nex_charge_shot_multiplier 0.5
+set g_balance_nex_charge_shot_multiplier 0
 set g_balance_nex_charge_velocity_rate 0
 set g_balance_nex_charge_minspeed 400
 set g_balance_nex_charge_maxspeed 1000
@@ -457,9 +457,9 @@ set g_balance_minstanex_animtime 0.3
 set g_balance_minstanex_ammo 10
 // }}}
 // {{{ hagar
-set g_balance_hagar_primary_damage 37
+set g_balance_hagar_primary_damage 30
 set g_balance_hagar_primary_edgedamage 15
-set g_balance_hagar_primary_force 100
+set g_balance_hagar_primary_force 50
 set g_balance_hagar_primary_radius 65
 set g_balance_hagar_primary_spread 0.010
 set g_balance_hagar_primary_speed 3000
@@ -467,9 +467,9 @@ set g_balance_hagar_primary_lifetime 30
 set g_balance_hagar_primary_refire 0.15
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
-set g_balance_hagar_secondary_damage 37
+set g_balance_hagar_secondary_damage 30
 set g_balance_hagar_secondary_edgedamage 15
-set g_balance_hagar_secondary_force 100
+set g_balance_hagar_secondary_force 50
 set g_balance_hagar_secondary_radius 65
 set g_balance_hagar_secondary_spread 0.015
 set g_balance_hagar_secondary_speed 1400
@@ -479,8 +479,8 @@ set g_balance_hagar_secondary_refire 0.15
 set g_balance_hagar_secondary_ammo 1
 // }}}
 // {{{ rocketlauncher // TODO
-set g_balance_rocketlauncher_damage 100
-set g_balance_rocketlauncher_edgedamage 33
+set g_balance_rocketlauncher_damage 110
+set g_balance_rocketlauncher_edgedamage 25
 set g_balance_rocketlauncher_force 350
 set g_balance_rocketlauncher_radius 125
 set g_balance_rocketlauncher_speed 1000
@@ -490,7 +490,7 @@ set g_balance_rocketlauncher_lifetime 5
 set g_balance_rocketlauncher_refire 1
 set g_balance_rocketlauncher_animtime 0.4
 set g_balance_rocketlauncher_ammo 3
-set g_balance_rocketlauncher_health 0
+set g_balance_rocketlauncher_health 10
 set g_balance_rocketlauncher_damageforcescale 0
 set g_balance_rocketlauncher_detonatedelay -1 // positive: timer till detonation is allowed, negative: "security device" that prevents ANY remote detonation if it could hurt its owner, zero: detonatable at any time
 set g_balance_rocketlauncher_guiderate 45 // max degrees per second
@@ -503,9 +503,9 @@ set g_balance_rocketlauncher_laserguided_speedaccel 0
 set g_balance_rocketlauncher_laserguided_speedstart 1000
 set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5
 set g_balance_rocketlauncher_laserguided_allow_steal 1
-set g_balance_rocketlauncher_remote_damage 100
-set g_balance_rocketlauncher_remote_edgedamage 33
-set g_balance_rocketlauncher_remote_radius 75
+set g_balance_rocketlauncher_remote_damage 90
+set g_balance_rocketlauncher_remote_edgedamage 20
+set g_balance_rocketlauncher_remote_radius 125
 set g_balance_rocketlauncher_remote_force 350
 // }}}
 // {{{ porto
@@ -537,32 +537,32 @@ set g_balance_hook_secondary_power 3 // effect behaves like a square function
 set g_balance_hook_secondary_duration 1.5 // effect runs for three seconds
 // }}}
 // {{{ hlac
-set g_balance_hlac_primary_spread_min 0
-set g_balance_hlac_primary_spread_max 0
-set g_balance_hlac_primary_spread_add 0
-set g_balance_hlac_primary_spread_crouchmod 0
+set g_balance_hlac_primary_spread_min 0.01
+set g_balance_hlac_primary_spread_max 0.6
+set g_balance_hlac_primary_spread_add 0.01
+set g_balance_hlac_primary_spread_crouchmod 0.5
 
-set g_balance_hlac_primary_damage 15
-set g_balance_hlac_primary_edgedamage 0
-set g_balance_hlac_primary_force 70
-set g_balance_hlac_primary_radius 30
-set g_balance_hlac_primary_speed 2500
-set g_balance_hlac_primary_lifetime 5
+set g_balance_hlac_primary_damage 22
+set g_balance_hlac_primary_edgedamage 2
+set g_balance_hlac_primary_force -100
+set g_balance_hlac_primary_radius 100
+set g_balance_hlac_primary_speed 5000
+set g_balance_hlac_primary_lifetime 3
 
 set g_balance_hlac_primary_refire 0.1
 set g_balance_hlac_primary_animtime 0.4
 set g_balance_hlac_primary_ammo 1
 
 set g_balance_hlac_secondary 1
-set g_balance_hlac_secondary_spread 0.15
+set g_balance_hlac_secondary_spread 0.2
 set g_balance_hlac_secondary_spread_crouchmod 0.5
 
 set g_balance_hlac_secondary_damage 20
-set g_balance_hlac_secondary_edgedamage 0
-set g_balance_hlac_secondary_force 40
-set g_balance_hlac_secondary_radius 35
-set g_balance_hlac_secondary_speed 2500
-set g_balance_hlac_secondary_lifetime 5
+set g_balance_hlac_secondary_edgedamage 3
+set g_balance_hlac_secondary_force 100
+set g_balance_hlac_secondary_radius 50
+set g_balance_hlac_secondary_speed 9000
+set g_balance_hlac_secondary_lifetime 3
 
 set g_balance_hlac_secondary_refire 1
 set g_balance_hlac_secondary_animtime 0.7
@@ -657,14 +657,14 @@ set g_balance_seeker_flac_animtime 0.1
 set g_balance_seeker_flac_damage 15
 set g_balance_seeker_flac_edgedamage 10
 set g_balance_seeker_flac_force 50
-set g_balance_seeker_flac_lifetime 0.1
-set g_balance_seeker_flac_lifetime_rand 0.05
+set g_balance_seeker_flac_lifetime 0.05
+set g_balance_seeker_flac_lifetime_rand 0.02
 set g_balance_seeker_flac_radius 100
 set g_balance_seeker_flac_refire 0.1
-set g_balance_seeker_flac_speed 3000
-set g_balance_seeker_flac_speed_up 1000
+set g_balance_seeker_flac_speed 5000
+set g_balance_seeker_flac_speed_up 500
 set g_balance_seeker_flac_speed_z 0
-set g_balance_seeker_flac_spread 0.4
+set g_balance_seeker_flac_spread 0.25
 set g_balance_seeker_missile_accel 1.05
 set g_balance_seeker_missile_ammo 2
 set g_balance_seeker_missile_animtime 0.3

diff --git a/balancetZork.cfg b/balancetZork.cfg
index d1383b4f34e4c432acb6bb58586aac4061ea60be..7ab11edf78a184a3eb860e52ddea580a174842bd 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -371,7 +371,6 @@ set g_balance_electro_secondary_ammo 2
 set g_balance_electro_secondary_health 10
 set g_balance_electro_secondary_damageforcescale 4
 set g_balance_electro_secondary_count 3
-
 set g_balance_electro_combo_damage 60
 set g_balance_electro_combo_edgedamage 0
 set g_balance_electro_combo_force 80