X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fw_grabber.qc;h=4de8425b4c7446db31e52610e1c7a6fed9e2629b;hb=40ba7c2d6ab7ca70caca775eaaa8e606b47f6329;hp=1de3ecfde37b3e0148c8774e0bdb3c1ace946147;hpb=3538b6ef13b3cc4eecf72d6e961a81a133391e6e;p=voretournament%2Fvoretournament.git diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index 1de3ecfd..4de8425b 100644 --- a/data/qcsrc/server/w_grabber.qc +++ b/data/qcsrc/server/w_grabber.qc @@ -41,11 +41,15 @@ void W_Grabber_Attack2() WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self)); - pointparticles(particleeffectnum("grabber_melee"), w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), '0 0 0', 1); - - if (trace_fraction < 1) + if(trace_fraction < 1) // should always be true, but just in case { 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); + if(trace_ent.classname == "player") + sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_player.wav", VOL_BASE, ATTN_NORM); + else + sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_world.wav", VOL_BASE, ATTN_NORM); + W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above } @@ -62,11 +66,8 @@ 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; - } float ammo_amount; float grabbered_time_max, grabbered_fuel; @@ -77,17 +78,25 @@ float w_grabber(float req) } else if (req == WR_THINK) { + // determine by distance if this will be primary fire or alternate fire + W_SetupShot (self, TRUE, 0, "", 0); // do this to update w_shotorg + WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_grabber_secondary_radius"), FALSE, self, ANTILAG_LATENCY(self)); + if(trace_fraction < 1) + self.stat_crosshair_style = 1; + else + self.stat_crosshair_style = 0; + 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 + && self.clip_load >= 0 && !(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 not(self.clip_load < 0) // we're currently reloading + else if(self.clip_load >= 0 && !self.stat_eaten) // we're not currently reloading or eaten { - if (self.BUTTON_ATCK) + if(trace_fraction >= 1 && self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1)) // primary attack { if(time < self.weapon_delay) return FALSE; @@ -105,12 +114,13 @@ float w_grabber(float req) weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready); } } - if (self.BUTTON_ATCK2) + else if (self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO2)) // secondary attack { if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire"))) { W_Grabber_Attack2(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_secondary_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_grabber_secondary_animtime"), w_ready); + sound (self, CHAN_WEAPON2, "weapons/grabber_swing.wav", VOL_BASE, ATTN_NORM); } } } @@ -140,7 +150,13 @@ float w_grabber(float req) { 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; @@ -161,30 +177,19 @@ float w_grabber(float req) self.grabber_time_fueldecrease = time + cvar("g_balance_grabber_primary_grabbered_time_free"); } - if (self.BUTTON_CROUCH) + self.grabber_state |= GRABBER_PULLING; + self.grabber_state &~= GRABBER_RELEASING; + + if (self.BUTTON_ATCK) { - self.grabber_state &~= GRABBER_PULLING; - if (self.BUTTON_ATCK) - self.grabber_state &~= GRABBER_RELEASING; - else - self.grabber_state |= GRABBER_RELEASING; + // already fired + if(self.grabber) + self.grabber_state |= GRABBER_WAITING_FOR_RELEASE; } else { - self.grabber_state |= GRABBER_PULLING; - self.grabber_state &~= GRABBER_RELEASING; - - if (self.BUTTON_ATCK) - { - // already fired - if(self.grabber) - self.grabber_state |= GRABBER_WAITING_FOR_RELEASE; - } - else - { - self.grabber_state |= GRABBER_REMOVING; - self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE; - } + self.grabber_state |= GRABBER_REMOVING; + self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE; } } else if (req == WR_PRECACHE) @@ -192,10 +197,13 @@ 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.iqm"); - precache_sound ("weapons/grabber_impact.wav"); // done by g_grabber.qc + precache_sound ("weapons/grabber_impact_player.wav"); + precache_sound ("weapons/grabber_impact_world.wav"); + precache_sound ("weapons/grabber_impact2_player.wav"); + precache_sound ("weapons/grabber_impact2_world.wav"); precache_sound ("weapons/grabber_fire.wav"); precache_sound ("weapons/grabber_altfire.wav"); - precache_sound ("weapons/grabber_melee.wav"); + precache_sound ("weapons/grabber_swing.wav"); precache_sound ("weapons/reload.wav"); } else if (req == WR_SETUP) @@ -208,20 +216,26 @@ float w_grabber(float req) { if(self.grabber) { - ammo_amount = self.ammo_fuel > 0; - ammo_amount += self.weapon_load[WEP_GRABBER] > 0; + if(cvar("g_balance_grabber_reload_ammo")) + ammo_amount = self.weapon_load[WEP_GRABBER] > 0; + else + ammo_amount = self.ammo_fuel > 0; } else { - ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_primary_ammo"); - ammo_amount += self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_primary_ammo"); + if(cvar("g_balance_grabber_reload_ammo")) + ammo_amount = self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_primary_ammo"); + else + ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_primary_ammo"); } return ammo_amount; } else if (req == WR_CHECKAMMO2) { - ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_secondary_ammo"); - ammo_amount += self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_secondary_ammo"); + if(cvar("g_balance_grabber_reload_ammo")) + ammo_amount = self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_secondary_ammo"); + else + ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_secondary_ammo"); return ammo_amount; } else if (req == WR_RELOAD)