X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=balanceXPM.cfg;h=b60d779a51f3a6b966dc94076f65529a5fdca6b4;hb=ed00b093ac5b81fe120a286de0756b1b2549dc39;hp=f8ffd03381281b57c46ffa236eb0a174956b6da0;hpb=b0c28b8ffa783fef2f935f4d1fef38b27b55581b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index f8ffd0338..b60d779a5 100644
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -158,7 +158,7 @@ set g_projectiles_damage 1
 // 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
@@ -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,7 +449,7 @@ 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
@@ -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
@@ -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