X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fw_grabber.qc;h=4e39d096dea0ea11ad30e0a2b2b73453146d14d0;hp=1d2266bb245a0c87bf449811593b5d60508f3c7e;hb=1764a49984c755fad6fd6e6b5b28e0204580ac9a;hpb=9a2ec3ca3f0cd7ca303fb3a4c3672109f8f256d9

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 1d2266bb..4e39d096 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -74,30 +74,39 @@ 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
-			weapon_action(self.weapon, WR_RELOAD);
-		else if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))
+		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(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))
-			{
-				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(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_ATCK2)
+		else
 		{
-			if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))
+			if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))
 			{
-				W_Grabber_Attack2();
-				weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grabber_secondary_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))
+				{
+					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 (self.BUTTON_ATCK2)
+			{
+				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);
+				}
 			}
 		}
 
@@ -119,8 +128,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 )
@@ -135,8 +143,6 @@ float w_grabber(float req)
 						}
 						else
 						{
-							self.ammo_fuel = 0;
-							self.weapon_load[WEP_GRABBER] = 0;
 							self.grabber_state |= GRABBER_REMOVING;
 							W_SwitchWeapon_Force(self, w_getbestweapon(self));
 						}