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=0f5a818e144a7588b21e7a665522f8d0086fe654;hb=1764a49984c755fad6fd6e6b5b28e0204580ac9a;hpb=b0ed14220ec0a63a70a41bdc65420065ef65d006

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 0f5a818e..4e39d096 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(GRABBER, w_grabber, IT_FUEL, 0, WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, 0, "grabber", "grabber", "Grabber");
+REGISTER_WEAPON(GRABBER, w_grabber, IT_FUEL, 0, WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN | WEP_FLAG_RELOADABLE, 0, "grabber", "grabber", "Grabber");
 #else
 .float dmg;
 .float dmg_edge;
@@ -11,8 +11,8 @@ REGISTER_WEAPON(GRABBER, w_grabber, IT_FUEL, 0, WEP_FLAG_CANCLIMB | WEP_TYPE_HIT
 
 void W_Grabber_UpdateStats(entity e, float shot, float hit)
 {
-	// this may not be entierly right, but for the time being we're recording the hook accuracy here
-	// this is likely needed for detecting if the hook has hit (linked to) another person though
+	// this may not be entierly right, but for the time being we're handling grabber accuracy here
+	// this is likely needed for detecting if the hook has hit (linked to) another player, which is counted as a hit
 	if(shot)
 	{
 		e.stats_fired[e.weapon - 1] += 1;
@@ -49,8 +49,7 @@ void W_Grabber_Attack2()
 		W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above
 	}
 
-	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-		self.ammo_fuel = self.ammo_fuel - cvar("g_balance_grabber_secondary_ammo");
+	W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_secondary_ammo"), cvar("g_balance_grabber_reload_ammo"));
 }
 
 void spawnfunc_weapon_grabber (void)
@@ -66,6 +65,7 @@ float w_grabber(float req)
 		return FALSE;
 	}
 
+	float ammo_amount;
 	float grabbered_time_max, grabbered_fuel;
 		
 	if (req == WR_AIM)
@@ -74,30 +74,39 @@ float w_grabber(float req)
 	}
 	else if (req == WR_THINK)
 	{
-		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))
-			{
-				if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-					self.ammo_fuel = self.ammo_fuel - cvar("g_balance_grabber_primary_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);
 		}
-
-		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);
+				}
 			}
 		}
 
@@ -108,7 +117,7 @@ float w_grabber(float req)
 
 			// grabber also inhibits health regeneration, but only for 1 second
 			if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-				self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_pause_fuel_regen"));
+				self.pauseregenhealth_finished = max(self.pauseregenhealth_finished, time + cvar("g_balance_pause_fuel_regen"));
 		}
 
 		if(self.grabber && self.grabber.state == 1)
@@ -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 )
@@ -129,13 +137,12 @@ float w_grabber(float req)
 					{
 						if ( self.ammo_fuel >= (time - self.grabber_time_fueldecrease) * grabbered_fuel )
 						{
-							self.ammo_fuel -= (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;
 							// decrease next frame again
 						}
 						else
 						{
-							self.ammo_fuel = 0;
 							self.grabber_state |= GRABBER_REMOVING;
 							W_SwitchWeapon_Force(self, w_getbestweapon(self));
 						}
@@ -183,22 +190,38 @@ 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/reload.wav");
 	}
 	else if (req == WR_SETUP)
 	{
 		weapon_setup(WEP_GRABBER);
 		self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE;
+		self.current_ammo = ammo_fuel;
 	}
 	else if (req == WR_CHECKAMMO1)
 	{
 		if(self.grabber)
-			return self.ammo_fuel > 0;
+		{
+			ammo_amount = self.ammo_fuel > 0;
+			ammo_amount += self.weapon_load[WEP_GRABBER] > 0;
+		}
 		else
-			return self.ammo_fuel >= cvar("g_balance_grabber_primary_ammo");
+		{
+			ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_primary_ammo");
+			ammo_amount += self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_primary_ammo");
+		}
+		return ammo_amount;
 	}
 	else if (req == WR_CHECKAMMO2)
 	{
-		return self.ammo_fuel >= cvar("g_balance_grabber_secondary_ammo");
+		ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_secondary_ammo");
+		ammo_amount += self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_secondary_ammo");
+		return ammo_amount;
+	}
+	else if (req == WR_RELOAD)
+	{
+		self.grabber_state |= GRABBER_REMOVING;
+		W_Reload(min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo")), cvar("g_balance_grabber_reload_ammo"), cvar("g_balance_grabber_reload_time"), "weapons/reload.wav");
 	}
 	else if (req == WR_SUICIDEMESSAGE)
 		w_deathtypestring = "did the impossible";