X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fw_grabber.qc;h=30d7131c4901d74e0df3712d7656fe1c4bbb5f66;hb=192e41dd19d271c71e51df4b00377268e5babdd5;hp=0a9bdf81e32e82094d767b3db8c2691d21b92c92;hpb=80c20eb9ea5331c98311109652a90c1caf688af0;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 0a9bdf81..30d7131c 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -49,6 +49,9 @@ void W_Grabber_Attack2()
 		W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above
 	}
 
+	if (!g_norecoil)
+		self.punchangle_x -= cvar("g_balance_grabber_secondary_recoil");
+
 	W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_secondary_ammo"), cvar("g_balance_grabber_reload_ammo"));
 }
 
@@ -74,33 +77,42 @@ float w_grabber(float req)
 	}
 	else if (req == WR_THINK)
 	{
-		if(cvar("g_balance_grabber_reload_ammo") && self.clip_load < min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo"))) // forced reload
+		grabbered_fuel = cvar("g_balance_grabber_primary_grabbered_fuel");
+		// forced reload
+		if(cvar("g_balance_grabber_reload_ammo") && self.clip_load < min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo"))
+		&& !(self.clip_load >= (time - self.grabber_time_fueldecrease) * grabbered_fuel && self.BUTTON_ATCK)) // not while hooked and still have ammo to stay hooked
 		{
 			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 (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))
+		else if not(self.clip_load < 0) // we're not currently reloading
 		{
-			if(time < self.weapon_delay)
-				return FALSE;
-
-			if(!self.grabber)
-			if not(self.grabber_state & GRABBER_WAITING_FOR_RELEASE)
-			if not(self.grabber_state & GRABBER_FIRING)
-			if (time > self.grabber_refire)
-			if (weapon_prepareattack(0, -1))
+			if (self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1))
 			{
-				W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_reload_ammo"));
-				self.grabber_state |= GRABBER_FIRING;
-				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);				
+				if(time < self.weapon_delay)
+					return FALSE;
+
+				if(!self.grabber)
+				if not(self.grabber_state & GRABBER_WAITING_FOR_RELEASE)
+				if not(self.grabber_state & GRABBER_FIRING)
+				if (time > self.grabber_refire)
+				if (weapon_prepareattack(0, -1))
+				{
+					if (!g_norecoil)
+						self.punchangle_x -= cvar("g_balance_grabber_primary_recoil");
+					W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_reload_ammo"));
+					self.grabber_state |= GRABBER_FIRING;
+					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);				
+				}
 			}
-		}
-		else if (self.BUTTON_ATCK2)
-		{
-			if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))
+			if (self.BUTTON_ATCK2 && weapon_action(self.weapon, WR_CHECKAMMO2))
 			{
-				W_Grabber_Attack2();
-				weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grabber_secondary_animtime"), w_ready);
+				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);
+				}
 			}
 		}
 
@@ -122,8 +134,7 @@ float w_grabber(float req)
 				if ( time > self.grabber_time_grabbered + grabbered_time_max )
 					self.grabber_state |= GRABBER_REMOVING;
 			}
-			
-			grabbered_fuel = cvar("g_balance_grabber_primary_grabbered_fuel");
+
 			if (grabbered_fuel > 0)
 			{
 				if ( time > self.grabber_time_fueldecrease )
@@ -154,7 +165,7 @@ float w_grabber(float req)
 		if (self.BUTTON_CROUCH)
 		{
 			self.grabber_state &~= GRABBER_PULLING;
-			if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))
+			if (self.BUTTON_ATCK)
 				self.grabber_state &~= GRABBER_RELEASING;
 			else
 				self.grabber_state |= GRABBER_RELEASING;
@@ -164,7 +175,7 @@ float w_grabber(float req)
 			self.grabber_state |= GRABBER_PULLING;
 			self.grabber_state &~= GRABBER_RELEASING;
 
-			if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))
+			if (self.BUTTON_ATCK)
 			{
 				// already fired
 				if(self.grabber)
@@ -181,10 +192,11 @@ float w_grabber(float req)
 	{
 		precache_model ("models/weapons/g_grabber.md3");
 		precache_model ("models/weapons/v_grabber.md3");
-		precache_model ("models/weapons/h_grabber.dpm");
+		precache_model ("models/weapons/h_grabber.iqm");
 		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)