Merge remote-tracking branch 'origin/master' into samual/weapons

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

diff --git a/oldbalanceFruitieX.cfg b/oldbalanceFruitieX.cfg
index 52ac863829ab78d6ed47416679ef00fe0fc340e5..a10d8b58d0c5954670576391220de86c8f4d1c8a 100644 (file)
--- a/oldbalanceFruitieX.cfg
+++ b/oldbalanceFruitieX.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
@@ -514,7 +514,6 @@ set g_balance_crylink_primary_ammo 2
 set g_balance_crylink_primary_bouncedamagefactor 0.2
 set g_balance_crylink_primary_joindelay 0
 set g_balance_crylink_primary_joinspread 0.2
-set g_balance_crylink_primary_jointime 0.1
 set g_balance_crylink_primary_joinexplode 0
 set g_balance_crylink_primary_joinexplode_damage 0
 set g_balance_crylink_primary_joinexplode_edgedamage 0
@@ -543,9 +542,8 @@ set g_balance_crylink_secondary_ammo 3 // LOG: 2 -> 3
 set g_balance_crylink_secondary_bouncedamagefactor 0.4 // LOG: 0.2 -> 0.4
 set g_balance_crylink_secondary_joindelay 0
 set g_balance_crylink_secondary_joinspread 0.2
-set g_balance_crylink_secondary_jointime 0.1
-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