X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=balanceXonotic.cfg;h=3b8724ca443af8bbc51d038b3a757b4bc84d0545;hb=51fff55128c41cbbf1d30d019f689cb345fc8490;hp=eadad632bc202c1d7f511013ed85341fd01506bc;hpb=7d2c9e783ab5cb42f61bb1ab5f0211ca83034e48;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index eadad632b..3b8724ca4 100644
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -158,7 +158,7 @@ set g_projectiles_damage 2
 // possible values:
 // -2: absolutely no damage to projectiles (no exceptions)
 // -1: no damage other than the exceptions (electro combo, hagar join explode, ML mines)
-// 0: only damage from contents (lava/slime) or exceptions 
+// 0: only damage from contents (lava/slime) or exceptions
 // 1: only self damage or damage from contents or exceptions
 // 2: allow all damage to projectiles normally
 set g_projectiles_keep_owner 0
@@ -229,7 +229,7 @@ set g_balance_grapplehook_damagedbycontents 1
 // {{{ laser
 set g_balance_laser_primary_damage 25
 set g_balance_laser_primary_edgedamage 12.5
-set g_balance_laser_primary_force 350
+set g_balance_laser_primary_force 300
 set g_balance_laser_primary_radius 70
 set g_balance_laser_primary_speed 6000
 set g_balance_laser_primary_spread 0
@@ -303,7 +303,7 @@ set g_balance_uzi_burst_animtime 0.3
 set g_balance_uzi_burst_refire 0.06		// refire between burst bullets
 set g_balance_uzi_burst_refire2 0.45	// refire after burst
 set g_balance_uzi_burst_spread 0.02
-set g_balance_uzi_burst_damage 25		
+set g_balance_uzi_burst_damage 25
 set g_balance_uzi_burst_force 20
 set g_balance_uzi_burst_ammo 3
 
@@ -425,7 +425,7 @@ set g_balance_electro_switchdelay_raise 0.2
 set g_balance_electro_reload_ammo 0 //default: 20
 set g_balance_electro_reload_time 2
 // }}}
-// {{{ crylink 
+// {{{ crylink
 set g_balance_crylink_primary_damage 12
 set g_balance_crylink_primary_edgedamage 6
 set g_balance_crylink_primary_force -50
@@ -440,7 +440,6 @@ set g_balance_crylink_primary_ammo 3
 set g_balance_crylink_primary_bouncedamagefactor 0.5
 set g_balance_crylink_primary_joindelay 0.1
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_jointime 0
 set g_balance_crylink_primary_joinexplode 1
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -450,13 +449,13 @@ set g_balance_crylink_primary_linkexplode 1
 
 set g_balance_crylink_primary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_primary_middle_fadetime 5
-set g_balance_crylink_primary_other_lifetime 5 
+set g_balance_crylink_primary_other_lifetime 5
 set g_balance_crylink_primary_other_fadetime 5
 
 set g_balance_crylink_secondary 1
 set g_balance_crylink_secondary_damage 10
 set g_balance_crylink_secondary_edgedamage 5
-set g_balance_crylink_secondary_force -300
+set g_balance_crylink_secondary_force -250
 set g_balance_crylink_secondary_radius 100
 set g_balance_crylink_secondary_speed 3000
 set g_balance_crylink_secondary_spread 0.01
@@ -469,9 +468,8 @@ set g_balance_crylink_secondary_ammo 2
 set g_balance_crylink_secondary_bouncedamagefactor 0.5
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0
-set g_balance_crylink_secondary_jointime 0
-set g_balance_crylink_secondary_joinexplode 0			
-set g_balance_crylink_secondary_joinexplode_damage 0	
+set g_balance_crylink_secondary_joinexplode 0
+set g_balance_crylink_secondary_joinexplode_damage 0
 set g_balance_crylink_secondary_joinexplode_edgedamage 0
 set g_balance_crylink_secondary_joinexplode_radius 0
 set g_balance_crylink_secondary_joinexplode_force 0
@@ -479,7 +477,7 @@ set g_balance_crylink_secondary_linkexplode 1
 
 set g_balance_crylink_secondary_middle_lifetime 5 // range: 35000 full, fades to 70000
 set g_balance_crylink_secondary_middle_fadetime 5
-set g_balance_crylink_secondary_line_lifetime 5 
+set g_balance_crylink_secondary_line_lifetime 5
 set g_balance_crylink_secondary_line_fadetime 5
 
 set g_balance_crylink_switchdelay_drop 0.2
@@ -530,7 +528,7 @@ set g_balance_nex_charge_minspeed 400
 set g_balance_nex_charge_maxspeed 800
 
 set g_balance_nex_switchdelay_drop 0.3
-set g_balance_nex_switchdelay_raise 0.3
+set g_balance_nex_switchdelay_raise 0.25
 
 set g_balance_nex_reload_ammo 0 //default: 25
 set g_balance_nex_reload_time 2
@@ -590,7 +588,7 @@ set g_balance_hagar_reload_time 2
 // {{{ rocketlauncher
 set g_balance_rocketlauncher_damage 80
 set g_balance_rocketlauncher_edgedamage 40
-set g_balance_rocketlauncher_force 400
+set g_balance_rocketlauncher_force 450
 set g_balance_rocketlauncher_radius 110
 set g_balance_rocketlauncher_speed 1300
 set g_balance_rocketlauncher_speedaccel 1300
@@ -669,7 +667,7 @@ set g_balance_tuba_pitchstep 6
 set g_balance_tuba_switchdelay_drop 0.2
 set g_balance_tuba_switchdelay_raise 0.2
 // }}}
-// {{{ fireball // this is a superweapon -- lets make it behave as one. 
+// {{{ fireball // this is a superweapon -- lets make it behave as one.
 set g_balance_fireball_primary_animtime 0.2
 set g_balance_fireball_primary_bfgdamage 100
 set g_balance_fireball_primary_bfgforce 0