From: Mircea Kitsune Date: Wed, 20 Apr 2011 15:53:26 +0000 (+0300) Subject: Lastly, default the default balance back to what it was, and just comment the default... X-Git-Tag: xonotic-v0.5.0~263^2~10^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=801fd8197b1e453d4abb50413cd2c1014514f95a;p=xonotic%2Fxonotic-data.pk3dir.git Lastly, default the default balance back to what it was, and just comment the defaults. This should make the code ready for merge, as discussed last night on the balance channel. --- diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index f67702150..379990c9c 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -538,21 +538,21 @@ set g_balance_hagar_primary_lifetime 5 set g_balance_hagar_primary_refire 0.12 set g_balance_hagar_primary_ammo 1 set g_balance_hagar_secondary 1 -set g_balance_hagar_secondary_load 1 +set g_balance_hagar_secondary_load 0 set g_balance_hagar_secondary_load_speed 0.6 set g_balance_hagar_secondary_load_max 4 set g_balance_hagar_secondary_load_hold 0 set g_balance_hagar_secondary_load_releasedeath 1 set g_balance_hagar_secondary_load_abort 1 -set g_balance_hagar_secondary_damage 36 -set g_balance_hagar_secondary_edgedamage 6 -set g_balance_hagar_secondary_force 160 +set g_balance_hagar_secondary_damage 14 // default for _load: 32 +set g_balance_hagar_secondary_edgedamage 6 // default for _load: 10 +set g_balance_hagar_secondary_force 70 // default for _load: 160 set g_balance_hagar_secondary_radius 125 -set g_balance_hagar_secondary_spread 0.08 +set g_balance_hagar_secondary_spread 0.15 // default for _load: 0.08 set g_balance_hagar_secondary_speed 1800 set g_balance_hagar_secondary_lifetime_min 5 set g_balance_hagar_secondary_lifetime_rand 0 -set g_balance_hagar_secondary_refire 0.8 +set g_balance_hagar_secondary_refire 0.12 // default for _load: 0.8 set g_balance_hagar_secondary_ammo 1 set g_balance_hagar_reload_ammo 0 //default: 25 set g_balance_hagar_reload_time 2