From: Samual <samual@xonotic.org>
Date: Mon, 26 Sep 2011 16:51:08 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/hagar_secondary_autorelease
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~50^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=4337dab09bbbe024bcc77db446ed76962fb17f0d

Merge remote branch 'origin/master' into samual/hagar_secondary_autorelease

Conflicts:
	qcsrc/server/w_hagar.qc
---

4337dab09bbbe024bcc77db446ed76962fb17f0d
diff --cc balanceXonotic.cfg
index 5c3138a61f,182e66cb1c..4046379f25
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@@ -541,8 -542,10 +542,10 @@@ set g_balance_hagar_primary_ammo 
  set g_balance_hagar_secondary 1
  set g_balance_hagar_secondary_load 1
  set g_balance_hagar_secondary_load_speed 0.5
+ set g_balance_hagar_secondary_load_spread 0.075
+ set g_balance_hagar_secondary_load_spread_bias 0.5
  set g_balance_hagar_secondary_load_max 4
 -set g_balance_hagar_secondary_load_hold 1
 +set g_balance_hagar_secondary_load_hold 2.5
  set g_balance_hagar_secondary_load_releasedeath 0
  set g_balance_hagar_secondary_load_abort 1
  set g_balance_hagar_secondary_damage 40
diff --cc qcsrc/server/w_hagar.qc
index cca71f7d47,080eea39e4..147613afb3
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@@ -220,13 -228,11 +228,14 @@@ void W_Hagar_Attack2_Load (void
  				if(!self.hagar_loadblock && self.hagar_loadstep < time)
  				{
  					W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_secondary_ammo, autocvar_g_balance_hagar_reload_ammo);
+ 					self.weaponentity.state = WS_INUSE;
  					self.hagar_load += 1;
- 					sound(self, CHAN_WEAPON2, "weapons/hagar_load.wav", VOL_BASE * 0.8, ATTN_NORM); // sound is too loud according to most
 -					sound(self, CH_WEAPON_B, "weapons/hagar_load.wav", VOL_BASE, ATTN_NORM);
++					sound(self, CH_WEAPON_B, "weapons/hagar_load.wav", VOL_BASE * 0.8, ATTN_NORM); // sound is too loud according to most
  
 -					self.hagar_loadstep = time + autocvar_g_balance_hagar_secondary_load_speed * W_WeaponRateFactor();
 +					if (self.hagar_load >= autocvar_g_balance_hagar_secondary_load_max)
- 						self.hagar_loadstep = time + autocvar_g_balance_hagar_secondary_load_hold;
++						self.hagar_loadstep = time + autocvar_g_balance_hagar_secondary_load_hold * W_WeaponRateFactor();
 +					else
- 						self.hagar_loadstep = time + autocvar_g_balance_hagar_secondary_load_speed;
++						self.hagar_loadstep = time + autocvar_g_balance_hagar_secondary_load_speed * W_WeaponRateFactor();
  				}
  			}
  			else if(!self.hagar_loadbeep && self.hagar_load) // prevents the beep from playing each frame
@@@ -245,9 -251,11 +254,11 @@@
  
  	if(self.hagar_load)
  	{
- 		self.weapon_forbidchange = TRUE;
 -		if(!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && self.hagar_loadstep < time && !autocvar_g_balance_hagar_secondary_load_hold))
 +		if(!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && self.hagar_loadstep < time && autocvar_g_balance_hagar_secondary_load_hold >= 0))
+ 		{
+ 			self.weaponentity.state = WS_READY;
  			W_Hagar_Attack2_Load_Release();
+ 		}
  	}
  	else
  	{