From e3449b33968c2562dcb06287b4a06562de8dcb67 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 11 Nov 2010 01:09:03 +0100 Subject: [PATCH] Fix conflict --- balancetZork.cfg | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/balancetZork.cfg b/balancetZork.cfg index 22371f25e6..0386e1dd5b 100644 --- a/balancetZork.cfg +++ b/balancetZork.cfg @@ -433,15 +433,9 @@ 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 @@ -546,20 +540,9 @@ 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 -set g_balance_rocketlauncher_laserguided_turnrate 0.75 //0.5 -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 -- 2.39.2