Document the new character portraits

[voretournament/voretournament.git] / data / effectinfo.txt

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index ddea493a85e1afb07a2eb4767c2a4e23b53a1d5c..f1f7fbe0ba95c6c9f2503c6148c21c79ee05c79e 100644 (file)
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -26,7 +26,7 @@ velocityjitter 32 32 32
 \r
 // laser impact\r
 // decal\r
-// used in qcsrc/server/w_seeker.qc:   te_knightspike(org2)\r
+// used nowhere in code\r
 effect TE_KNIGHTSPIKE\r
 countabsolute 1\r
 type decal\r
@@ -58,8 +58,8 @@ liquidfriction 6
 //originjitter 32 32 32\r
 velocityjitter 256 256 256\r
 \r
-// machinegun bullet impact\r
-// bullet impact decal\r
+// bullet impact\r
+// decal\r
 // used nowhere in code\r
 effect TE_SPIKE\r
 countabsolute 1\r
@@ -102,7 +102,7 @@ bounce 1.5
 velocityoffset 0 0 80\r
 velocityjitter 64 64 64\r
 \r
-// electro combo explosion\r
+// electric combo explosion\r
 // decal\r
 // used nowhere in code\r
 effect TE_SPIKEQUAD\r
@@ -272,7 +272,7 @@ bounce 1.5
 velocityoffset 0 0 80\r
 velocityjitter 64 64 64\r
 \r
-// crylink impact effect\r
+// plasma impact effect\r
 // decal\r
 // used nowhere in code\r
 effect TE_GUNSHOTQUAD\r
@@ -305,7 +305,7 @@ bounce 1.5
 velocityoffset 0 0 80\r
 velocityjitter 128 128 128\r
 \r
-// mortar/hagar explosion (smaller than rocket)\r
+// small rocket explosion\r
 // decal\r
 // used in qcsrc/server/cl_client.qc:  te_explosion(org)\r
 effect TE_EXPLOSION\r
@@ -505,7 +505,7 @@ velocityoffset 0 0 80
 velocityjitter 64 64 64\r
 velocitymultiplier 1\r
 \r
-// nex impact\r
+// lightning impact\r
 // decal\r
 // used in qcsrc/server/bots.qc:               te_plasmaburn(org)\r
 effect TE_PLASMABURN\r
@@ -589,9 +589,8 @@ originoffset 0 0 28
 originjitter 16 16 28\r
 velocityjitter 0 0 256\r
 \r
-// nex beam\r
-// used in qcsrc/server/w_minstanex.qc:        trailparticles(world, particleeffectnum("TE_TEI_G3"), w_shotorg, trace_endpos)\r
-// used in qcsrc/client/particles.qc:          trailparticles(world, particleeffectnum("TE_TEI_G3"), shotorg, endpos)\r
+// lightning beam\r
+// used nowhere in code\r
 effect TE_TEI_G3\r
 countabsolute 1\r
 type beam\r
@@ -624,7 +623,7 @@ originjitter 1.5 1.5 1.5
 velocityjitter 6 6 6\r
 velocitymultiplier 1\r
 \r
-// rocket explosion (bigger than mortar and hagar)\r
+// rocket explosion\r
 // decal\r
 // used nowhere in code\r
 effect TE_TEI_BIGEXPLOSION\r
@@ -688,7 +687,7 @@ liquidfriction 0.8
 velocityoffset 0 0 80\r
 velocityjitter 384 384 384\r
 \r
-// electro explosion\r
+// electric explosion\r
 // decal\r
 // used nowhere in code\r
 effect TE_TEI_PLASMAHIT\r
@@ -739,25 +738,30 @@ velocityjitter 512 512 512
 // used in qcsrc/client/gibs.qc:       pointparticles(particleeffectnum("blood"), self.origin + '0 0 1', '0 0 30', 10)\r
 // used in qcsrc/client/gibs.qc:                       pointparticles(particleeffectnum("blood"), org, vel, amount * 16)\r
 effect blood\r
-count 0.333\r
-type blood\r
+count 0.4\r
+type spark\r
+blend invmod\r
 tex 24 32\r
-size 3 8\r
-alpha 256 256 64\r
+size 5 11\r
+alpha 1560 2560 7000\r
 color 0xA8FFFF 0xA8FFFFF\r
 bounce -1\r
-airfriction 1\r
-liquidfriction 4\r
-velocityjitter 64 64 64\r
-velocitymultiplier 5\r
+airfriction 0.4\r
+velocityjitter 99 99 55\r
+//velocitymultiplier 2\r
 staincolor 0x808080 0x808080\r
 staintex 16 24\r
+stainsize 1 2\r
+stretchfactor 20\r
+sizeincrease 20\r
 //blood mist\r
 effect blood\r
 countabsolute 1\r
 type alphastatic\r
-tex 0 8\r
+blend invmod\r
+tex 24 32\r
 size 25 30\r
+sizeincrease 20\r
 alpha 100 256 400\r
 color 0x000000 0x420000\r
 originjitter 11 11 11\r
@@ -786,26 +790,38 @@ stretchfactor 0.6
 // normal super gory blood trail (used by gibs)\r
 // used in qcsrc/client/gibs.qc:               trailparticles(self, particleeffectnum("TR_BLOOD"), oldorg, self.origin)\r
 effect TR_BLOOD\r
-trailspacing 16\r
-type blood\r
+trailspacing 20\r
+type spark\r
+blend invmod\r
 color 0xA8FFFF 0xA8FFFF\r
 tex 24 32\r
-size 8 8\r
-alpha 384 384 192\r
+size 4 19\r
+alpha 384 984 1492\r
 bounce -1\r
-airfriction 1\r
-liquidfriction 4\r
+gravity 0.4\r
+airfriction -2\r
+liquidfriction 1\r
 velocityjitter 64 64 64\r
-velocitymultiplier 0.5\r
+velocitymultiplier -0.1\r
 staincolor 0x808080 0x808080\r
 staintex 16 24\r
-\r
-\r
+stainsize 1 2\r
+stretchfactor 7\r
+sizeincrease -5\r
+// splash around gib\r
+effect TR_BLOOD\r
+trailspacing 42\r
+type blood\r
+color 0xA8FFFF 0xA8FFFF\r
+tex 24 32\r
+size 4 6\r
+alpha 684 684 7492\r
+sizeincrease 500\r
 \r
 // thinner blood trail (used by quake zombies)\r
 // used in qcsrc/client/gibs.qc:               trailparticles(self, particleeffectnum("TR_SLIGHTBLOOD"), oldorg, self.origin)\r
 effect TR_SLIGHTBLOOD\r
-trailspacing 32\r
+trailspacing 64\r
 type blood\r
 color 0xA8FFFF 0xA8FFFF\r
 tex 24 32\r
@@ -840,24 +856,63 @@ velocityjitter 32 32 0
 //lightcolor 0.4 0.9 0.9\r
 \r
 // flare particle and light\r
-// used in qcsrc/server/t_items.qc:    //pointparticles(particleeffectnum("item_respawn"), self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1)\r
+// used in qcsrc/server/cl_client.qc:  pointparticles(particleeffectnum("player_respawn"), self.origin, '0 0 0', 1);\r
+effect player_respawn\r
+countabsolute 1\r
+type static\r
+color 0xF263EA 0xF263EA\r
+size 48 48\r
+alpha 128 128 96\r
+lightradius 120\r
+lightradiusfade 60\r
+lightcolor 0.9 0.6 0.9\r
+// cloud of particles which expand rapidly and then slow to form a ball\r
+effect player_respawn\r
+count 256\r
+type spark\r
+tex 41 41\r
+color 0xF263EA 0xF263EA\r
+size 3 3\r
+alpha 256 256 512\r
+//originjitter 24 24 24\r
+velocityjitter 256 256 256\r
+// sparks flying and floating around\r
+effect player_respawn\r
+count 128\r
+type spark\r
+tex 40 40\r
+color 0x807aff 0x4463d5\r
+size 1 3\r
+alpha 0 256 128\r
+//gravity 1\r
+bounce 1.5\r
+originjitter 1 1 1\r
+velocityjitter 750 750 1250\r
+velocitymultiplier 0.5\r
+airfriction 2\r
+stretchfactor 0.6\r
+\r
+// flare particle and light\r
 // used in qcsrc/server/t_items.qc:    pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1)\r
 effect item_respawn\r
 countabsolute 1\r
 type static\r
-color 0x63F2EA 0x63f2EA\r
+color 0xF263EA 0xF263EA\r
 size 32 32\r
 alpha 128 128 128\r
+lightradius 80\r
+lightradiusfade 60\r
+lightcolor 0.9 0.6 0.9\r
 // cloud of particles which expand rapidly and then slow to form a ball\r
 effect item_respawn\r
-count 256\r
+count 128\r
 type spark\r
 tex 41 41\r
-color 0x63F2EA 0x63f2EA\r
+color 0xF263EA 0xF263EA\r
 size 2 2\r
-alpha 256 256 1280\r
+alpha 256 256 768\r
 //originjitter 24 24 24\r
-velocityjitter 256 256 256\r
+velocityjitter 192 192 192\r
 \r
 \r
 \r
@@ -869,9 +924,7 @@ lightcolor 2 2 2
 \r
 \r
 \r
-// used in qcsrc/server/w_hlac.qc:     pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-// used in qcsrc/server/w_hlac.qc:     pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-// used in qcsrc/server/w_laser.qc:    pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
+// used nowhere in code\r
 effect laser_muzzleflash\r
 count 1\r
 type smoke\r
@@ -936,9 +989,7 @@ sizeincrease 6
 \r
 \r
 \r
-// used in qcsrc/server/w_campingrifle.qc:     pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 2000, 1)\r
-// used in qcsrc/server/w_shotgun.qc:  pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_primary_ammo"))\r
-// used in qcsrc/server/w_shotgun.qc:  pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_secondary_ammo"))\r
+// used nowhere in code\r
 effect shotgun_muzzleflash\r
 count 3\r
 type smoke\r
@@ -971,7 +1022,7 @@ airfriction 5
 \r
 // shotgun pellet impact\r
 // decal\r
-// used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("shotgun_impact"), org2, backoff * 1000, 1)\r
+// used nowhere in code\r
 effect shotgun_impact\r
 countabsolute 1\r
 type decal\r
@@ -1023,8 +1074,8 @@ velocitymultiplier 0.1
 \r
 \r
 \r
-// used in qcsrc/server/w_uzi.qc:      pointparticles(particleeffectnum("uzi_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-effect uzi_muzzleflash\r
+// used nowhere in code\r
+effect machinegun_muzzleflash\r
 count 2\r
 type static\r
 color 0x202020 0x404040\r
@@ -1038,7 +1089,7 @@ lightradius 200
 lightradiusfade 2000\r
 lightcolor 2 1.5 0.2\r
 gravity -0.1\r
-effect uzi_muzzleflash\r
+effect machinegun_muzzleflash\r
 count 20\r
 type spark\r
 tex 40 40\r
@@ -1106,10 +1157,7 @@ velocitymultiplier 0.1
 \r
 \r
 \r
-// used in qcsrc/server/nexball.qc:    pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-// used in qcsrc/server/w_grenadelauncher.qc:  pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-// used in qcsrc/server/w_grenadelauncher.qc:  pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-// used in qcsrc/server/w_porto.qc:    //pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
+// used nowhere in code\r
 effect grenadelauncher_muzzleflash\r
 count 3\r
 type smoke\r
@@ -1138,10 +1186,9 @@ airfriction 12
 \r
 \r
 \r
-// hagar trail\r
+// small rocket trail\r
 // smoke\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_GRENADE"), from, to)\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_GRENADE"), from, to)\r
+// used nowhere in code\r
 effect TR_GRENADE\r
 trailspacing 6\r
 type alphastatic\r
@@ -1184,11 +1231,9 @@ velocityjitter 16 16 16
 \r
 \r
 \r
-// mortar trail\r
+// grenade trail\r
 // smoke\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to)\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to)\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to)\r
+// used nowhere in code\r
 effect TR_KNIGHTSPIKE // used for MF_TRACER2\r
 notunderwater\r
 trailspacing 5\r
@@ -1229,7 +1274,7 @@ velocityjitter 16 16 16
 \r
 \r
 // decal\r
-// used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1)\r
+// used nowhere in code\r
 effect grenade_explode\r
 countabsolute 1\r
 type decal\r
@@ -1317,9 +1362,8 @@ velocityjitter 224 224 324
 \r
 \r
 \r
-// used in qcsrc/server/w_electro.qc:  pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-// used in qcsrc/server/w_electro.qc:  pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-effect electro_muzzleflash\r
+// used nowhere in code\r
+effect electric_muzzleflash\r
 count 1\r
 type smoke\r
 color 0x283880 0x283880 // 0x202020 0x404040\r
@@ -1332,7 +1376,7 @@ velocitymultiplier 0.01
 lightradius 200\r
 lightradiusfade 2000\r
 lightcolor 1.5 3 6\r
-effect electro_muzzleflash\r
+effect electric_muzzleflash\r
 count 30\r
 type spark\r
 tex 31 31\r
@@ -1346,9 +1390,9 @@ airfriction 12
 \r
 \r
 \r
-// electro trail\r
+// electric trail\r
 // glowing vapor trail\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_VORETOURNAMENTPLASMA"), from, to)\r
+// used nowhere in code\r
 effect TR_VORETOURNAMENTPLASMA\r
 trailspacing 1\r
 type static\r
@@ -1380,8 +1424,8 @@ velocityjitter 50 50 50
 \r
 \r
 // decal\r
-// used in qcsrc/client/damage.qc:                                             pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1)\r
-effect electro_impact\r
+// used nowhere in code\r
+effect electric_impact\r
 countabsolute 1\r
 type decal\r
 tex 59 59\r
@@ -1392,7 +1436,7 @@ lightradius 250
 lightradiusfade 250\r
 lightcolor 3.125 4.375 10\r
 // flare effect\r
-effect electro_impact\r
+effect electric_impact\r
 countabsolute 1\r
 type static\r
 tex 38 38\r
@@ -1400,7 +1444,7 @@ color 0x80C0FF 0x80C0FF
 size 12 32\r
 alpha 256 256 512\r
 // cloud of bouncing sparks\r
-effect electro_impact\r
+effect electric_impact\r
 count 60\r
 type smoke\r
 tex 42 42\r
@@ -1414,7 +1458,7 @@ airfriction 6
 originjitter 1 1 1\r
 velocityjitter 512 512 512\r
 // inner cloud of smoke\r
-effect electro_impact\r
+effect electric_impact\r
 count 60\r
 type smoke\r
 color 0x629dff 0x0018ff\r
@@ -1427,8 +1471,8 @@ originjitter 20 20 20
 velocityjitter 320 320 320\r
 \r
 // decal\r
-// used in qcsrc/client/damage.qc:                                     pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1)\r
-effect electro_ballexplode\r
+// used nowhere in code\r
+effect electric_ballexplode\r
 countabsolute 1\r
 type decal\r
 tex 59 59\r
@@ -1439,7 +1483,7 @@ lightradius 250
 lightradiusfade 250\r
 lightcolor 3.125 4.375 10\r
 // flare effect\r
-effect electro_ballexplode\r
+effect electric_ballexplode\r
 countabsolute 1\r
 type static\r
 tex 38 38\r
@@ -1447,7 +1491,7 @@ color 0x80C0FF 0x80C0FF
 size 32 32\r
 alpha 256 256 512\r
 // cloud of bouncing sparks\r
-effect electro_ballexplode\r
+effect electric_ballexplode\r
 count 128\r
 type spark\r
 tex 41 41\r
@@ -1459,7 +1503,7 @@ bounce 2
 originjitter 1 1 1\r
 velocityjitter 512 512 512\r
 // inner cloud of smoke\r
-effect electro_ballexplode\r
+effect electric_ballexplode\r
 count 16\r
 type smoke\r
 color 0x202020 0x404040\r
@@ -1472,8 +1516,8 @@ velocityjitter 32 32 32
 \r
 \r
 // decal\r
-// used in qcsrc/client/damage.qc:                                             pointparticles(particleeffectnum("electro_combo"), org2, '0 0 0', 1)\r
-effect electro_combo\r
+// used nowhere in code\r
+effect electric_combo\r
 countabsolute 1\r
 type decal\r
 tex 59 59\r
@@ -1484,7 +1528,7 @@ lightradius 400
 lightradiusfade 300\r
 lightcolor 4 5 6\r
 // flare effect\r
-effect electro_combo\r
+effect electric_combo\r
 countabsolute 1\r
 type static\r
 tex 38 38\r
@@ -1492,7 +1536,7 @@ color 0x80C0FF 0x80C0FF
 size 48 48\r
 alpha 128 128 64\r
 // large sparks\r
-effect electro_combo\r
+effect electric_combo\r
 count 20\r
 type static\r
 color 0x2030FF 0x80C0FF\r
@@ -1503,7 +1547,7 @@ airfriction 6
 liquidfriction 16\r
 //velocityoffset 0 0 120\r
 velocityjitter 512 512 512\r
-effect electro_combo\r
+effect electric_combo\r
 count 64\r
 type spark\r
 tex 41 41\r
@@ -1515,7 +1559,7 @@ bounce 2
 originjitter 1 1 1\r
 velocityjitter 512 512 512\r
 // inner cloud of smoke\r
-effect electro_combo\r
+effect electric_combo\r
 count 0.25\r
 type smoke\r
 color 0x202020 0x404040\r
@@ -1527,9 +1571,8 @@ velocityjitter 32 32 32
 \r
 \r
 \r
-// used in qcsrc/server/w_crylink.qc:  pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots)\r
-// used in qcsrc/server/w_crylink.qc:  pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots)\r
-effect crylink_muzzleflash\r
+// used nowhere in code\r
+effect plasma_muzzleflash\r
 count 1\r
 type smoke\r
 color 0x202020 0x404040\r
@@ -1542,7 +1585,7 @@ velocitymultiplier 0.01
 lightradius 200\r
 lightradiusfade 2000\r
 lightcolor 1.6 0.2 2\r
-effect crylink_muzzleflash\r
+effect plasma_muzzleflash\r
 count 10\r
 type spark\r
 tex 40 40\r
@@ -1556,10 +1599,10 @@ airfriction 12
 \r
 \r
 \r
-// crylink impact effect\r
+// plasma impact effect\r
 // decal\r
-// used in qcsrc/client/damage.qc:                                     pointparticles(particleeffectnum("crylink_impact"), org2, '0 0 0', 1)\r
-effect crylink_impact\r
+// used nowhere in code\r
+effect plasma_impact\r
 countabsolute 1\r
 type decal\r
 tex 47 47\r
@@ -1570,7 +1613,7 @@ originjitter 12 12 12
 //lightradiusfade 300\r
 //lightcolor 3.2 0.4 4\r
 // purple flare effect\r
-effect crylink_impact\r
+effect plasma_impact\r
 countabsolute 1\r
 type static\r
 tex 39 39\r
@@ -1578,7 +1621,7 @@ color 0x504060 0x504060
 size 8 8\r
 alpha 256 256 512\r
 // purple sparks\r
-effect crylink_impact\r
+effect plasma_impact\r
 count 20\r
 type spark\r
 tex 41 41\r
@@ -1588,7 +1631,7 @@ size 4 4
 alpha 256 256 1024\r
 velocityjitter 256 256 256\r
 // purple splash\r
-effect crylink_impact\r
+effect plasma_impact\r
 count 3\r
 type static\r
 color 0xE070FF 0xE070FF\r
@@ -1596,7 +1639,7 @@ size 8 8
 alpha 256 256 512\r
 velocityjitter 8 8 8\r
 // purple splash\r
-effect crylink_impact\r
+effect plasma_impact\r
 count 3\r
 type static\r
 color 0xE070FF 0xE070FF\r
@@ -1606,9 +1649,8 @@ velocityjitter 32 32 32
 \r
 \r
 \r
-// used in qcsrc/server/w_minstanex.qc:        pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-// used in qcsrc/client/particles.qc:  pointparticles(particleeffectnum("nex_muzzleflash"), shotorg, normalize(endpos - shotorg) * 1000, 1)\r
-effect nex_muzzleflash\r
+// used nowhere in code\r
+effect lightning_muzzleflash\r
 count 10\r
 type smoke\r
 color 0x202020 0x404040\r
@@ -1621,7 +1663,7 @@ velocitymultiplier 0.02
 lightradius 200\r
 lightradiusfade 200\r
 lightcolor 2 2.5 3\r
-effect nex_muzzleflash\r
+effect lightning_muzzleflash\r
 count 150\r
 type spark\r
 tex 41 41\r
@@ -1635,17 +1677,17 @@ airfriction 9
 \r
 \r
 \r
-//// nex beam\r
-//effect nex_beam\r
+//// lightning beam\r
+//effect lightning_beam\r
 //countabsolute 1\r
 //type beam\r
 //tex 60 60\r
 //color 0xFFFFFF 0xFFFFFF\r
 //size 6 6\r
 //alpha 128 128 192\r
-// nex beam: ring smoke\r
-// used in qcsrc/client/particles.qc:          trailparticles(world, particleeffectnum("nex_beam"), shotorg, endpos)\r
-effect nex_beam\r
+// lightning beam: ring smoke\r
+// used nowhere in code\r
+effect lightning_beam\r
 trailspacing 32\r
 color 0x1680A0 0x1680A0\r
 size 4 4\r
@@ -1654,8 +1696,8 @@ alpha 64 128 64
 airfriction 5\r
 sizeincrease 2\r
 type static\r
-// nex beam: drifting smoke\r
-effect nex_beam\r
+// lightning beam: drifting smoke\r
+effect lightning_beam\r
 trailspacing 6\r
 color 0x5080A0 0x5080A0\r
 size 1 1\r
@@ -1665,8 +1707,8 @@ airfriction 9
 sizeincrease 8\r
 velocityjitter 64 64 64\r
 type static\r
-// nex beam: bright core\r
-effect nex_beam\r
+// lightning beam: bright core\r
+effect lightning_beam\r
 trailspacing 6\r
 color 0x80CDFF 0x80CDFF\r
 size 4 4\r
@@ -1674,7 +1716,7 @@ size 4 4
 alpha 256 256 1280\r
 type static\r
 //sparks\r
-effect nex_beam\r
+effect lightning_beam\r
 trailspacing 8\r
 color 0x1680A0 0x1680A0\r
 size 1 1\r
@@ -1684,11 +1726,10 @@ airfriction 5
 gravity -0.01\r
 type snow\r
 \r
-// nex impact\r
+// lightning impact\r
 // decal\r
-// used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1)\r
-// used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1)\r
-effect nex_impact\r
+// used nowhere in code\r
+effect lightning_impact\r
 countabsolute 1\r
 type decal\r
 tex 47 47\r
@@ -1699,7 +1740,7 @@ lightradius 200
 lightradiusfade 250\r
 lightcolor 4 6 8\r
 // shockwave\r
-effect nex_impact\r
+effect lightning_impact\r
 countabsolute 1\r
 type static\r
 tex 34 34\r
@@ -1709,7 +1750,7 @@ sizeincrease 200
 \r
 \r
 // flare effect\r
-effect nex_impact\r
+effect lightning_impact\r
 countabsolute 1\r
 type static\r
 tex 37 37\r
@@ -1717,7 +1758,7 @@ color 0x80C0FF 0x80C0FF
 size 8 8\r
 alpha 256 256 256\r
 // small sparks which form a sphere as they slow down\r
-//effect nex_impact\r
+//effect lightning_impact\r
 //count 256\r
 //type spark\r
 //color 0x2030FF 0x80C0FF\r
@@ -1728,7 +1769,7 @@ alpha 256 256 256
 //liquidfriction 8\r
 //velocityjitter 384 384 384\r
 // small sparks which glow brightly but live briefly\r
-effect nex_impact\r
+effect lightning_impact\r
 count 128\r
 type spark\r
 tex 41 41\r
@@ -1742,10 +1783,8 @@ airfriction 9
 \r
 \r
 \r
-// used in qcsrc/server/w_hagar.qc:    pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-// used in qcsrc/server/w_hagar.qc:    pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-// used in qcsrc/server/w_seeker.qc:   pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
-effect hagar_muzzleflash\r
+// used nowhere in code\r
+effect small_rocket_muzzleflash\r
 count 4\r
 type smoke\r
 color 0x202020 0x404040\r
@@ -1758,7 +1797,7 @@ velocitymultiplier 0.01
 lightradius 200\r
 lightradiusfade 2000\r
 lightcolor 2 1.5 0.2\r
-effect hagar_muzzleflash\r
+effect small_rocket_muzzleflash\r
 count 30\r
 type spark\r
 tex 40 40\r
@@ -1772,8 +1811,8 @@ airfriction 12
 \r
 \r
 \r
-// used in qcsrc/server/w_hagar.qc:            pointparticles(particleeffectnum("hagar_bounce"), self.origin, self.velocity, 1)\r
-effect hagar_bounce\r
+// used nowhere in code\r
+effect small_rocket_bounce\r
 count 4\r
 type smoke\r
 color 0x202020 0x404040\r
@@ -1786,7 +1825,7 @@ velocitymultiplier 0.01
 lightradius 60\r
 lightradiusfade 300\r
 lightcolor 2 1.5 0.2\r
-effect hagar_bounce\r
+effect small_rocket_bounce\r
 count 30\r
 type spark\r
 tex 40 40\r
@@ -1803,10 +1842,8 @@ airfriction 12
 \r
 \r
 // decal\r
-// used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1)\r
-// used in qcsrc/client/damage.qc:                                             pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1)\r
-// used in qcsrc/client/damage.qc:                                             pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1)\r
-effect hagar_explode\r
+// used nowhere in code\r
+effect small_rocket_explode\r
 countabsolute 1\r
 type decal\r
 tex 8 16\r
@@ -1817,7 +1854,7 @@ lightradius 120
 lightradiusfade 400\r
 lightcolor 8 4 1\r
 // fire effect which make bright dot inside\r
-effect hagar_explode\r
+effect small_rocket_explode\r
 notunderwater\r
 count 10\r
 type smoke\r
@@ -1832,7 +1869,7 @@ liquidfriction 8
 originjitter 8 8 8\r
 velocityjitter 156 156 156\r
 // fire effect which expands then slows\r
-effect hagar_explode\r
+effect small_rocket_explode\r
 notunderwater\r
 count 24\r
 type static\r
@@ -1848,7 +1885,7 @@ originjitter 8 8 8
 velocityjitter 286 286 286\r
 \r
 // smoke\r
-effect hagar_explode\r
+effect small_rocket_explode\r
 type alphastatic\r
 notunderwater\r
 tex 0 8\r
@@ -1862,7 +1899,7 @@ color 0x000000 0x111111
 bounce 2\r
 \r
 // underwater bubbles\r
-effect hagar_explode\r
+effect small_rocket_explode\r
 underwater\r
 count 32\r
 type bubble\r
@@ -1876,7 +1913,7 @@ liquidfriction 0.25
 originjitter 16 16 16\r
 velocityjitter 96 96 96\r
 // bouncing sparks\r
-effect hagar_explode\r
+effect small_rocket_explode\r
 notunderwater\r
 count 16\r
 type spark\r
@@ -1893,7 +1930,7 @@ velocityjitter 256 256 256
 \r
 \r
 \r
-// used in qcsrc/server/w_rocketlauncher.qc:   pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)\r
+// used nowhere in code\r
 effect rocketlauncher_muzzleflash\r
 count 20\r
 type smoke\r
@@ -1925,10 +1962,7 @@ airfriction 12
 \r
 // rocket trail\r
 // smoke\r
-// used in qcsrc/server/cl_client.qc:          self.modelflags |= MF_ROCKET\r
-// used in qcsrc/server/cl_client.qc:          self.modelflags &~= MF_ROCKET\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_ROCKET"), from, to)\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_ROCKET"), from, to)\r
+// used nowhere in code\r
 effect TR_ROCKET\r
 trailspacing 5\r
 type alphastatic\r
@@ -1987,7 +2021,7 @@ originjitter 1 1 1
 velocityjitter 100 100 100\r
 velocitymultiplier -0.31\r
 \r
-// rocket explosion (bigger than mortar and hagar)\r
+// rocket explosion\r
 effect rocket_explode\r
 countabsolute 1\r
 type decal\r
@@ -2073,24 +2107,238 @@ velocityjitter 256 256 256
 \r
 \r
 \r
-// used in qcsrc/server/g_grabber.qc:  pointparticles(particleeffectnum("grapple_muzzleflash"), org, '0 0 0', 1)\r
-effect grapple_muzzleflash\r
+// used in qcsrc/server/g_grabber.qc:  pointparticles(particleeffectnum("grabber_muzzleflash"), org, '0 0 0', 1)\r
+effect grabber_muzzleflash\r
 lightradius 160\r
-lightradiusfade 800\r
-lightcolor 1 0 0\r
-\r
-\r
+lightradiusfade 600\r
+lightcolor 0 0.8 1\r
+effect grabber_muzzleflash\r
+count 30\r
+type spark\r
+tex 31 31\r
+color 0xD9FDFF 0xD9FDFF\r
+size 3 3\r
+alpha 0 128 512\r
+originjitter 1 1 1\r
+velocityjitter 300 300 300\r
+velocitymultiplier 0.5\r
+airfriction 12\r
+effect grabber_muzzleflash\r
+countabsolute 5\r
+type alphastatic\r
+tex 0 8\r
+size 1 3\r
+sizeincrease 5\r
+alpha 50 128 50\r
+gravity -0.02\r
+color 0x000000 0x44ccff\r
+originjitter 5 5 5\r
 \r
 // used in qcsrc/server/g_grabber.qc:  pointparticles(particleeffectnum("grabber_impact"), self.origin, '0 0 0', 1)\r
+// decal\r
 effect grabber_impact\r
-lightradius 160\r
-lightradiusfade 800\r
-lightcolor 1 0 0\r
+countabsolute 1\r
+type decal\r
+tex 47 47\r
+size 10 10\r
+alpha 256 256 0\r
+originjitter 14 14 14\r
+lightradius 90\r
+lightradiusfade 480\r
+lightcolor 0 2 4\r
+rotate -180 180 0 0\r
+// rotating something\r
+effect grabber_impact\r
+count 5\r
+type smoke\r
+tex 46 46\r
+color 0x1680A0 0x1680A0\r
+size 18 24\r
+sizeincrease 15\r
+alpha 55 55 65\r
+rotate 90 -90 250 -250\r
+// shockwave\r
+effect grabber_impact\r
+countabsolute 1\r
+type static\r
+tex 33 33\r
+color 0x1680A0 0x1680A0\r
+size 12 12\r
+alpha 50 50 400\r
+sizeincrease 450\r
+// shockwave2\r
+effect grabber_impact\r
+countabsolute 1\r
+type static\r
+tex 65 65\r
+color 0x1680A0 0x1680A0\r
+size 5 5\r
+alpha 50 50 100\r
+sizeincrease 250\r
+// flare effect\r
+effect grabber_impact\r
+countabsolute 1\r
+type static\r
+tex 37 37\r
+color 0x80C0FF 0x80C0FF\r
+size 8 8\r
+alpha 256 256 128\r
+// small sparks which form a sphere as they slow down\r
+//effect grabber_impact\r
+//count 128\r
+//type spark\r
+//color 0x2030FF 0x80C0FF\r
+//size 1 2\r
+//alpha 256 256 512\r
+//bounce 2\r
+//airfriction 8\r
+//liquidfriction 8\r
+//velocityjitter 384 384 384\r
+// small sparks which glow brightly but live briefly\r
+effect grabber_impact\r
+count 32\r
+type spark\r
+tex 41 41\r
+color 0xD9FDFF 0xD9FDFF\r
+size 2 2\r
+alpha 0 128 512\r
+bounce 2\r
+stretchfactor 3\r
+velocityjitter 600 600 600\r
+velocitymultiplier 0.5\r
+airfriction 9\r
+// small sparks that live longer\r
+effect grabber_impact\r
+count 8\r
+type spark\r
+tex 41 41\r
+color 0xD9FDFF 0xD9FDFF\r
+size 1 1\r
+alpha 255 255 112\r
+bounce 1.6\r
+stretchfactor 0.7\r
+velocityjitter 300 300 600\r
+velocitymultiplier 2.5\r
+airfriction 2\r
+gravity 1\r
+\r
+// used in qcsrc/server/w_grabber.qc:  pointparticles(particleeffectnum("grabber_impact2"), trace_endpos, '0 0 0', 1);\r
+// decal\r
+effect grabber_impact2\r
+countabsolute 1\r
+type decal\r
+tex 47 47\r
+size 18 18\r
+alpha 256 256 0\r
+originjitter 14 14 14\r
+lightradius 180\r
+lightradiusfade 240\r
+lightcolor 0 2 4\r
+rotate -180 180 0 0\r
+// rotating something\r
+effect grabber_impact2\r
+count 15\r
+type smoke\r
+tex 46 46\r
+color 0x1680A0 0x1680A0\r
+size 20 26\r
+sizeincrease 15\r
+alpha 55 55 50\r
+rotate 180 -180 500 -500\r
+// shockwave\r
+effect grabber_impact2\r
+countabsolute 1\r
+type static\r
+tex 33 33\r
+color 0x1680A0 0x1680A0\r
+size 16 16\r
+alpha 50 50 400\r
+sizeincrease 900\r
+// shockwave2\r
+effect grabber_impact2\r
+countabsolute 1\r
+type static\r
+tex 65 65\r
+color 0x1680A0 0x1680A0\r
+size 7 7\r
+alpha 50 50 100\r
+sizeincrease 500\r
+// flare effect\r
+effect grabber_impact2\r
+countabsolute 1\r
+type static\r
+tex 37 37\r
+color 0x80C0FF 0x80C0FF\r
+size 14 14\r
+alpha 256 256 64\r
+// small sparks which form a sphere as they slow down\r
+//effect grabber_impact2\r
+//count 128\r
+//type spark\r
+//color 0x2030FF 0x80C0FF\r
+//size 1 2\r
+//alpha 256 256 512\r
+//bounce 2\r
+//airfriction 8\r
+//liquidfriction 8\r
+//velocityjitter 384 384 384\r
+// small sparks which glow brightly but live briefly\r
+effect grabber_impact2\r
+count 64\r
+type spark\r
+tex 41 41\r
+color 0xD9FDFF 0xD9FDFF\r
+size 4 4\r
+alpha 0 128 512\r
+bounce 2\r
+stretchfactor 3\r
+velocityjitter 600 600 600\r
+velocitymultiplier 0.5\r
+airfriction 9\r
+// small sparks that live longer\r
+effect grabber_impact2\r
+count 24\r
+type spark\r
+tex 41 41\r
+color 0xD9FDFF 0xD9FDFF\r
+size 2 2\r
+alpha 255 255 112\r
+bounce 1.6\r
+stretchfactor 0.7\r
+velocityjitter 300 300 600\r
+velocitymultiplier 2.5\r
+airfriction 2\r
+gravity 1\r
+\r
+// used in qcsrc/server/cl_weaponsystem.qc:    pointparticles(particleeffectnum("grabber_reload"), org, '0 0 0', 1);\r
+effect grabber_reload\r
+count 10\r
+type blood\r
+tex 24 32\r
+size 2 4\r
+alpha 512 512 128\r
+color 0xFF9900 0x994400\r
+bounce -1\r
+airfriction 1\r
+liquidfriction 4\r
+velocityjitter 128 128 32\r
+velocitymultiplier 5\r
+color 0xFF9900 0x994400\r
+staintex 16 24\r
+//blood mist\r
+effect grabber_reload\r
+countabsolute 5\r
+type alphastatic\r
+tex 0 8\r
+size 4 5\r
+alpha 100 256 400\r
+color 0xFF9900 0x994400\r
+originjitter 4 4 4\r
 \r
 \r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_beam\r
+effect lightning242_misc_laser_beam\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2100,7 +2348,7 @@ color 0xff0000 0xff0000
 sizeincrease 1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_beam_end\r
+effect lightning242_misc_laser_beam_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2114,7 +2362,7 @@ velocitymultiplier 100
 \r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_beam_fast\r
+effect lightning242_misc_laser_beam_fast\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2124,7 +2372,7 @@ color 0xff0000 0xff0000
 sizeincrease 0.1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_beam_fast_end\r
+effect lightning242_misc_laser_beam_fast_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2137,7 +2385,7 @@ velocitymultiplier 100
 \r
 // additional laser colors (mike)\r
 // used nowhere in code\r
-effect nex242_misc_laser_green_beam\r
+effect lightning242_misc_laser_green_beam\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2147,7 +2395,7 @@ color 0x00ff00 0x00ff00
 sizeincrease 1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_green_beam_end\r
+effect lightning242_misc_laser_green_beam_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2159,7 +2407,7 @@ velocityjitter 64 64 64
 velocitymultiplier 100\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_blue_beam\r
+effect lightning242_misc_laser_blue_beam\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2169,7 +2417,7 @@ color 0x0000ff 0x0000ff
 sizeincrease 1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_blue_beam_end\r
+effect lightning242_misc_laser_blue_beam_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2181,7 +2429,7 @@ velocityjitter 64 64 64
 velocitymultiplier 100\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_yellow_beam\r
+effect lightning242_misc_laser_yellow_beam\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2191,7 +2439,7 @@ color 0xffff00 0xffff00
 sizeincrease 1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_yellow_beam_end\r
+effect lightning242_misc_laser_yellow_beam_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2203,7 +2451,7 @@ velocityjitter 64 64 64
 velocitymultiplier 100\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_cyan_beam\r
+effect lightning242_misc_laser_cyan_beam\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2213,7 +2461,7 @@ color 0x00ffff 0x00ffff
 sizeincrease 1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_cyan_beam_end\r
+effect lightning242_misc_laser_cyan_beam_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2225,7 +2473,7 @@ velocityjitter 64 64 64
 velocitymultiplier 100\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_magenta_beam\r
+effect lightning242_misc_laser_magenta_beam\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2235,7 +2483,7 @@ color 0xff00ff 0xff00ff
 sizeincrease 1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_magenta_beam_end\r
+effect lightning242_misc_laser_magenta_beam_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2247,7 +2495,7 @@ velocityjitter 64 64 64
 velocitymultiplier 100\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_white_beam\r
+effect lightning242_misc_laser_white_beam\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2257,7 +2505,7 @@ color 0xffffff 0xffffff
 sizeincrease 1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_white_beam_end\r
+effect lightning242_misc_laser_white_beam_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2269,7 +2517,7 @@ velocityjitter 64 64 64
 velocitymultiplier 100\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_black_beam\r
+effect lightning242_misc_laser_black_beam\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2279,7 +2527,7 @@ color 0x000000 0x000000
 sizeincrease 1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_black_beam_end\r
+effect lightning242_misc_laser_black_beam_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2291,7 +2539,7 @@ velocityjitter 64 64 64
 velocitymultiplier 100\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_orange_beam\r
+effect lightning242_misc_laser_orange_beam\r
 countabsolute 1\r
 type beam\r
 tex 60 60\r
@@ -2301,7 +2549,7 @@ color 0xff6600 0xff6600
 sizeincrease 1\r
 \r
 // used nowhere in code\r
-effect nex242_misc_laser_orange_beam_end\r
+effect lightning242_misc_laser_orange_beam_end\r
 count 1\r
 type spark\r
 color 0x8f4333 0xfff31b\r
@@ -2315,10 +2563,10 @@ velocitymultiplier 100
 \r
 \r
 \r
-// bigger crylink impact effect\r
+// bigger plasma impact effect\r
 // decal\r
-// used in qcsrc/client/damage.qc:                                     pointparticles(particleeffectnum("crylink_impactbig"), org2, '0 0 0', 1)\r
-effect crylink_impactbig\r
+// used nowhere in code\r
+effect plasma_impactbig\r
 countabsolute 1\r
 type decal\r
 tex 47 47\r
@@ -2329,7 +2577,7 @@ originjitter 12 12 12
 //lightradiusfade 800\r
 //lightcolor 3.2 0.4 4\r
 // purple flare effect\r
-effect crylink_impactbig\r
+effect plasma_impactbig\r
 countabsolute 1\r
 type static\r
 tex 39 39\r
@@ -2337,7 +2585,7 @@ color 0x504060 0x504060
 size 24 24\r
 alpha 256 256 512\r
 // purple sparks\r
-effect crylink_impactbig\r
+effect plasma_impactbig\r
 count 80\r
 type spark\r
 tex 41 41\r
@@ -2347,7 +2595,7 @@ size 6 6
 alpha 256 256 1024\r
 velocityjitter 512 512 512\r
 // purple splash\r
-effect crylink_impactbig\r
+effect plasma_impactbig\r
 count 3\r
 type static\r
 color 0xE070FF 0xE070FF\r
@@ -2355,7 +2603,7 @@ size 16 16
 alpha 256 256 512\r
 velocityjitter 32 32 32\r
 // purple splash\r
-effect crylink_impactbig\r
+effect plasma_impactbig\r
 count 6\r
 type static\r
 color 0xE070FF 0xE070FF\r
@@ -2541,8 +2789,8 @@ color 0x7cbaff 0xcfd1ff
 velocitymultiplier 2\r
 \r
 // decal\r
-// used in qcsrc/client/damage.qc:                             pointparticles(particleeffectnum("grabberbomb_explode"), org2, '0 0 0', 1)\r
-effect grabberbomb_explode\r
+// used nowhere in code\r
+effect bomb_explode\r
 count 50\r
 type static\r
 tex 38 38\r
@@ -2557,7 +2805,7 @@ velocityjitter 550 550 550
 //velocitymultiplier -20\r
 airfriction 10\r
 // decal in the air\r
-effect grabberbomb_explode\r
+effect bomb_explode\r
 countabsolute 3\r
 type static\r
 tex 38 38\r
@@ -2567,7 +2815,7 @@ alpha 256 265 100
 sizeincrease -60\r
 originoffset 0 0 6\r
 // decal on the ground\r
-effect grabberbomb_explode\r
+effect bomb_explode\r
 countabsolute 1\r
 type decal\r
 tex 39 39\r
@@ -2575,7 +2823,7 @@ size 80 100
 alpha 256 256 0\r
 originjitter 6 6 6\r
 // some sparks\r
-effect grabberbomb_explode\r
+effect bomb_explode\r
 count 60\r
 type spark\r
 tex 38 38\r
@@ -3032,10 +3280,9 @@ velocitymultiplier 20
 velocityoffset 0 0 10\r
 airfriction 1\r
 \r
-// port-o-launch trail\r
+// portal trail\r
 // glowing vapor trail\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to)\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to)\r
+// used nowhere in code\r
 effect TR_WIZSPIKE\r
 trailspacing 2\r
 type static\r
@@ -3066,8 +3313,7 @@ velocityjitter 50 50 50
 \r
 // TAG trail\r
 // glowing vapor trail\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to)\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to)\r
+// used nowhere in code\r
 effect TR_VORESPIKE\r
 trailspacing 2\r
 type static\r
@@ -3096,7 +3342,7 @@ airfriction 12
 originjitter 1 1 1\r
 velocityjitter 50 50 50\r
 \r
-// used in qcsrc/client/damage.qc:                                     pointparticles(particleeffectnum("flac_explode"), org2, '0 0 0', 1)\r
+// used nowhere in code\r
 effect flac_explode\r
 countabsolute 1\r
 type decal\r
@@ -3212,11 +3458,10 @@ velocityjitter 5 5 20
 //velocitymultiplier -20\r
 airfriction -1\r
 \r
-// crylink trail\r
+// plasma trail\r
 // plasma smoke\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to)\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to)\r
-effect TR_CRYLINKPLASMA\r
+// used nowhere in code\r
+effect TR_plasmaPLASMA\r
 trailspacing 64\r
 type static\r
 color 0x5522aa 0x6622ff\r
@@ -3229,8 +3474,8 @@ velocityjitter 8 8 8
 //lighttime 0\r
 //lightcolor 1 0 1\r
 velocitymultiplier -0.01\r
-// crylink main trail\r
-effect TR_CRYLINKPLASMA\r
+// plasma main trail\r
+effect TR_plasmaPLASMA\r
 trailspacing 8\r
 type static\r
 color 0x5522aa 0x6622ff\r
@@ -3258,86 +3503,147 @@ tex 40 40
 //lighttime 0\r
 \r
 effect alien_blood\r
-count 0.333\r
-type blood\r
+count 0.4\r
+type spark\r
+blend invmod\r
 tex 24 32\r
-size 3 8\r
-alpha 256 256 64\r
+size 5 11\r
+alpha 1560 2560 7000\r
 color 0xDC9BCD 0xDC9BCD\r
 bounce -1\r
-airfriction 1\r
-liquidfriction 4\r
-velocityjitter 64 64 64\r
-velocitymultiplier 5\r
-staincolor 0x808080 0x808080\r
+airfriction 0.4\r
+velocityjitter 99 99 55\r
+//velocitymultiplier 2\r
+staincolor 0xDC9BCD 0xDC9BCD\r
 staintex 16 24\r
+stainsize 1 2\r
+stretchfactor 25\r
+sizeincrease 20\r
 //blood mist\r
 effect alien_blood\r
 countabsolute 1\r
-type alphastatic\r
-tex 0 8\r
+type smoke\r
+blend invmod\r
+tex 24 32\r
 size 25 30\r
-alpha 100 256 400\r
-color 0x000000 0x204010\r
+sizeincrease 20\r
+alpha 3000 5560 12000\r
+color 0xDC9BCD 0xDC9BCD\r
 originjitter 11 11 11\r
 \r
 effect robot_blood\r
-count 0.333\r
-type blood\r
-tex 24 32\r
-size 3 8\r
+count 0.167\r
+type spark\r
+tex 70 70\r
+size 1 2\r
 alpha 256 256 64\r
-color 0xC0D890 0xC0D890\r
+color 0xff3000 0xff7373\r
 bounce -1\r
+gravity 1\r
 airfriction 1\r
 liquidfriction 4\r
-velocityjitter 64 64 64\r
-velocitymultiplier 5\r
-staincolor 0x808080 0x808080\r
-staintex 16 24\r
-//blood mist\r
+velocityjitter 264 264 264\r
+velocityoffset 0 0 100\r
+//shockwave\r
 effect robot_blood\r
 countabsolute 1\r
-type alphastatic\r
-tex 0 8\r
-size 25 30\r
-alpha 100 256 400\r
-color 0x000000 0x301860\r
+type smoke\r
+tex 74 74\r
+size 2 2\r
+alpha 0 90 1000\r
+color 0xff8400 0xffbb72\r
 originjitter 11 11 11\r
+sizeincrease 800\r
+// electo sparcks\r
+effect robot_blood\r
+count 0.1\r
+type smoke\r
+tex 71 73\r
+size 20 40\r
+alpha 256 256 5120\r
+color 0xff3000 0xff8585\r
+originjitter 41 41 21\r
+rotate -180 180 4000 -4000\r
+\r
 \r
 \r
 effect alien_TR_BLOOD\r
-trailspacing 16\r
-type blood\r
+trailspacing 20\r
+type spark\r
+blend invmod\r
 color 0xC080B0 0xC080B0\r
 tex 24 32\r
-size 8 8\r
-alpha 384 384 192\r
+size 4 19\r
+alpha 384 984 1492\r
 bounce -1\r
-airfriction 1\r
-liquidfriction 4\r
+gravity 0.4\r
+airfriction -2\r
+liquidfriction 1\r
 velocityjitter 64 64 64\r
-velocitymultiplier 0.5\r
-staincolor 0x808080 0x808080\r
+velocitymultiplier -0.1\r
+staincolor 0xC080B0 0xC080B0\r
 staintex 16 24\r
+stainsize 1 2\r
+stretchfactor 7\r
+sizeincrease -5\r
+// splash around gib\r
+effect TR_BLOOD\r
+trailspacing 42\r
+type blood\r
+color 0xA8FFFF 0xA8FFFF\r
+tex 24 32\r
+size 4 6\r
+alpha 684 684 7492\r
+sizeincrease 500\r
 \r
 effect robot_TR_BLOOD\r
 trailspacing 16\r
-type blood\r
+type spark\r
+blend invmod\r
 color 0xC0D890 0xC0D890\r
 tex 24 32\r
-size 8 8\r
-alpha 384 384 192\r
+size 4 13\r
+alpha 384 984 1892\r
 bounce -1\r
-airfriction 1\r
-liquidfriction 4\r
+gravity 0.4\r
+airfriction -2\r
+liquidfriction 1\r
 velocityjitter 64 64 64\r
-velocitymultiplier 0.5\r
+velocitymultiplier -0.3\r
 staincolor 0x808080 0x808080\r
 staintex 16 24\r
+stainsize 1 3\r
+stretchfactor 6\r
+sizeincrease -6\r
+// fire\r
+effect robot_TR_BLOOD\r
+notunderwater\r
+trailspacing 16\r
+type spark\r
+tex 48 55\r
+color 0x902010 0xff3600\r
+size 5 20\r
+alpha 128 256 900\r
+gravity -1\r
+airfriction 4\r
+liquidfriction 4\r
+stretchfactor 5\r
+sizeincrease 10\r
+velocityjitter 44 44 44\r
+// arcs\r
+effect robot_TR_BLOOD\r
+trailspacing 128\r
+type smoke\r
+tex 71 73\r
+color 0xff3000 0xff8585\r
+size 25 30\r
+alpha 1128 1256 44900\r
+rotate -180 180 4000 -4000\r
+velocityjitter 44 44 44\r
+\r
 \r
 effect alien_TR_SLIGHTBLOOD\r
-trailspacing 32\r
+trailspacing 64\r
 type blood\r
 color 0xC080B0 0xC080B0\r
 tex 24 32\r
@@ -3352,7 +3658,7 @@ staincolor 0x808080 0x808080
 staintex 16 24\r
 \r
 effect robot_TR_SLIGHTBLOOD\r
-trailspacing 32\r
+trailspacing 64\r
 type blood\r
 color 0xC0D890 0xC0D890\r
 tex 24 32\r
@@ -3371,7 +3677,7 @@ staintex 16 24
 effect item_pickup\r
 countabsolute 1\r
 type static\r
-color 0x63F2EA 0xB0C5C4\r
+color 0xF263EA 0xC5B0C4\r
 size 8 16\r
 alpha 128 64 64\r
 // cloud of particles which expand rapidly and then slow to form a ball\r
@@ -3379,57 +3685,108 @@ effect item_pickup
 count 64\r
 type spark\r
 tex 41 41\r
-color 0x63F2EA 0xB0C5C4\r
+color 0xF263EA 0xC5B0C4\r
 size 1 1\r
 alpha 256 256 1280\r
 //originjitter 24 24 24\r
 velocityjitter 256 256 256\r
 \r
 effect bloodshower\r
-countabsolute 1\r
-type blood\r
+count 125\r
+type spark\r
+blend invmod\r
 tex 24 32\r
-size 8 8\r
+size 8 28\r
 color 0xA8FFFF 0xA8FFFFF\r
-alpha 256 256 64\r
+alpha 156 656 1664\r
 bounce -1\r
-airfriction 1\r
+gravity 1\r
+stretchfactor 3\r
 liquidfriction 4\r
-velocityjitter 64 64 64\r
-velocitymultiplier 1\r
+velocityjitter 764 764 764\r
+// velocitymultiplier 1\r
 staincolor 0x808080 0x808080\r
 staintex 16 24\r
+stainsize 1 2\r
+// center blood\r
+effect bloodshower\r
+countabsolute 0.1\r
+type smoke\r
+blend invmod\r
+tex 24 32\r
+size 1 28\r
+sizeincrease 300\r
+originjitter 50 50 50\r
+color 0xA8FFFF 0xA8FFFFF\r
+alpha 156 656 1664\r
 \r
 effect alien_bloodshower\r
-countabsolute 1\r
-type blood\r
+count 125\r
+type spark\r
+blend invmod\r
 tex 24 32\r
-size 8 8\r
+size 8 28\r
 color 0xC080B0 0xC080B0\r
-alpha 256 256 64\r
+alpha 156 656 1664\r
 bounce -1\r
-airfriction 1\r
+gravity 1\r
+stretchfactor 3\r
 liquidfriction 4\r
-velocityjitter 64 64 64\r
-velocitymultiplier 1\r
-staincolor 0x808080 0x808080\r
+velocityjitter 764 764 764\r
+// velocitymultiplier 1\r
+staincolor 0xC080B0 0xC080B0\r
 staintex 16 24\r
+stainsize 1 2\r
+// center blood\r
+effect bloodshower\r
+countabsolute 0.1\r
+type smoke\r
+blend invmod\r
+tex 24 32\r
+size 1 28\r
+sizeincrease 300\r
+originjitter 50 50 50\r
+color 0xA8FFFF 0xA8FFFFF\r
+alpha 156 656 1664\r
+\r
 \r
 effect robot_bloodshower\r
-countabsolute 1\r
-type blood\r
+count 100\r
+type spark\r
+blend invmod\r
 tex 24 32\r
-size 8 8\r
+size 8 28\r
 color 0xC0D890 0xC0D890\r
-alpha 256 256 64\r
+alpha 156 656 1664\r
 bounce -1\r
-airfriction 1\r
+gravity 1\r
+stretchfactor 3\r
 liquidfriction 4\r
-velocityjitter 64 64 64\r
-velocitymultiplier 1\r
-staincolor 0x808080 0x808080\r
+velocityjitter 764 764 764\r
+// velocitymultiplier 1\r
+staincolor 0xC0D890 0xC0D890\r
 staintex 16 24\r
-\r
+stainsize 1 2\r
+// arc\r
+effect robot_bloodshower\r
+count 2.5\r
+type smoke\r
+tex 71 73\r
+color 0xff3000 0xff8585\r
+size 25 40\r
+alpha 1128 1256 4200\r
+rotate -180 180 99 -99\r
+velocityjitter 44 44 44\r
+originjitter 150 150 150\r
+// shockwave\r
+effect robot_bloodshower\r
+count 2.5\r
+type smoke\r
+tex 74 74\r
+color 0xff3000 0xff8585\r
+size 5 50\r
+sizeincrease 3000\r
+alpha 11 125 990\r
 \r
 //red_ground_quake\r
 //smoke\r
@@ -3861,7 +4218,7 @@ type smoke
 // core decal\r
 effect particlegibs_damage_hit\r
 type blood\r
-count 1\r
+count 0.5\r
 tex 0 8\r
 size 5 10\r
 color 0xA8FFFF 0xA8FFFFF\r
@@ -3876,7 +4233,7 @@ staintex 16 24
 // front blood\r
 effect particlegibs_damage_hit\r
 type blood\r
-count 0.2\r
+count 0.1\r
 tex 24 32\r
 size 10 20\r
 color 0xA8FFFF 0xA8FFFFF\r
@@ -3893,7 +4250,7 @@ staintex 16 24
 // back blood\r
 effect particlegibs_damage_hit\r
 type blood\r
-count 0.2\r
+count 0.1\r
 tex 24 32\r
 size 5 15\r
 color 0xA8FFFF 0xA8FFFFF\r
@@ -3917,7 +4274,7 @@ staintex 16 24
 // small core blood no decals\r
 effect particlegibs_damage_dissolve\r
 type blood\r
-count 64\r
+count 32\r
 tex 0 8\r
 size 15 20\r
 color 0x00ffff 0x82ffff\r
@@ -3932,7 +4289,7 @@ staintex 16 24
 // core decal\r
 effect particlegibs_damage_dissolve\r
 type blood\r
-count 24\r
+count 12\r
 tex 0 8\r
 size 20 40\r
 color 0xA8FFFF 0xA8FFFFF\r
@@ -3948,7 +4305,7 @@ staintex 16 24
 // front blood\r
 effect particlegibs_damage_dissolve\r
 type blood\r
-count 64\r
+count 32\r
 tex 24 32\r
 size 10 20\r
 color 0xA8FFFF 0xA8FFFFF\r
@@ -3966,7 +4323,7 @@ staintex 16 24
 // back blood\r
 effect particlegibs_damage_dissolve\r
 type blood\r
-count 64\r
+count 32\r
 tex 24 32\r
 size 5 15\r
 color 0xA8FFFF 0xA8FFFFF\r
@@ -3984,7 +4341,7 @@ staintex 16 24
 // small bits\r
 effect particlegibs_damage_dissolve\r
 type blood\r
-count 150\r
+count 75\r
 tex 24 32\r
 size 1 1\r
 color 0xA8FFFF 0xA8FFFFF\r
@@ -4283,7 +4640,7 @@ velocityjitter 1 1 1
 velocitymultiplier 10\r
 stretchfactor 0.7\r
 \r
-// rocket explosion (bigger than mortar and hagar)\r
+// rocket explosion\r
 // decal\r
 // used nowhere in code\r
 effect fireball_explode\r
@@ -4460,8 +4817,7 @@ lightradiusfade 10000
 lightcolor 0.9 0.9 0.2\r
 \r
 // rifle bullet trail (somewhat like a tracer)\r
-// used in qcsrc/server/w_common.qc:                           zcurveparticles_from_tracetoss(particleeffectnum("tr_bullet"), self.origin, trace_endpos, self.velocity)\r
-// used in qcsrc/client/projectile.qc:                 trailparticles(self, particleeffectnum("tr_bullet"), from, to)\r
+// used nowhere in code\r
 effect tr_rifle\r
 trailspacing 128\r
 type spark\r
@@ -4545,23 +4901,6 @@ velocityjitter 256 256 256
 velocitymultiplier -0.1\r
 \r
 \r
-// gauntlet laser\r
-// based off morphed's cl_gentle\r
-// used in qcsrc/server/w_laser.qc\r
-effect laser_gauntlet\r
-tex 43 43\r
-count 3\r
-type spark\r
-color 0xff00ff 0xff0000\r
-size 4 8\r
-sizeincrease 34\r
-alpha 128 128 292\r
-gravity 0\r
-airfriction 5\r
-liquidfriction 10\r
-velocityjitter 50 50 50\r
-\r
-\r
 //torch flame, spawn it as fast as you can  20 times per second or more, supports direction but not required\r
 //fast fire\r
 // used nowhere in code, meant for maps\r
@@ -4631,26 +4970,108 @@ velocitymultiplier 20
 velocityoffset 0 0 10\r
 airfriction 1\r
 \r
-effect regurgitate\r
-count 40\r
+// regurgitate effect\r
+// used in: vore.qc:   pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1)\r
+effect vore_regurgitate\r
+count 30\r
 type blood\r
 tex 24 32\r
 size 12 24\r
 alpha 512 512 128\r
-color 0xDC9BCD 0xDC9BCD\r
+color 0x9B9BCD 0x3769CD\r
 bounce -1\r
 airfriction 1\r
 liquidfriction 4\r
-velocityjitter 192 192 192\r
-velocitymultiplier 15\r
+velocityjitter 192 192 32\r
+velocitymultiplier 5\r
 staincolor 0x408000 0x80FF00\r
 staintex 16 24\r
-//blood mist\r
-effect regurgitate\r
+//green mist\r
+effect vore_regurgitate\r
 countabsolute 10\r
 type alphastatic\r
 tex 0 8\r
 size 25 30\r
 alpha 100 256 400\r
 color 0x000000 0x408000\r
-originjitter 110 110 110
\ No newline at end of file
+originjitter 110 110 110\r
+\r
+// constant regurgitate effect\r
+// used in: vore.qc:   pointparticles(particleeffectnum("vore_regurgitate_constant"), self.origin, '0 0 0', 1);\r
+effect vore_regurgitate_constant\r
+count 3\r
+type blood\r
+tex 24 32\r
+size 4 10\r
+alpha 512 512 128\r
+color 0x9B9BCD 0x3769CD\r
+bounce -1\r
+airfriction 1\r
+liquidfriction 4\r
+velocityjitter 128 128 32\r
+velocitymultiplier 4\r
+staincolor 0x408000 0x80FF00\r
+staintex 16 24\r
+//green mist\r
+effect vore_regurgitate_constant\r
+countabsolute 3\r
+type alphastatic\r
+tex 0 8\r
+size 15 20\r
+alpha 75 192 400\r
+color 0x000000 0x408000\r
+originjitter 25 25 25\r
+\r
+// dirt ground effect\r
+// used in: cl_physics.qc:     pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', 1);\r
+effect ground_dirt\r
+countabsolute 5\r
+type alphastatic\r
+tex 0 8\r
+size 2 5\r
+sizeincrease 15\r
+alpha 50 128 75\r
+gravity -0.01\r
+color 0x000000 0xcc9966\r
+originjitter 20 20 5\r
+// debris\r
+effect ground_dirt\r
+notunderwater\r
+count 5\r
+type alphastatic\r
+tex 66 68\r
+color 0x000000 0x886644\r
+size 1 2\r
+alpha 450 750 300\r
+gravity 1.3\r
+airfriction 0.5\r
+bounce 1.6\r
+velocityjitter 124 124 324\r
+rotate -180 180 -1000 1000\r
+\r
+// metal ground effect\r
+// used in: cl_physics.qc:     pointparticles(particleeffectnum("ground_metal"), self.origin, '0 0 0', 1);\r
+effect ground_metal\r
+countabsolute 5\r
+type alphastatic\r
+tex 0 8\r
+size 3 6\r
+sizeincrease 10\r
+alpha 25 64 50\r
+gravity -0.01\r
+color 0x000000 0x886666\r
+originjitter 20 20 5\r
+// sparks\r
+effect ground_metal\r
+count 10\r
+type spark\r
+tex 41 41\r
+color 0xFFCC22 0xFF4422\r
+size 2 2\r
+alpha 255 255 112\r
+bounce 1.4\r
+stretchfactor 0.5\r
+velocityjitter 200 200 300\r
+velocitymultiplier 2\r
+airfriction 2\r
+gravity 1\r