Merge remote branch 'origin/master' into tzork/balance-tzork

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

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 11733c3fa429a2479e47140c685cef624c8497ad..22371f25e67f91e8cf5f735edd9ae6b4bf636911 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -325,8 +325,6 @@ set g_balance_grenadelauncher_primary_animtime 0.3
 set g_balance_grenadelauncher_primary_ammo 2
 set g_balance_grenadelauncher_primary_health 25
 set g_balance_grenadelauncher_primary_damageforcescale 4
-set g_balance_grenadelauncher_primary_bouncefactor 0.5
-set g_balance_grenadelauncher_primary_bouncestop 0.075
 set g_balance_grenadelauncher_primary_remote_minbouncecnt 0
 
 set g_balance_grenadelauncher_secondary_type 1
@@ -345,9 +343,10 @@ set g_balance_grenadelauncher_secondary_animtime 0.3
 set g_balance_grenadelauncher_secondary_ammo 2
 set g_balance_grenadelauncher_secondary_health 10
 set g_balance_grenadelauncher_secondary_damageforcescale 4
-set g_balance_grenadelauncher_secondary_bouncefactor 0.5
-set g_balance_grenadelauncher_secondary_bouncestop 0.075
 set g_balance_grenadelauncher_secondary_remote_detonateprimary 0
+
+set g_balance_grenadelauncher_bouncefactor 0.5
+set g_balance_grenadelauncher_bouncestop 0.075
 // }}}
 // {{{ minelayer // TODO
 set g_balance_minelayer_damage 35
@@ -434,10 +433,15 @@ set g_balance_crylink_primary_joinboost 2
 
 set g_balance_crylink_primary_middle_lifetime 5 
 set g_balance_crylink_primary_middle_fadetime 5
+<<<<<<< HEAD
 set g_balance_crylink_primary_star_lifetime   5 
 set g_balance_crylink_primary_star_fadetime   5
 set g_balance_crylink_primary_other_lifetime  5 
 set g_balance_crylink_primary_other_fadetime  5
+=======
+set g_balance_crylink_primary_other_lifetime 2 // range: 800 full, fades to 1300
+set g_balance_crylink_primary_other_fadetime 0.25
+>>>>>>> origin/master
 
 set g_balance_crylink_secondary 1
 set g_balance_crylink_secondary_damage 2
@@ -542,6 +546,7 @@ set g_balance_rocketlauncher_guideratedelay 0.01 // immediate
 set g_balance_rocketlauncher_guidegoal 512 // goal distance for (non-laser) guiding (higher = less control, lower = erratic)
 set g_balance_rocketlauncher_guidedelay 0.15 // delay before guiding kicks in
 set g_balance_rocketlauncher_guidestop 0 // stop guiding when firing again
+<<<<<<< HEAD
 set g_balance_rocketlauncher_laserguided_speed 1000 //650
 set g_balance_rocketlauncher_laserguided_speedaccel 0
 set g_balance_rocketlauncher_laserguided_speedstart 1000
@@ -550,6 +555,11 @@ set g_balance_rocketlauncher_laserguided_allow_steal 1
 set g_balance_rocketlauncher_remote_damage 120
 set g_balance_rocketlauncher_remote_edgedamage 25
 set g_balance_rocketlauncher_remote_radius 130
+=======
+set g_balance_rocketlauncher_remote_damage 90
+set g_balance_rocketlauncher_remote_edgedamage 20
+set g_balance_rocketlauncher_remote_radius 125
+>>>>>>> origin/master
 set g_balance_rocketlauncher_remote_force 350
 // }}}
 // {{{ porto