X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fw_grabber.qc;h=dbf470f3d44b61c50f2b1ddc4a12d170389c1042;hp=7274dd623c7c918c5cbf6e6951eff34bfc8a506a;hb=8e9b77f4630d1ae72de5f324b9a232f426651193;hpb=b9f20ed0e6980e5c5f27aeb67544d6a4fd5af257

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 7274dd62..dbf470f3 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -46,6 +46,7 @@ void W_Grabber_Attack2()
 	if (trace_fraction < 1)
 	{
 		Damage(trace_ent, self, self, cvar("g_balance_grabber_secondary_damage"), WEP_GRABBER | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_grabber_secondary_force") * w_shotdir);
+		pointparticles(particleeffectnum("grabber_impact2"), trace_endpos, '0 0 0', 1);
 		W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above
 	}
 
@@ -62,7 +63,7 @@ void spawnfunc_weapon_grabber (void)
 
 float w_grabber(float req)
 {
-	if(self.predator.classname == "player") // we can't use weapons while in the stomach
+	if(self.stat_eaten) // we can't use weapons while in the stomach
 	{
 		self.grabber_state |= GRABBER_REMOVING;
 		return FALSE;
@@ -85,9 +86,9 @@ float w_grabber(float req)
 			if(self.ammo_fuel >= 1) // we only have one weapon in VT, so nothing else to switch to if we're out of ammo
 				weapon_action(self.weapon, WR_RELOAD);
 		}
-		else if not(self.clip_load < 0) // we're currently reloading
+		else if not(self.clip_load < 0) // we're not currently reloading
 		{
-			if (self.BUTTON_ATCK)
+			if (self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1))
 			{
 				if(time < self.weapon_delay)
 					return FALSE;
@@ -105,12 +106,13 @@ float w_grabber(float req)
 					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);				
 				}
 			}
-			if (self.BUTTON_ATCK2)
+			if (self.BUTTON_ATCK2 && weapon_action(self.weapon, WR_CHECKAMMO2))
 			{
 				if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))
 				{
 					W_Grabber_Attack2();
 					weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grabber_secondary_animtime"), w_ready);
+					sound (self, CHAN_WEAPON2, "weapons/grabber_swing.wav", VOL_BASE, ATTN_NORM);
 				}
 			}
 		}
@@ -140,7 +142,13 @@ float w_grabber(float req)
 				{
 					if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 					{
-						if ( self.ammo_fuel >= (time - self.grabber_time_fueldecrease) * grabbered_fuel )
+						float active_ammo;
+						if(cvar("g_balance_grabber_reload_ammo"))
+							active_ammo = self.clip_load;
+						else
+							active_ammo = self.ammo_fuel;
+
+						if (active_ammo >= (time - self.grabber_time_fueldecrease) * grabbered_fuel )
 						{
 							W_DecreaseAmmo(ammo_fuel, (time - self.grabber_time_fueldecrease) * grabbered_fuel, cvar("g_balance_grabber_reload_ammo"));
 							self.grabber_time_fueldecrease = time;
@@ -195,6 +203,7 @@ float w_grabber(float req)
 		precache_sound ("weapons/grabber_impact.wav"); // done by g_grabber.qc
 		precache_sound ("weapons/grabber_fire.wav");
 		precache_sound ("weapons/grabber_altfire.wav");
+		precache_sound ("weapons/grabber_swing.wav");
 		precache_sound ("weapons/reload.wav");
 	}
 	else if (req == WR_SETUP)