X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=360078d2a31124fde23eb212159440944d802649;hp=866f71f72e0e3fa6674a8e0ea9af48f5e316cde9;hb=64b8409b2d6fb93dc51ba24a82d219c8cd56a907;hpb=1556aa4ea70b3b275afb1cb4587e555fb44f71c3 diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index 866f71f72..360078d2a 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -1,7 +1,7 @@ #include "g_hook.qh" -#include "_all.qh" #include "weapons/common.qh" +#include "weapons/csqcprojectile.qh" #include "weapons/weaponsystem.qh" #include "weapons/selection.qh" #include "weapons/tracing.qh" @@ -12,8 +12,10 @@ #include "../common/constants.qh" #include "../common/util.qh" #include "../common/weapons/all.qh" -#include "../warpzonelib/common.qh" -#include "../warpzonelib/server.qh" +#include "../lib/warpzone/common.qh" +#include "../lib/warpzone/server.qh" + +.int state; /*============================================ @@ -65,7 +67,6 @@ And you should be done! ============================================*/ .float hook_length; -.float hook_switchweapon; void RemoveGrapplingHook(entity pl) { @@ -79,19 +80,19 @@ void RemoveGrapplingHook(entity pl) //pl.disableclientprediction = false; } -void GrapplingHookReset(void) +void GrapplingHookReset(entity this) { - if(self.realowner.hook == self) - RemoveGrapplingHook(self.owner); + if(this.realowner.hook == this) + RemoveGrapplingHook(this.owner); else // in any case: - remove(self); + remove(this); } void GrapplingHookThink(); void GrapplingHook_Stop() -{ - Send_Effect("grapple_impact", self.origin, '0 0 0', 1); - sound (self, CH_SHOTS, W_Sound("hook_impact"), VOL_BASE, ATTEN_NORM); +{SELFPARAM(); + Send_Effect(EFFECT_HOOK_IMPACT, self.origin, '0 0 0', 1); + sound (self, CH_SHOTS, SND_HOOK_IMPACT, VOL_BASE, ATTEN_NORM); self.state = 1; self.think = GrapplingHookThink; @@ -103,9 +104,9 @@ void GrapplingHook_Stop() } .vector hook_start, hook_end; -float GrapplingHookSend(entity to, int sf) +bool GrapplingHookSend(entity this, entity to, int sf) { - WriteByte(MSG_ENTITY, ENT_CLIENT_HOOK); + WriteHeader(MSG_ENTITY, ENT_CLIENT_HOOK); sf = sf & 0x7F; if(sound_allowed(MSG_BROADCAST, self.realowner)) sf |= 0x80; @@ -129,8 +130,10 @@ float GrapplingHookSend(entity to, int sf) return true; } +int autocvar_g_grappling_hook_tarzan; + void GrapplingHookThink() -{ +{SELFPARAM(); float spd, dist, minlength, pullspeed, ropestretch, ropeairfriction, rubberforce, newlength, rubberforce_overstretch; vector dir, org, end, v0, dv, v, myorg, vs; if(self.realowner.hook != self) // how did that happen? @@ -138,7 +141,7 @@ void GrapplingHookThink() error("Owner lost the hook!\n"); return; } - if(LostMovetypeFollow(self) || intermission_running || (round_handler_IsActive() && !round_handler_IsRoundStarted())) + if(LostMovetypeFollow(self) || intermission_running || (round_handler_IsActive() && !round_handler_IsRoundStarted()) || ((self.aiment.flags & FL_PROJECTILE) && self.aiment.classname != "nade")) { RemoveGrapplingHook(self.realowner); return; @@ -148,10 +151,7 @@ void GrapplingHookThink() self.nextthink = time; - int s = self.realowner.cvar_cl_gunalign; - if(s != 1 && s != 2 && s != 4) - s = 3; // default value - --s; + int s = W_GetGunAlignment(self.realowner); vs = hook_shotorigin[s]; makevectors(self.realowner.v_angle); @@ -161,6 +161,14 @@ void GrapplingHookThink() if(self.hook_length < 0) self.hook_length = vlen(myorg - self.origin); + int tarzan = autocvar_g_grappling_hook_tarzan; + entity pull_entity = self.realowner; + float velocity_multiplier = 1; + MUTATOR_CALLHOOK(GrappleHookThink, self, tarzan, pull_entity, velocity_multiplier); + tarzan = hook_tarzan; + pull_entity = hook_pullentity; + velocity_multiplier = hook_velmultiplier; + if(self.state == 1) { pullspeed = autocvar_g_balance_grapplehook_speed_pull;//2000; @@ -184,13 +192,15 @@ void GrapplingHookThink() // while hanging on the rope, this friction component will help you a // bit to control the rope + bool frozen_pulling = (autocvar_g_grappling_hook_tarzan >= 2 && autocvar_g_balance_grapplehook_pull_frozen); + dir = self.origin - myorg; dist = vlen(dir); dir = normalize(dir); - if(autocvar_g_grappling_hook_tarzan) + if(tarzan) { - v = v0 = WarpZone_RefSys_TransformVelocity(self.realowner, self, self.realowner.velocity); + v = v0 = WarpZone_RefSys_TransformVelocity(pull_entity, self, pull_entity.velocity); // first pull the rope... if(self.realowner.hook_state & HOOK_PULLING) @@ -208,6 +218,9 @@ void GrapplingHookThink() self.hook_length = newlength; } + if(pull_entity.movetype == MOVETYPE_FLY) + pull_entity.movetype = MOVETYPE_WALK; + if(self.realowner.hook_state & HOOK_RELEASING) { newlength = dist; @@ -221,23 +234,38 @@ void GrapplingHookThink() v = v + frametime * dir * spd * rubberforce; dv = ((v - v0) * dir) * dir; - if(autocvar_g_grappling_hook_tarzan >= 2) + if(tarzan >= 2) { - if(self.aiment.movetype == MOVETYPE_WALK) + if(self.aiment.movetype == MOVETYPE_WALK || self.aiment.classname == "nade") { + entity aim_ent = ((IS_VEHICLE(self.aiment) && self.aiment.owner) ? self.aiment.owner : self.aiment); v = v - dv * 0.5; - self.aiment.velocity = self.aiment.velocity - dv * 0.5; - self.aiment.flags &= ~FL_ONGROUND; - self.aiment.pusher = self.realowner; - self.aiment.pushltime = time + autocvar_g_maxpushtime; - self.aiment.istypefrag = self.aiment.BUTTON_CHAT; + if((frozen_pulling && self.aiment.frozen) || !frozen_pulling) + { + self.aiment.velocity = self.aiment.velocity - dv * 0.5; + self.aiment.flags &= ~FL_ONGROUND; + if(self.aiment.flags & FL_PROJECTILE) + UpdateCSQCProjectile(self.aiment); + } + if(self.aiment.classname == "nade") + self.aiment.nextthink = time + autocvar_g_balance_grapplehook_nade_time; // set time after letting go? + aim_ent.pusher = self.realowner; + aim_ent.pushltime = time + autocvar_g_maxpushtime; + aim_ent.istypefrag = aim_ent.BUTTON_CHAT; } } - self.realowner.flags &= ~FL_ONGROUND; + pull_entity.flags &= ~FL_ONGROUND; } - self.realowner.velocity = WarpZone_RefSys_TransformVelocity(self, self.realowner, v); + if(!frozen_pulling && !(self.aiment.flags & FL_PROJECTILE)) + pull_entity.velocity = WarpZone_RefSys_TransformVelocity(self, pull_entity, v * velocity_multiplier); + + if(frozen_pulling && autocvar_g_balance_grapplehook_pull_frozen == 2 && !self.aiment.frozen) + { + RemoveGrapplingHook(self.realowner); + return; + } } else { @@ -271,8 +299,10 @@ void GrapplingHookThink() } } -void GrapplingHookTouch (void) -{ +void GrapplingHookTouch () +{SELFPARAM(); + if(other.movetype == MOVETYPE_FOLLOW) + return; PROJECTILE_TOUCH; GrapplingHook_Stop(); @@ -288,7 +318,7 @@ void GrapplingHookTouch (void) } void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) -{ +{SELFPARAM(); if(self.health <= 0) return; @@ -309,8 +339,8 @@ void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, int } } -void FireGrapplingHook (void) -{ +void FireGrapplingHook () +{SELFPARAM(); entity missile; vector org; vector vs; @@ -320,20 +350,17 @@ void FireGrapplingHook (void) makevectors(self.v_angle); - int s = self.cvar_cl_gunalign; - if(s != 1 && s != 2 && s != 4) - s = 3; // default value - --s; + int s = W_GetGunAlignment(self); vs = hook_shotorigin[s]; // UGLY WORKAROUND: play this on CH_WEAPON_B so it can't cut off fire sounds - sound (self, CH_WEAPON_B, W_Sound("hook_fire"), VOL_BASE, ATTEN_NORM); + sound (self, CH_WEAPON_B, SND_HOOK_FIRE, VOL_BASE, ATTEN_NORM); org = self.origin + self.view_ofs + v_forward * vs.x + v_right * -vs.y + v_up * vs.z; tracebox(self.origin + self.view_ofs, '-3 -3 -3', '3 3 3', org, MOVE_NORMAL, self); org = trace_endpos; - Send_Effect("grapple_muzzleflash", org, '0 0 0', 1); + Send_Effect(EFFECT_HOOK_MUZZLEFLASH, org, '0 0 0', 1); missile = WarpZone_RefSys_SpawnSameRefSys(self); missile.owner = missile.realowner = self; @@ -342,10 +369,10 @@ void FireGrapplingHook (void) missile.classname = "grapplinghook"; missile.flags = FL_PROJECTILE; - missile.movetype = MOVETYPE_FLY; + missile.movetype = ((autocvar_g_balance_grapplehook_gravity) ? MOVETYPE_TOSS : MOVETYPE_FLY); PROJECTILE_MAKETRIGGER(missile); - //setmodel (missile, "models/hook.md3"); // precision set below + //setmodel (missile, MDL_HOOK); // precision set below setsize (missile, '-3 -3 -3', '3 3 3'); setorigin (missile, org); @@ -373,114 +400,6 @@ void FireGrapplingHook (void) Net_LinkEntity(missile, false, 0, GrapplingHookSend); } -// void GrapplingHookFrame() -// { -// // this function has been modified for Xonotic -// - if (self.BUTTON_HOOK && g_grappling_hook) -// { -// - if (!self.hook && self.hook_time <= time && !self.button6_pressed_before) -// - if (timeoutStatus != 2) //only allow the player to fire the grappling hook if the game is not paused (timeout) -// - FireGrapplingHook(); -// } -// - else -// { -// if (self.hook) -// RemoveGrapplingHook(self); -// } -// - self.button6_pressed_before = self.BUTTON_HOOK; -// /* -// // if I have no hook or it's not pulling yet, make sure I'm not flying! -// if((self.hook == world || !self.hook.state) && self.movetype == MOVETYPE_FLY) - -void GrapplingHookFrame() -{ - if(g_grappling_hook && timeout_status != TIMEOUT_ACTIVE && self.weapon != WEP_HOOK.m_id) - { - // offhand hook controls - if(self.BUTTON_HOOK) - { - if (!(self.hook || (self.hook_state & HOOK_WAITING_FOR_RELEASE)) && (time > self.hook_refire)) - { - self.hook_state |= HOOK_FIRING; - self.hook_state |= HOOK_WAITING_FOR_RELEASE; - } - } - else - { - self.hook_state |= HOOK_REMOVING; - self.hook_state &= ~HOOK_WAITING_FOR_RELEASE; - } - - self.hook_state &= ~HOOK_RELEASING; - if(self.BUTTON_CROUCH) - { - self.hook_state &= ~HOOK_PULLING; - //self.hook_state |= HOOK_RELEASING; - } - else - { - self.hook_state |= HOOK_PULLING; - //self.hook_state &= ~HOOK_RELEASING; - } - } - else if(!g_grappling_hook && self.switchweapon != WEP_HOOK.m_id) - { - if(self.BUTTON_HOOK && !self.hook_switchweapon) - W_SwitchWeapon(WEP_HOOK.m_id); - } - self.hook_switchweapon = self.BUTTON_HOOK; - - if(!g_grappling_hook && self.weapon != WEP_HOOK.m_id) - { - self.hook_state &= ~HOOK_FIRING; - self.hook_state |= HOOK_REMOVING; - } - - if (self.hook_state & HOOK_FIRING) - { - if (self.hook) - RemoveGrapplingHook(self); - FireGrapplingHook(); - self.hook_state &= ~HOOK_FIRING; - self.hook_refire = max(self.hook_refire, time + autocvar_g_balance_grapplehook_refire * W_WeaponRateFactor()); - } - else if(self.hook_state & HOOK_REMOVING) - { - if (self.hook) - RemoveGrapplingHook(self); - self.hook_state &= ~HOOK_REMOVING; - } - - /* - // if I have no hook or it's not pulling yet, make sure I'm not flying! - if((self.hook == world || !self.hook.state) && self.movetype == MOVETYPE_FLY) - { - self.movetype = MOVETYPE_WALK; - } - if(self.impulse == GRAPHOOK_FIRE && self.hook_time <= time && g_grappling_hook) - { - // fire hook - FireGrapplingHook(); - return; - } - else if(self.hookimpulse == GRAPHOOK_RELEASE) - { - // remove hook, reset movement type - RemoveGrapplingHook(self); - return; - } - */ - /*else // make sure the player's movetype is correct - { - //if(self.hook == world && self.movetype == MOVETYPE_FLY) - if((self.hook == world || !self.hook.state) && self.movetype == MOVETYPE_FLY) - { - self.movetype = MOVETYPE_WALK; - } - }*/ - // note: The hook entity does the actual pulling -} - void GrappleHookInit() { if(g_grappling_hook) @@ -492,7 +411,8 @@ void GrappleHookInit() } else { - WEP_ACTION(WEP_HOOK.m_id, WR_INIT); + Weapon w = WEP_HOOK; + w.wr_init(w); hook_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 1); hook_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 2); hook_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_HOOK.m_id), false, false, 3); @@ -501,7 +421,7 @@ void GrappleHookInit() } void SetGrappleHookBindings() -{ +{SELFPARAM(); // this function has been modified for Xonotic // don't remove these lines! old server or demos coud overwrite the new aliases stuffcmd(self, "alias +hook +button6\n");