Fewer particles and light for player respawns

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

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index 271e1daa00f51c8d2217e9be2c1b92435657aebc..b1859829486a33e6b03eba46b1feae54dc19ce18 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
@@ -840,20 +839,59 @@ 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 200\r
+lightradiusfade 120\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 768\r
+type spark\r
+tex 41 41\r
+color 0xF263EA 0xF263EA\r
+size 2 2\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 512\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 140\r
+lightradiusfade 120\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
 type spark\r
 tex 41 41\r
-color 0x63F2EA 0x63f2EA\r
+color 0xF263EA 0xF263EA\r
 size 2 2\r
 alpha 256 256 1280\r
 //originjitter 24 24 24\r
@@ -869,9 +907,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 +972,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 +1005,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 +1057,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 +1072,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 +1140,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 +1169,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 +1214,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 +1257,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 +1345,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 +1359,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 +1373,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 +1407,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 +1419,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 +1427,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 +1441,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 +1454,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 +1466,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 +1474,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 +1486,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 +1499,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 +1511,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 +1519,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 +1530,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 +1542,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 +1554,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 +1568,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 +1582,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 +1596,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 +1604,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 +1614,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 +1622,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 +1632,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 +1646,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 +1660,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 +1679,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 +1690,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 +1699,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 +1709,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 +1723,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 +1733,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 +1741,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 +1752,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 +1766,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 +1780,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 +1794,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 +1808,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 +1825,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 +1837,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 +1852,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 +1868,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 +1882,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 +1896,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 +1913,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 +1945,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 +2004,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
@@ -2076,21 +2093,214 @@ velocityjitter 256 256 256
 // used in qcsrc/server/g_grabber.qc:  pointparticles(particleeffectnum("grapple_muzzleflash"), org, '0 0 0', 1)\r
 effect grapple_muzzleflash\r
 lightradius 160\r
-lightradiusfade 800\r
-lightcolor 1 0 0\r
-\r
-\r
+lightradiusfade 600\r
+lightcolor 1 0.2 0.1\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 +2310,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 +2324,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 +2334,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 +2347,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 +2357,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 +2369,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 +2379,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 +2391,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 +2401,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 +2413,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 +2423,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 +2435,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 +2445,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 +2457,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 +2467,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 +2479,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 +2489,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 +2501,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 +2511,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 +2525,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 +2539,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 +2547,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 +2557,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 +2565,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 +2751,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 +2767,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 +2777,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 +2785,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 +3242,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 +3275,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 +3304,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 +3420,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 +3436,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
@@ -3371,7 +3578,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,7 +3586,7 @@ 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
@@ -4283,7 +4490,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 +4667,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,14 +4751,14 @@ velocityjitter 256 256 256
 velocitymultiplier -0.1\r
 \r
 \r
-// gauntlet laser\r
+// grabber melee\r
 // based off morphed's cl_gentle\r
-// used in qcsrc/server/w_laser.qc\r
+// used in qcsrc/server/w_grabber.qc\r
 effect grabber_melee\r
 tex 43 43\r
 count 3\r
 type spark\r
-color 0xffffff 0x0000ff\r
+color 0xffffff 0x0033ff\r
 size 8 16\r
 sizeincrease 34\r
 alpha 128 128 292\r
@@ -4560,6 +4766,9 @@ gravity 0
 airfriction 5\r
 liquidfriction 10\r
 velocityjitter 25 25 25\r
+lightradius 200\r
+lightradiusfade 200\r
+lightcolor 0.4 0.7 0.9\r
 \r
 \r
 //torch flame, spawn it as fast as you can  20 times per second or more, supports direction but not required\r
@@ -4631,18 +4840,20 @@ velocitymultiplier 20
 velocityoffset 0 0 10\r
 airfriction 1\r
 \r
+// regurgitate effect\r
+// used in: vore.qc:   pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1)\r
 effect regurgitate\r
-count 40\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
@@ -4653,4 +4864,4 @@ tex 0 8
 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