[nexuiz-commits] r7470 - in trunk/data: . qcsrc/server sound/weapons
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Aug 19 10:25:05 EDT 2009
Author: tzork
Date: 2009-08-19 10:25:05 -0400 (Wed, 19 Aug 2009)
New Revision: 7470
Added:
trunk/data/sound/weapons/nexwhoosh1.ogg
trunk/data/sound/weapons/nexwhoosh2.ogg
trunk/data/sound/weapons/nexwhoosh3.ogg
Modified:
trunk/data/effectinfo.txt
trunk/data/qcsrc/server/w_common.qc
trunk/data/qcsrc/server/w_minstanex.qc
trunk/data/qcsrc/server/w_nex.qc
Log:
Team colored minstanex beams & flyby sound for near misses with nex and minstanex.
Modified: trunk/data/effectinfo.txt
===================================================================
--- trunk/data/effectinfo.txt 2009-08-19 13:20:39 UTC (rev 7469)
+++ trunk/data/effectinfo.txt 2009-08-19 14:25:05 UTC (rev 7470)
@@ -3622,3 +3622,211 @@
airfriction 3
liquidfriction 6
velocityjitter 400 400 0
+
+// Team / hit minsta effects
+effect TE_TEI_G3RED
+countabsolute 1
+type beam
+tex 60 60
+color 0xFF0000 0xFF0000
+size 4 4
+alpha 128 128 256
+// experimental
+effect TE_TEI_G3RED
+trailspacing 4
+type static
+color 0x200000 0x400000
+size 0.3 0.3
+sizeincrease 3
+tex 46 46
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+velocityjitter 3 3 3
+type smoke
+
+effect TE_TEI_G3RED_HIT
+countabsolute 1
+type beam
+tex 60 60
+color 0xFF0000 0xFF0000
+size 8 8
+alpha 128 128 256
+// experimental
+effect TE_TEI_G3RED_HIT
+trailspacing 10
+type static
+color 0xFFFFFF 0xFF0011
+size 2 2
+sizeincrease -2
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+velocityjitter 2 2 2
+type smoke
+// rings
+effect TE_TEI_G3RED_HIT
+trailspacing 20
+type static
+color 0xFF0000 0xFF0011
+size 10 10
+sizeincrease -6
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+type smoke
+
+effect TE_TEI_G3BLUE
+countabsolute 1
+type beam
+tex 60 60
+color 0x0000FF 0x1100FF
+size 4 4
+alpha 128 128 256
+// experimental
+effect TE_TEI_G3BLUE
+trailspacing 4
+type static
+color 0x000020 0x000040
+size 0.3 0.3
+sizeincrease 3
+tex 46 46
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+velocityjitter 3 3 3
+type smoke
+
+effect TE_TEI_G3BLUE_HIT
+countabsolute 1
+type beam
+tex 60 60
+color 0x0000FF 0x1100FF
+size 8 8
+alpha 128 128 256
+// experimental
+effect TE_TEI_G3BLUE_HIT
+trailspacing 10
+type static
+color 0xFFFFFF 0x100FF
+size 2 2
+sizeincrease -2
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+velocityjitter 2 2 2
+type smoke
+// rings
+effect TE_TEI_G3BLUE_HIT
+trailspacing 20
+type static
+color 0x0000FF 0x1100FF
+size 10 10
+sizeincrease -6
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+type smoke
+
+// Yellow
+effect TE_TEI_G3YELLOW
+countabsolute 1
+type beam
+tex 60 60
+color 0xffff00 0xffff11
+size 4 4
+alpha 128 128 256
+effect TE_TEI_G3YELLOW
+trailspacing 4
+type static
+color 0x202000 0x404000
+size 0.3 0.3
+sizeincrease 3
+tex 46 46
+alpha 256 256 512
+airfriction -4
+velocityjitter 3 3 3
+type smoke
+
+effect TE_TEI_G3YELLOW_HIT
+countabsolute 1
+type beam
+tex 60 60
+color 0xffff00 0xffff11
+size 8 8
+alpha 128 128 256
+effect TE_TEI_G3YELLOW_HIT
+trailspacing 10
+type static
+color 0xFFFFFF 0xffff10
+size 2 2
+sizeincrease -2
+alpha 256 256 512
+airfriction -4
+velocityjitter 2 2 2
+type smoke
+// rings
+effect TE_TEI_G3YELLOW_HIT
+trailspacing 20
+type static
+color 0xffff00 0xffff11
+size 10 10
+sizeincrease -6
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+type smoke
+
+
+// Pink
+effect TE_TEI_G3PINK
+countabsolute 1
+type beam
+tex 60 60
+color 0xFF00FF 0xFF11FF
+size 4 4
+alpha 128 128 256
+// experimental
+effect TE_TEI_G3PINK
+trailspacing 4
+type static
+color 0x200020 0x400040
+size 0.3 0.3
+sizeincrease 3
+tex 46 46
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+velocityjitter 3 3 3
+type smoke
+
+effect TE_TEI_G3PINK_HIT
+countabsolute 1
+type beam
+tex 60 60
+color 0xFF00FF 0xFF11FF
+size 8 8
+alpha 128 128 256
+// experimental
+effect TE_TEI_G3PINK_HIT
+trailspacing 10
+type static
+color 0xFFFFFF 0xFF10FF
+size 2 2
+sizeincrease -2
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+velocityjitter 2 2 2
+type smoke
+// rings
+effect TE_TEI_G3PINK_HIT
+trailspacing 20
+type static
+color 0xFF00FF 0xFF11FF
+size 10 10
+sizeincrease -6
+alpha 256 256 512
+airfriction -4
+//liquidfriction -4
+type smoke
\ No newline at end of file
Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc 2009-08-19 13:20:39 UTC (rev 7469)
+++ trunk/data/qcsrc/server/w_common.qc 2009-08-19 14:25:05 UTC (rev 7470)
@@ -34,6 +34,8 @@
local float endq3surfaceflags;
//local entity explosion;
float did_hit;
+ float length,step;
+ string snd;
did_hit = 0;
@@ -77,6 +79,34 @@
endent = trace_ent;
endq3surfaceflags = trace_dphitq3surfaceflags;
+ // Find all players the beam passed close by
+ length = vlen(start - endpoint);
+ for(step = 0; step < length; step += 16)
+ {
+ ent = findradius(start + dir * step,128);
+ while(ent)
+ {
+ if(clienttype(ent) == CLIENTTYPE_REAL)
+
+ if(ent != self)
+ ent.ticrate = 1;
+
+ ent = ent.chain;
+ }
+ }
+
+ // And play a flyby sound to them
+ ent = findchainfloat(ticrate,1);
+ while(ent)
+ {
+ snd = "weapons/nexwhoosh";
+ snd = strcat(snd,ftos(rint(random() * 2) +1));
+ snd = strcat(snd,".ogg");
+ play2(ent, snd);
+ ent.ticrate = 0;
+ ent = ent.chain;
+ }
+
// find all the entities the railgun hit and restore their solid state
ent = findfloat(world, railgunhit, TRUE);
while (ent)
Modified: trunk/data/qcsrc/server/w_minstanex.qc
===================================================================
--- trunk/data/qcsrc/server/w_minstanex.qc 2009-08-19 13:20:39 UTC (rev 7469)
+++ trunk/data/qcsrc/server/w_minstanex.qc 2009-08-19 14:25:05 UTC (rev 7470)
@@ -37,8 +37,40 @@
pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
- // beam effect
- trailparticles(world, particleeffectnum("TE_TEI_G3"), w_shotorg, trace_endpos);
+ // teamcolor / hit beam effect
+ if(teamplay)
+ {
+ switch(self.team)
+ {
+ case COLOR_TEAM1: // Red
+ if(damage_goodhits)
+ trailparticles(world, particleeffectnum("TE_TEI_G3RED_HIT"), w_shotorg, trace_endpos);
+ else
+ trailparticles(world, particleeffectnum("TE_TEI_G3RED"), w_shotorg, trace_endpos);
+ break;
+ case COLOR_TEAM2: // Blue
+ if(damage_goodhits)
+ trailparticles(world, particleeffectnum("TE_TEI_G3BLUE_HIT"), w_shotorg, trace_endpos);
+ else
+ trailparticles(world, particleeffectnum("TE_TEI_G3BLUE"), w_shotorg, trace_endpos);
+ break;
+ case COLOR_TEAM3: // Yellow
+ if(damage_goodhits)
+ trailparticles(world, particleeffectnum("TE_TEI_G3YELLOW_HIT"), w_shotorg, trace_endpos);
+ else
+ trailparticles(world, particleeffectnum("TE_TEI_G3YELLOW"), w_shotorg, trace_endpos);
+ break;
+ case COLOR_TEAM4: // Pink
+ if(damage_goodhits)
+ trailparticles(world, particleeffectnum("TE_TEI_G3PINK_HIT"), w_shotorg, trace_endpos);
+ else
+ trailparticles(world, particleeffectnum("TE_TEI_G3PINK"), w_shotorg, trace_endpos);
+ break;
+ }
+ }
+ else
+ trailparticles(world, particleeffectnum("TE_TEI_G3"), w_shotorg, trace_endpos);
+
// flash and burn the wall
if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))
Damage_DamageInfo(trace_endpos, 10000, 0, 0, 800 * w_shotdir, WEP_MINSTANEX, self);
@@ -163,6 +195,9 @@
precache_model ("models/weapons/v_minstanex.md3");
precache_model ("models/weapons/h_minstanex.dpm");
precache_sound ("weapons/minstanexfire.wav");
+ precache_sound ("weapons/nexwhoosh1.ogg");
+ precache_sound ("weapons/nexwhoosh2.ogg");
+ precache_sound ("weapons/nexwhoosh3.ogg");
w_laser(WR_PRECACHE);
}
else if (req == WR_SETUP)
Modified: trunk/data/qcsrc/server/w_nex.qc
===================================================================
--- trunk/data/qcsrc/server/w_nex.qc 2009-08-19 13:20:39 UTC (rev 7469)
+++ trunk/data/qcsrc/server/w_nex.qc 2009-08-19 14:25:05 UTC (rev 7470)
@@ -58,6 +58,9 @@
precache_model ("models/weapons/v_nex.md3");
precache_model ("models/weapons/h_nex.dpm");
precache_sound ("weapons/nexfire.wav");
+ precache_sound ("weapons/nexwhoosh1.ogg");
+ precache_sound ("weapons/nexwhoosh2.ogg");
+ precache_sound ("weapons/nexwhoosh3.ogg");
}
else if (req == WR_SETUP)
weapon_setup(WEP_NEX);
Added: trunk/data/sound/weapons/nexwhoosh1.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/nexwhoosh1.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/weapons/nexwhoosh2.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/nexwhoosh2.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sound/weapons/nexwhoosh3.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sound/weapons/nexwhoosh3.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the nexuiz-commits
mailing list