Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / balance-nexuiz25.cfg

diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg
index 3d8819370db7614b3cb8b0db2a45a21056e7b588..6e18dc092a59d488192a2ca693d6f54de37d7e03 100644 (file)
--- a/balance-nexuiz25.cfg
+++ b/balance-nexuiz25.cfg
@@ -139,7 +139,7 @@ set g_balance_fuel_limit 999
 
 // {{{ misc
 set g_balance_selfdamagepercent 0.6
-set g_weaponspeedfactor 0 "weapon projectile speed multiplier"
+set g_weaponspeedfactor 1 "weapon projectile speed multiplier"
 set g_weaponratefactor 1 "weapon fire rate multiplier"
 set g_weapondamagefactor 1 "weapon damage multiplier"
 set g_weaponforcefactor 1 "weapon force multiplier"
@@ -218,6 +218,10 @@ set g_balance_grapplehook_airfriction 0.2
 set g_balance_grapplehook_health 130
 set g_balance_grapplehook_damagedbycontents 0
 set g_balance_grapplehook_refire 0.2
+set g_balance_grapplehook_nade_time 0.7
+set g_balance_grapplehook_crouchslide 0
+set g_balance_grapplehook_gravity 0
+set g_balance_grapplehook_pull_frozen 0
 // }}}
 
 // {{{ port-o-launch