r4940 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Oct 30 06:28:12 EDT 2008
Author: div0
Date: 2008-10-30 06:28:10 -0400 (Thu, 30 Oct 2008)
New Revision: 4940
Modified:
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_grenadelauncher.qc
Log:
move airshot and electrobitch to a place where they should actually work
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2008-10-29 19:48:32 UTC (rev 4939)
+++ trunk/data/qcsrc/server/w_electro.qc 2008-10-30 10:28:10 UTC (rev 4940)
@@ -4,6 +4,12 @@
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 @@
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);
Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-10-29 19:48:32 UTC (rev 4939)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-10-30 10:28:10 UTC (rev 4940)
@@ -5,15 +5,15 @@
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);
}
More information about the nexuiz-commits
mailing list