[nexuiz-commits] r6543 - in branches/nexuiz-2.0: . data data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-20 09:44:11 -0400 (Mon, 20 Apr 2009)
New Revision: 6543

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/effectinfo.txt
   branches/nexuiz-2.0/data/qcsrc/client/projectile.qc
   branches/nexuiz-2.0/data/update-cvarcount.sh
Log:
r6541 | div0 | 2009-04-19 21:30:25 +0200 (Sun, 19 Apr 2009) | 2 lines
crylink trail
r6542 | div0 | 2009-04-19 22:44:29 +0200 (Sun, 19 Apr 2009) | 2 lines
cvar check cvars were wrong...


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-04-19 20:44:29 UTC (rev 6542)
+++ branches/nexuiz-2.0/.patchsets	2009-04-20 13:44:11 UTC (rev 6543)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6536
+revisions_applied = 1-6536,6541-6542

Modified: branches/nexuiz-2.0/data/effectinfo.txt
===================================================================
--- branches/nexuiz-2.0/data/effectinfo.txt	2009-04-19 20:44:29 UTC (rev 6542)
+++ branches/nexuiz-2.0/data/effectinfo.txt	2009-04-20 13:44:11 UTC (rev 6543)
@@ -3208,3 +3208,31 @@
 velocityjitter 5 5 20
 //velocitymultiplier -20
 airfriction -1
+
+// crylink trail
+// plasma smoke
+// used in qcsrc/client/projectile.qc:			trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to)
+effect TR_CRYLINKPLASMA
+trailspacing 64
+type static
+color 0x5522aa 0x6622ff
+size 2 2
+sizeincrease 8
+tex 32 32
+alpha 256 256 1024
+velocityjitter 8 8 8
+//lightradius 90
+//lighttime 0
+//lightcolor 1 0 1
+velocitymultiplier -0.01
+// crylink main trail
+effect TR_CRYLINKPLASMA
+trailspacing 8
+type static
+color 0x5522aa 0x6622ff
+size 3 3
+sizeincrease 15
+tex 3 3
+alpha 256 256 2600
+velocityjitter 2 2 2
+velocitymultiplier 0.01

Modified: branches/nexuiz-2.0/data/qcsrc/client/projectile.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/projectile.qc	2009-04-19 20:44:29 UTC (rev 6542)
+++ branches/nexuiz-2.0/data/qcsrc/client/projectile.qc	2009-04-20 13:44:11 UTC (rev 6543)
@@ -29,6 +29,12 @@
 		case PROJECTILE_TAG:
 			trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to);
 			break;
+		case PROJECTILE_CRYLINK:
+			trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to);
+			break;
+		case PROJECTILE_CRYLINK_BOUNCING:
+			trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to);
+			break;
 		case PROJECTILE_ELECTRO_BEAM:
 			trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to);
 			break;

Modified: branches/nexuiz-2.0/data/update-cvarcount.sh
===================================================================
--- branches/nexuiz-2.0/data/update-cvarcount.sh	2009-04-19 20:44:29 UTC (rev 6542)
+++ branches/nexuiz-2.0/data/update-cvarcount.sh	2009-04-20 13:44:11 UTC (rev 6543)
@@ -9,11 +9,11 @@
 	exit 1
 fi
 
-sed -i "s/^set cvar_check_default .*/set cvar_check_default $countd/" defaultNexuiz.cfg
-sed -i "s/^set cvar_check_weapons .*/set cvar_check_weapons $countw/" weapons.cfg
-sed -i "s/^set cvar_check_weapons .*/set cvar_check_weapons $countw/" weaponsHavoc.cfg
+sed -i -e "s/^set cvar_check_default .*/set cvar_check_default $countd/" defaultNexuiz.cfg
+sed -i -e "s/^set cvar_check_weapons .*/set cvar_check_weapons $countw/" weapons.cfg
+sed -i -e "s/^set cvar_check_weapons .*/set cvar_check_weapons $countw/" weaponsHavoc.cfg
 
-sed "
+sed -e "
 	s/^string CVAR_CHECK_DEFAULT = .*/string CVAR_CHECK_DEFAULT = \"$countd\";/;
 	s/^string CVAR_CHECK_WEAPONS = .*/string CVAR_CHECK_WEAPONS = \"$countw\";/;
 " qcsrc/server/constants.qh > qcsrc/server/constants.qh.new