From 212e24a9d5df8372b4ba323cca803214dfa59f33 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 30 Oct 2008 10:28:10 +0000 Subject: [PATCH] move airshot and electrobitch to a place where they should actually work git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4940 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/w_electro.qc | 12 ++++++------ data/qcsrc/server/w_grenadelauncher.qc | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/qcsrc/server/w_electro.qc b/data/qcsrc/server/w_electro.qc index 502ca9caa..e66ccc495 100644 --- a/data/qcsrc/server/w_electro.qc +++ b/data/qcsrc/server/w_electro.qc @@ -4,6 +4,12 @@ void W_Plasma_Explode (void) vector org2; org2 = findbetterlocation (self.origin, 8); + if(other.takedamage == DAMAGE_AIM) + if(other.classname == "player") + if(IsDifferentTeam(self.owner, other)) + if(IsFlying(other)) + announce(self.owner, "announcer/male/electrobitch.ogg"); + self.event_damage = SUB_Null; if (self.movetype == MOVETYPE_BOUNCE) { @@ -16,12 +22,6 @@ void W_Plasma_Explode (void) RadiusDamage (self, self.owner, cvar("g_balance_electro_primary_damage"), cvar("g_balance_electro_primary_edgedamage"), cvar("g_balance_electro_primary_radius"), world, cvar("g_balance_electro_primary_force"), self.projectiledeathtype, other); } - if(other.takedamage == DAMAGE_AIM) - if(other.classname == "player") - if(IsDifferentTeam(self.owner, other)) - if(IsFlying(other)) - announce(self.owner, "announcer/male/electrobitch.ogg"); - sound (self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM); remove (self); diff --git a/data/qcsrc/server/w_grenadelauncher.qc b/data/qcsrc/server/w_grenadelauncher.qc index 7dc88b32b..2ce8bbda6 100644 --- a/data/qcsrc/server/w_grenadelauncher.qc +++ b/data/qcsrc/server/w_grenadelauncher.qc @@ -5,15 +5,15 @@ void W_Grenade_Explode (void) pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1); sound (self, CHAN_PROJECTILE, "weapons/grenade_impact.wav", VOL_BASE, ATTN_NORM); - self.event_damage = SUB_Null; - RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_primary_damage"), cvar("g_balance_grenadelauncher_primary_edgedamage"), cvar("g_balance_grenadelauncher_primary_radius"), world, cvar("g_balance_grenadelauncher_primary_force"), self.projectiledeathtype, other); - if(other.takedamage == DAMAGE_AIM) if(other.classname == "player") if(IsDifferentTeam(self.owner, other)) if(IsFlying(other)) announce(self.owner, "announcer/male/airshot.ogg"); + self.event_damage = SUB_Null; + RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_primary_damage"), cvar("g_balance_grenadelauncher_primary_edgedamage"), cvar("g_balance_grenadelauncher_primary_radius"), world, cvar("g_balance_grenadelauncher_primary_force"), self.projectiledeathtype, other); + remove (self); } -- 2.39.2