r4257 - in trunk/data: . qcsrc/client qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Aug 30 10:02:18 EDT 2008
Author: div0
Date: 2008-08-30 10:02:16 -0400 (Sat, 30 Aug 2008)
New Revision: 4257
Modified:
trunk/data/effectinfo.txt
trunk/data/qcsrc/client/laser.qc
trunk/data/qcsrc/server/g_triggers.qc
Log:
laser: add a dlight to the end; improve effect; effect is now laser_deadly or none, depending on laser's .dmg
Modified: trunk/data/effectinfo.txt
===================================================================
--- trunk/data/effectinfo.txt 2008-08-30 11:53:20 UTC (rev 4256)
+++ trunk/data/effectinfo.txt 2008-08-30 14:02:16 UTC (rev 4257)
@@ -175,7 +175,7 @@
alpha 256 256 0
originjitter 6 6 6
// dust/smoke drifting away from the impact
-effect TE_SPIKE
+effect TE_SUPERSPIKE
count 8
type smoke
tex 0 8
@@ -1984,7 +1984,7 @@
-effect misc_laser_beam
+effect nex242_misc_laser_beam
countabsolute 1
type beam
tex 60 60
@@ -1993,7 +1993,7 @@
color 0xff0000 0xff0000
sizeincrease 1
-effect misc_laser_beam_end
+effect nex242_misc_laser_beam_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2006,7 +2006,7 @@
-effect misc_laser_beam_fast
+effect nex242_misc_laser_beam_fast
countabsolute 1
type beam
tex 60 60
@@ -2015,7 +2015,7 @@
color 0xff0000 0xff0000
sizeincrease 0.1
-effect misc_laser_beam_fast_end
+effect nex242_misc_laser_beam_fast_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2027,7 +2027,7 @@
velocitymultiplier 100
// additional laser colors (mike)
-effect misc_laser_green_beam
+effect nex242_misc_laser_green_beam
countabsolute 1
type beam
tex 60 60
@@ -2036,7 +2036,7 @@
color 0x00ff00 0x00ff00
sizeincrease 1
-effect misc_laser_green_beam_end
+effect nex242_misc_laser_green_beam_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2047,7 +2047,7 @@
velocityjitter 64 64 64
velocitymultiplier 100
-effect misc_laser_blue_beam
+effect nex242_misc_laser_blue_beam
countabsolute 1
type beam
tex 60 60
@@ -2056,7 +2056,7 @@
color 0x0000ff 0x0000ff
sizeincrease 1
-effect misc_laser_blue_beam_end
+effect nex242_misc_laser_blue_beam_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2067,7 +2067,7 @@
velocityjitter 64 64 64
velocitymultiplier 100
-effect misc_laser_yellow_beam
+effect nex242_misc_laser_yellow_beam
countabsolute 1
type beam
tex 60 60
@@ -2076,7 +2076,7 @@
color 0xffff00 0xffff00
sizeincrease 1
-effect misc_laser_yellow_beam_end
+effect nex242_misc_laser_yellow_beam_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2087,7 +2087,7 @@
velocityjitter 64 64 64
velocitymultiplier 100
-effect misc_laser_cyan_beam
+effect nex242_misc_laser_cyan_beam
countabsolute 1
type beam
tex 60 60
@@ -2096,7 +2096,7 @@
color 0x00ffff 0x00ffff
sizeincrease 1
-effect misc_laser_cyan_beam_end
+effect nex242_misc_laser_cyan_beam_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2107,7 +2107,7 @@
velocityjitter 64 64 64
velocitymultiplier 100
-effect misc_laser_magenta_beam
+effect nex242_misc_laser_magenta_beam
countabsolute 1
type beam
tex 60 60
@@ -2116,7 +2116,7 @@
color 0xff00ff 0xff00ff
sizeincrease 1
-effect misc_laser_magenta_beam_end
+effect nex242_misc_laser_magenta_beam_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2127,7 +2127,7 @@
velocityjitter 64 64 64
velocitymultiplier 100
-effect misc_laser_white_beam
+effect nex242_misc_laser_white_beam
countabsolute 1
type beam
tex 60 60
@@ -2136,7 +2136,7 @@
color 0xffffff 0xffffff
sizeincrease 1
-effect misc_laser_white_beam_end
+effect nex242_misc_laser_white_beam_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2147,7 +2147,7 @@
velocityjitter 64 64 64
velocitymultiplier 100
-effect misc_laser_black_beam
+effect nex242_misc_laser_black_beam
countabsolute 1
type beam
tex 60 60
@@ -2156,7 +2156,7 @@
color 0x000000 0x000000
sizeincrease 1
-effect misc_laser_black_beam_end
+effect nex242_misc_laser_black_beam_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2167,7 +2167,7 @@
velocityjitter 64 64 64
velocitymultiplier 100
-effect misc_laser_orange_beam
+effect nex242_misc_laser_orange_beam
countabsolute 1
type beam
tex 60 60
@@ -2176,7 +2176,7 @@
color 0xff6600 0xff6600
sizeincrease 1
-effect misc_laser_orange_beam_end
+effect nex242_misc_laser_orange_beam_end
count 1
type spark
color 0x8f4333 0xfff31b
@@ -2288,4 +2288,40 @@
//velocityoffset 0 0 120
velocityjitter 512 512 512
-
+// decal
+effect laser_deadly
+countabsolute 1
+type decal
+tex 56 59
+size 5 5
+alpha 256 256 0
+originjitter 6 6 6
+// dust/smoke drifting away from the impact
+effect laser_deadly
+count 0.05 // 50 per second
+type smoke
+tex 48 55
+color 0xFFFFFF 0xFFFFFF
+size 3 3
+alpha 0 64 64
+originjitter 1 1 1
+airfriction 7
+liquidfriction 16
+velocityjitter 15 15 15
+sizeincrease 2
+velocitymultiplier 20
+// sparks
+effect laser_deadly
+notunderwater
+count 0.05 // 50 per second
+type spark
+tex 40 40
+color 0xFDFFD9 0xFDFFD9
+size 0.6 0.6
+alpha 256 256 768
+gravity 1
+bounce 1
+airfriction 5
+originjitter 1 1 1
+velocityjitter 100 100 100
+velocitymultiplier 100
Modified: trunk/data/qcsrc/client/laser.qc
===================================================================
--- trunk/data/qcsrc/client/laser.qc 2008-08-30 11:53:20 UTC (rev 4256)
+++ trunk/data/qcsrc/client/laser.qc 2008-08-30 14:02:16 UTC (rev 4257)
@@ -102,7 +102,10 @@
{
Draw_CylindricLine(self.origin, trace_endpos, 2, "particles/laserbeam", 0, time * 3, self.colormod, 0.5, DRAWFLAG_ADDITIVE); // TODO make a texture to make the laser look smoother
}
- pointparticles(self.cnt, trace_endpos, trace_plane_normal, 256 * drawframetime);
+ if(self.cnt >= 0)
+ pointparticles(self.cnt, trace_endpos, trace_plane_normal, drawframetime * 1000);
+ if(self.colormod != '0 0 0')
+ R_AddDynamicLight(trace_endpos + trace_plane_normal * 1, 50, self.colormod * 5);
}
void Ent_Laser()
@@ -127,7 +130,7 @@
self.alpha = ReadByte() / 255.0;
else
self.alpha = 0;
- self.cnt = ReadShort(); // effect number
+ self.cnt = ReadShort() - 1; // effect number
}
if(f & 2)
{
Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc 2008-08-30 11:53:20 UTC (rev 4256)
+++ trunk/data/qcsrc/server/g_triggers.qc 2008-08-30 14:02:16 UTC (rev 4257)
@@ -839,7 +839,7 @@
WriteByte(MSG_ENTITY, self.colormod_z * 255.0);
if(fl & 0x40)
WriteByte(MSG_ENTITY, self.alpha * 255.0);
- WriteShort(MSG_ENTITY, self.cnt);
+ WriteShort(MSG_ENTITY, self.cnt + 1);
}
if(fl & 2)
{
@@ -883,14 +883,16 @@
{
if(self.mdl)
{
- self.cnt = particleeffectnum(strcat(self.mdl, "_end"));
- if(self.cnt < 0)
- self.cnt = particleeffectnum(self.mdl);
+ self.cnt = particleeffectnum(self.mdl);
}
- else
+ else if(!self.cnt)
{
- self.cnt = particleeffectnum("misc_laser_beam_end");
+ if(self.dmg)
+ self.cnt = particleeffectnum("laser_deadly");
+ else
+ self.cnt = -1;
}
+
if(self.colormod == '0 0 0')
if(!self.alpha)
self.colormod = '1 0 0';
More information about the nexuiz-commits
mailing list