[nexuiz-commits] r6541 - in trunk/data: . qcsrc/client qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-19 15:30:25 -0400 (Sun, 19 Apr 2009)
New Revision: 6541

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/effectinfo.txt
   trunk/data/qcsrc/client/projectile.qc
   trunk/data/qcsrc/server/constants.qh
   trunk/data/update-cvarcount.sh
Log:
crylink trail


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-04-19 19:27:03 UTC (rev 6540)
+++ trunk/data/defaultNexuiz.cfg	2009-04-19 19:30:25 UTC (rev 6541)
@@ -24,7 +24,7 @@
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default cfaa3e6ce44a23e5563db2d3ee7c53e4
+set cvar_check_default 875aa1bdc75e7c2ec5df622b78e08dcf
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible

Modified: trunk/data/effectinfo.txt
===================================================================
--- trunk/data/effectinfo.txt	2009-04-19 19:27:03 UTC (rev 6540)
+++ trunk/data/effectinfo.txt	2009-04-19 19:30:25 UTC (rev 6541)
@@ -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: trunk/data/qcsrc/client/projectile.qc
===================================================================
--- trunk/data/qcsrc/client/projectile.qc	2009-04-19 19:27:03 UTC (rev 6540)
+++ trunk/data/qcsrc/client/projectile.qc	2009-04-19 19:30:25 UTC (rev 6541)
@@ -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: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-04-19 19:27:03 UTC (rev 6540)
+++ trunk/data/qcsrc/server/constants.qh	2009-04-19 19:30:25 UTC (rev 6541)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "cfaa3e6ce44a23e5563db2d3ee7c53e4";
+string CVAR_CHECK_DEFAULT = "875aa1bdc75e7c2ec5df622b78e08dcf";
 string CVAR_CHECK_WEAPONS = "00219e78f5d78d7d8a1600c4f4c73aa5";
 
 float	FALSE					= 0;

Modified: trunk/data/update-cvarcount.sh
===================================================================
--- trunk/data/update-cvarcount.sh	2009-04-19 19:27:03 UTC (rev 6540)
+++ trunk/data/update-cvarcount.sh	2009-04-19 19:30:25 UTC (rev 6541)
@@ -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