W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above\r
}\r
\r
+ if (!g_norecoil)\r
+ self.punchangle_x -= cvar("g_balance_grabber_secondary_recoil");\r
+\r
W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_secondary_ammo"), cvar("g_balance_grabber_reload_ammo"));\r
}\r
\r
\r
float w_grabber(float req)\r
{\r
- if(self.predator.classname == "player") // we can't use weapons while in the stomach\r
+ if(self.stat_eaten) // we can't use weapons while in the stomach\r
{\r
self.grabber_state |= GRABBER_REMOVING;\r
return FALSE;\r
if(self.ammo_fuel >= 1) // we only have one weapon in VT, so nothing else to switch to if we're out of ammo\r
weapon_action(self.weapon, WR_RELOAD);\r
}\r
- else\r
+ else if not(self.clip_load < 0) // we're not currently reloading\r
{\r
- if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))\r
+ if (self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1))\r
{\r
if(time < self.weapon_delay)\r
return FALSE;\r
if (time > self.grabber_refire)\r
if (weapon_prepareattack(0, -1))\r
{\r
+ if (!g_norecoil)\r
+ self.punchangle_x -= cvar("g_balance_grabber_primary_recoil");\r
W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_reload_ammo"));\r
self.grabber_state |= GRABBER_FIRING;\r
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready); \r
}\r
}\r
- if (self.BUTTON_ATCK2)\r
+ if (self.BUTTON_ATCK2 && weapon_action(self.weapon, WR_CHECKAMMO2))\r
{\r
if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))\r
{\r
W_Grabber_Attack2();\r
weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grabber_secondary_animtime"), w_ready);\r
+ sound (self, CHAN_WEAPON2, "weapons/grabber_swing.wav", VOL_BASE, ATTN_NORM);\r
}\r
}\r
}\r
if (self.BUTTON_CROUCH)\r
{\r
self.grabber_state &~= GRABBER_PULLING;\r
- if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))\r
+ if (self.BUTTON_ATCK)\r
self.grabber_state &~= GRABBER_RELEASING;\r
else\r
self.grabber_state |= GRABBER_RELEASING;\r
self.grabber_state |= GRABBER_PULLING;\r
self.grabber_state &~= GRABBER_RELEASING;\r
\r
- if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))\r
+ if (self.BUTTON_ATCK)\r
{\r
// already fired\r
if(self.grabber)\r
{\r
precache_model ("models/weapons/g_grabber.md3");\r
precache_model ("models/weapons/v_grabber.md3");\r
- precache_model ("models/weapons/h_grabber.dpm");\r
+ precache_model ("models/weapons/h_grabber.iqm");\r
precache_sound ("weapons/grabber_impact.wav"); // done by g_grabber.qc\r
precache_sound ("weapons/grabber_fire.wav");\r
precache_sound ("weapons/grabber_altfire.wav");\r
+ precache_sound ("weapons/grabber_swing.wav");\r
precache_sound ("weapons/reload.wav");\r
}\r
else if (req == WR_SETUP)\r