r4771 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Oct 16 11:36:56 EDT 2008
Author: div0
Date: 2008-10-16 11:36:56 -0400 (Thu, 16 Oct 2008)
New Revision: 4771
Modified:
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_grenadelauncher.qc
Log:
use "airshot" for in-air mortar hit
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2008-10-16 13:51:55 UTC (rev 4770)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2008-10-16 15:36:56 UTC (rev 4771)
@@ -1093,7 +1093,8 @@
precache_sound ("player/slime.wav");
// announcer sounds - male
- //precache_sound ("announcer/male/electrobitch.wav");
+ precache_sound ("announcer/male/electrobitch.wav");
+ precache_sound ("announcer/male/airshot.wav");
precache_sound ("announcer/male/03kills.wav");
precache_sound ("announcer/male/05kills.wav");
precache_sound ("announcer/male/10kills.wav");
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2008-10-16 13:51:55 UTC (rev 4770)
+++ trunk/data/qcsrc/server/w_electro.qc 2008-10-16 15:36:56 UTC (rev 4771)
@@ -15,6 +15,13 @@
pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1);
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);
@@ -35,7 +42,6 @@
void W_Plasma_Touch (void)
{
- entity o;
if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
{
sound (self, CHAN_PROJECTILE, "misc/null.wav", VOL_BASE, ATTN_NORM);
@@ -43,12 +49,7 @@
return;
}
if (other.takedamage == DAMAGE_AIM) {
- o = self.owner;
W_Plasma_Explode ();
- if(other.classname == "player")
- if(IsDifferentTeam(o, other))
- if(IsFlying(other))
- announce(o, "announcer/male/electrobitch.ogg");
} else {
sound (self, CHAN_PROJECTILE, "weapons/electro_bounce.wav", VOL_BASE, ATTN_NORM);
self.projectiledeathtype |= HITTYPE_BOUNCE;
@@ -66,11 +67,6 @@
}
o = self.owner;
W_Plasma_Explode ();
- if(other.takedamage == DAMAGE_AIM)
- if(other.classname == "player")
- if(IsDifferentTeam(o, other))
- if(IsFlying(other))
- announce(o, "announcer/male/electrobitch.ogg");
}
void W_Plasma_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-10-16 13:51:55 UTC (rev 4770)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-10-16 15:36:56 UTC (rev 4771)
@@ -8,6 +8,12 @@
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");
+
remove (self);
}
@@ -21,6 +27,12 @@
self.event_damage = SUB_Null;
RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_secondary_damage"), cvar("g_balance_grenadelauncher_secondary_edgedamage"), cvar("g_balance_grenadelauncher_secondary_radius"), world, cvar("g_balance_grenadelauncher_secondary_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");
+
remove (self);
}
@@ -42,7 +54,9 @@
return;
}
if (other.takedamage == DAMAGE_AIM)
+ {
self.use ();
+ }
else
{
float r;
More information about the nexuiz-commits
mailing list