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=40786f57edb7cc5e1a36d392aaf30b8eafe06946;hb=8e9b77f4630d1ae72de5f324b9a232f426651193;hpb=cc362a7725ad4b9ae9ab2b452e6609f1ec2b4a62;ds=sidebyside diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index 40786f57..dbf470f3 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -46,9 +46,13 @@ 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 } + 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")); } @@ -59,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; @@ -74,33 +78,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,15 +135,20 @@ 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 ) { 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; @@ -138,8 +156,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)); } @@ -156,7 +172,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; @@ -166,7 +182,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) @@ -183,10 +199,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)