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=d3b45eae3c5eb4163ef0b6658f939ccefb7b77bf;hb=1764a49984c755fad6fd6e6b5b28e0204580ac9a;hpb=bc64f61f2d1c8ac9daf848e6292e47caf39b4846 diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc index d3b45eae..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_SPLASH, 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; @@ -9,6 +9,22 @@ REGISTER_WEAPON(GRABBER, w_grabber, IT_FUEL, 0, WEP_FLAG_CANCLIMB | WEP_TYPE_SPL .float grabber_time_grabbered; .float grabber_time_fueldecrease; +void W_Grabber_UpdateStats(entity e, float shot, float hit) +{ + // 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; + e.stat_fired = e.weapon + 64 * floor(e.stats_fired[e.weapon - 1]); + } + if(hit) + { + e.stats_hit[e.weapon - 1] += 1; + e.stat_hit = e.weapon + 64 * floor(e.stats_hit[e.weapon - 1]); + } +} + void W_Grabber_Touch2 (void) { PROJECTILE_TOUCH; @@ -17,17 +33,23 @@ void W_Grabber_Touch2 (void) void W_Grabber_Attack2() { - W_SetupShot (self, TRUE, 0, "weapons/grabber_fire.wav", cvar("g_balance_grabber_secondary_damage")); + if(time < self.weapon_delay) + return; + + W_SetupShot (self, TRUE, 0, "weapons/grabber_altfire.wav", cvar("g_balance_grabber_secondary_damage")); + W_Grabber_UpdateStats(self, TRUE, FALSE); // the hit is recorded below 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) + { 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); + 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) @@ -37,12 +59,13 @@ void spawnfunc_weapon_grabber (void) float w_grabber(float req) { - if(self.eater.classname == "player") // we can't use weapons while in the stomach + if(self.predator.classname == "player") // 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; if (req == WR_AIM) @@ -51,30 +74,39 @@ float w_grabber(float req) } else if (req == WR_THINK) { - if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_GRABBER)) + 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); + } } } @@ -85,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) @@ -96,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 ) @@ -106,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)); } @@ -129,7 +159,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_GRABBER)) + if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK)) self.grabber_state &~= GRABBER_RELEASING; else self.grabber_state |= GRABBER_RELEASING; @@ -139,7 +169,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_GRABBER)) + if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK)) { // already fired if(self.grabber) @@ -159,22 +189,39 @@ float w_grabber(float req) precache_model ("models/weapons/h_grabber.dpm"); 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";