X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=bde5e580a054b3912ceb0fe86f41f31c2b7607b3;hb=49af10f3413b96e52055359d42288dbf5ec6972b;hp=0437f804328410e2ebb609443c80d451c552241b;hpb=d18d82068eeb84edfe1703360fcda800cae4d0bb;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc index 0437f8043..bde5e580a 100644 --- a/qcsrc/server/g_hook.qc +++ b/qcsrc/server/g_hook.qc @@ -22,8 +22,8 @@ void GrapplingHookFrame(); void RemoveGrapplingHook(entity pl); void SetGrappleHookBindings(); // hook impulses -float GRAPHOOK_FIRE = 20; -float GRAPHOOK_RELEASE = 21; +const float GRAPHOOK_FIRE = 20; +const float GRAPHOOK_RELEASE = 21; // (note: you can change the hook impulse #'s to whatever you please) 4. Open client.c and add this to the top of PutClientInServer(): @@ -62,16 +62,24 @@ void RemoveGrapplingHook(entity pl) //pl.disableclientprediction = FALSE; } +void GrapplingHookReset(void) +{ + if(self.realowner.hook == self) + RemoveGrapplingHook(self.owner); + else // in any case: + remove(self); +} + void GrapplingHookThink(); void GrapplingHook_Stop() { pointparticles(particleeffectnum("grapple_impact"), self.origin, '0 0 0', 1); - sound (self, CH_SHOTS_SINGLE, "weapons/hook_impact.wav", VOL_BASE, ATTN_NORM); + sound (self, CH_SHOTS, "weapons/hook_impact.wav", VOL_BASE, ATTEN_NORM); self.state = 1; self.think = GrapplingHookThink; self.nextthink = time; - self.touch = SUB_Null; + self.touch = func_null; self.velocity = '0 0 0'; self.movetype = MOVETYPE_NONE; self.hook_length = -1; @@ -108,12 +116,12 @@ void GrapplingHookThink() { float spd, dist, minlength, pullspeed, ropestretch, ropeairfriction, rubberforce, newlength, rubberforce_overstretch, s; vector dir, org, end, v0, dv, v, myorg, vs; - if(self.realowner.health <= 0 || self.realowner.hook != self) // how did that happen? - { // well, better fix it anyway - remove(self); + if(self.realowner.hook != self) // how did that happen? + { + error("Owner lost the hook!\n"); return; } - if(LostMovetypeFollow(self)) + if(LostMovetypeFollow(self) || intermission_running || (round_handler_IsActive() && !round_handler_IsRoundStarted())) { RemoveGrapplingHook(self.realowner); return; @@ -202,13 +210,14 @@ void GrapplingHookThink() { v = v - dv * 0.5; self.aiment.velocity = self.aiment.velocity - dv * 0.5; - self.aiment.flags &~= FL_ONGROUND; + self.aiment.flags &= ~FL_ONGROUND; self.aiment.pusher = self.realowner; self.aiment.pushltime = time + autocvar_g_maxpushtime; + self.aiment.istypefrag = self.aiment.BUTTON_CHAT; } } - self.realowner.flags &~= FL_ONGROUND; + self.realowner.flags &= ~FL_ONGROUND; } self.realowner.velocity = WarpZone_RefSys_TransformVelocity(self, self.realowner, v); @@ -226,7 +235,7 @@ void GrapplingHookThink() self.realowner.velocity = dir*spd; self.realowner.movetype = MOVETYPE_FLY; - self.realowner.flags &~= FL_ONGROUND; + self.realowner.flags &= ~FL_ONGROUND; } } @@ -263,33 +272,35 @@ void GrapplingHookTouch (void) void GrapplingHook_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) { - if(self.health > 0) + if(self.health <= 0) + return; + + if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions + return; // g_balance_projectiledamage says to halt + + self.health = self.health - damage; + + if (self.health <= 0) { - self.health = self.health - damage; - if (self.health <= 0) + if(attacker != self.realowner) { - if(attacker != self.realowner) - { - self.realowner.pusher = attacker; - self.realowner.pushltime = time + autocvar_g_maxpushtime; - } - RemoveGrapplingHook(self.realowner); + self.realowner.pusher = attacker; + self.realowner.pushltime = time + autocvar_g_maxpushtime; + self.realowner.istypefrag = self.realowner.BUTTON_CHAT; } + RemoveGrapplingHook(self.realowner); } } void FireGrapplingHook (void) { - local entity missile; - local vector org; + entity missile; + vector org; float s; vector vs; - if((arena_roundbased && time < warmup) || (time < game_starttime)) - return; - - if(self.freezetag_frozen) - return; + if(forbidWeaponUse()) return; + if(self.vehicle) return; makevectors(self.v_angle); @@ -300,7 +311,7 @@ void FireGrapplingHook (void) 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, "weapons/hook_fire.wav", VOL_BASE, ATTN_NORM); + sound (self, CH_WEAPON_B, "weapons/hook_fire.wav", 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); @@ -311,7 +322,9 @@ void FireGrapplingHook (void) missile = WarpZone_RefSys_SpawnSameRefSys(self); missile.owner = missile.realowner = self; self.hook = missile; + missile.reset = GrapplingHookReset; missile.classname = "grapplinghook"; + missile.flags = FL_PROJECTILE; missile.movetype = MOVETYPE_FLY; PROJECTILE_MAKETRIGGER(missile); @@ -337,6 +350,7 @@ void FireGrapplingHook (void) missile.event_damage = GrapplingHook_Damage; missile.takedamage = DAMAGE_AIM; missile.damageforcescale = 0; + missile.damagedbycontents = (autocvar_g_balance_grapplehook_damagedbycontents); missile.hook_start = missile.hook_end = missile.origin; @@ -364,7 +378,7 @@ void FireGrapplingHook (void) void GrapplingHookFrame() { - if(g_grappling_hook && timeoutStatus != 2 && self.weapon != WEP_HOOK) + if(g_grappling_hook && timeout_status != TIMEOUT_ACTIVE && self.weapon != WEP_HOOK) { // offhand hook controls if(self.BUTTON_HOOK) @@ -378,19 +392,19 @@ void GrapplingHookFrame() else { self.hook_state |= HOOK_REMOVING; - self.hook_state &~= HOOK_WAITING_FOR_RELEASE; + self.hook_state &= ~HOOK_WAITING_FOR_RELEASE; } - self.hook_state &~= HOOK_RELEASING; + self.hook_state &= ~HOOK_RELEASING; if(self.BUTTON_CROUCH) { - self.hook_state &~= HOOK_PULLING; + self.hook_state &= ~HOOK_PULLING; //self.hook_state |= HOOK_RELEASING; } else { self.hook_state |= HOOK_PULLING; - //self.hook_state &~= HOOK_RELEASING; + //self.hook_state &= ~HOOK_RELEASING; } } else if(!(self.items & IT_JETPACK) && !g_grappling_hook && self.switchweapon != WEP_HOOK) @@ -402,7 +416,7 @@ void GrapplingHookFrame() if(!g_grappling_hook && self.weapon != WEP_HOOK) { - self.hook_state &~= HOOK_FIRING; + self.hook_state &= ~HOOK_FIRING; self.hook_state |= HOOK_REMOVING; } @@ -411,13 +425,13 @@ void GrapplingHookFrame() if (self.hook) RemoveGrapplingHook(self); FireGrapplingHook(); - self.hook_state &~= HOOK_FIRING; + self.hook_state &= ~HOOK_FIRING; } else if(self.hook_state & HOOK_REMOVING) { if (self.hook) RemoveGrapplingHook(self); - self.hook_state &~= HOOK_REMOVING; + self.hook_state &= ~HOOK_REMOVING; } /*