From: MirceaKitsune Date: Fri, 3 Sep 2010 17:17:08 +0000 (+0300) Subject: Correct comments in effectinfo.txt and remove some useless code X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=b603dd779dd8d19b10cda14ad2318d732fcedeec Correct comments in effectinfo.txt and remove some useless code --- diff --git a/data/effectinfo.txt b/data/effectinfo.txt index 271e1daa..2bf5e2fe 100644 --- a/data/effectinfo.txt +++ b/data/effectinfo.txt @@ -26,7 +26,7 @@ velocityjitter 32 32 32 // laser impact // decal -// used in qcsrc/server/w_seeker.qc: te_knightspike(org2) +// used nowhere in code effect TE_KNIGHTSPIKE countabsolute 1 type decal @@ -58,8 +58,8 @@ liquidfriction 6 //originjitter 32 32 32 velocityjitter 256 256 256 -// machinegun bullet impact -// bullet impact decal +// bullet impact +// decal // used nowhere in code effect TE_SPIKE countabsolute 1 @@ -102,7 +102,7 @@ bounce 1.5 velocityoffset 0 0 80 velocityjitter 64 64 64 -// electro combo explosion +// electric combo explosion // decal // used nowhere in code effect TE_SPIKEQUAD @@ -272,7 +272,7 @@ bounce 1.5 velocityoffset 0 0 80 velocityjitter 64 64 64 -// crylink impact effect +// plasma impact effect // decal // used nowhere in code effect TE_GUNSHOTQUAD @@ -305,7 +305,7 @@ bounce 1.5 velocityoffset 0 0 80 velocityjitter 128 128 128 -// mortar/hagar explosion (smaller than rocket) +// small rocket explosion // decal // used in qcsrc/server/cl_client.qc: te_explosion(org) effect TE_EXPLOSION @@ -505,7 +505,7 @@ velocityoffset 0 0 80 velocityjitter 64 64 64 velocitymultiplier 1 -// nex impact +// lightning impact // decal // used in qcsrc/server/bots.qc: te_plasmaburn(org) effect TE_PLASMABURN @@ -589,9 +589,8 @@ originoffset 0 0 28 originjitter 16 16 28 velocityjitter 0 0 256 -// nex beam -// used in qcsrc/server/w_minstanex.qc: trailparticles(world, particleeffectnum("TE_TEI_G3"), w_shotorg, trace_endpos) -// used in qcsrc/client/particles.qc: trailparticles(world, particleeffectnum("TE_TEI_G3"), shotorg, endpos) +// lightning beam +// used nowhere in code effect TE_TEI_G3 countabsolute 1 type beam @@ -624,7 +623,7 @@ originjitter 1.5 1.5 1.5 velocityjitter 6 6 6 velocitymultiplier 1 -// rocket explosion (bigger than mortar and hagar) +// rocket explosion // decal // used nowhere in code effect TE_TEI_BIGEXPLOSION @@ -688,7 +687,7 @@ liquidfriction 0.8 velocityoffset 0 0 80 velocityjitter 384 384 384 -// electro explosion +// electric explosion // decal // used nowhere in code effect TE_TEI_PLASMAHIT @@ -936,9 +935,7 @@ sizeincrease 6 -// used in qcsrc/server/w_campingrifle.qc: pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 2000, 1) -// used in qcsrc/server/w_shotgun.qc: pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_primary_ammo")) -// used in qcsrc/server/w_shotgun.qc: pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 1000, cvar("g_balance_shotgun_secondary_ammo")) +// used nowhere in code effect shotgun_muzzleflash count 3 type smoke @@ -971,7 +968,7 @@ airfriction 5 // shotgun pellet impact // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("shotgun_impact"), org2, backoff * 1000, 1) +// used nowhere in code effect shotgun_impact countabsolute 1 type decal @@ -1023,8 +1020,8 @@ velocitymultiplier 0.1 -// used in qcsrc/server/w_uzi.qc: pointparticles(particleeffectnum("uzi_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -effect uzi_muzzleflash +// used nowhere in code +effect machinegun_muzzleflash count 2 type static color 0x202020 0x404040 @@ -1038,7 +1035,7 @@ lightradius 200 lightradiusfade 2000 lightcolor 2 1.5 0.2 gravity -0.1 -effect uzi_muzzleflash +effect machinegun_muzzleflash count 20 type spark tex 40 40 @@ -1106,10 +1103,7 @@ velocitymultiplier 0.1 -// used in qcsrc/server/nexball.qc: pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -// used in qcsrc/server/w_grenadelauncher.qc: pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -// used in qcsrc/server/w_grenadelauncher.qc: pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -// used in qcsrc/server/w_porto.qc: //pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) +// used nowhere in code effect grenadelauncher_muzzleflash count 3 type smoke @@ -1138,10 +1132,9 @@ airfriction 12 -// hagar trail +// small rocket trail // smoke -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_GRENADE"), from, to) -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_GRENADE"), from, to) +// used nowhere in code effect TR_GRENADE trailspacing 6 type alphastatic @@ -1184,11 +1177,9 @@ velocityjitter 16 16 16 -// mortar trail +// grenade trail // smoke -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to) -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to) -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_KNIGHTSPIKE"), from, to) +// used nowhere in code effect TR_KNIGHTSPIKE // used for MF_TRACER2 notunderwater trailspacing 5 @@ -1229,7 +1220,7 @@ velocityjitter 16 16 16 // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("grenade_explode"), org2, '0 0 0', 1) +// used nowhere in code effect grenade_explode countabsolute 1 type decal @@ -1317,9 +1308,8 @@ velocityjitter 224 224 324 -// used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -// used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -effect electro_muzzleflash +// used nowhere in code +effect electric_muzzleflash count 1 type smoke color 0x283880 0x283880 // 0x202020 0x404040 @@ -1332,7 +1322,7 @@ velocitymultiplier 0.01 lightradius 200 lightradiusfade 2000 lightcolor 1.5 3 6 -effect electro_muzzleflash +effect electric_muzzleflash count 30 type spark tex 31 31 @@ -1346,9 +1336,9 @@ airfriction 12 -// electro trail +// electric trail // glowing vapor trail -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_VORETOURNAMENTPLASMA"), from, to) +// used nowhere in code effect TR_VORETOURNAMENTPLASMA trailspacing 1 type static @@ -1380,8 +1370,8 @@ velocityjitter 50 50 50 // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1) -effect electro_impact +// used nowhere in code +effect electric_impact countabsolute 1 type decal tex 59 59 @@ -1392,7 +1382,7 @@ lightradius 250 lightradiusfade 250 lightcolor 3.125 4.375 10 // flare effect -effect electro_impact +effect electric_impact countabsolute 1 type static tex 38 38 @@ -1400,7 +1390,7 @@ color 0x80C0FF 0x80C0FF size 12 32 alpha 256 256 512 // cloud of bouncing sparks -effect electro_impact +effect electric_impact count 60 type smoke tex 42 42 @@ -1414,7 +1404,7 @@ airfriction 6 originjitter 1 1 1 velocityjitter 512 512 512 // inner cloud of smoke -effect electro_impact +effect electric_impact count 60 type smoke color 0x629dff 0x0018ff @@ -1427,8 +1417,8 @@ originjitter 20 20 20 velocityjitter 320 320 320 // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1) -effect electro_ballexplode +// used nowhere in code +effect electric_ballexplode countabsolute 1 type decal tex 59 59 @@ -1439,7 +1429,7 @@ lightradius 250 lightradiusfade 250 lightcolor 3.125 4.375 10 // flare effect -effect electro_ballexplode +effect electric_ballexplode countabsolute 1 type static tex 38 38 @@ -1447,7 +1437,7 @@ color 0x80C0FF 0x80C0FF size 32 32 alpha 256 256 512 // cloud of bouncing sparks -effect electro_ballexplode +effect electric_ballexplode count 128 type spark tex 41 41 @@ -1459,7 +1449,7 @@ bounce 2 originjitter 1 1 1 velocityjitter 512 512 512 // inner cloud of smoke -effect electro_ballexplode +effect electric_ballexplode count 16 type smoke color 0x202020 0x404040 @@ -1472,8 +1462,8 @@ velocityjitter 32 32 32 // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("electro_combo"), org2, '0 0 0', 1) -effect electro_combo +// used nowhere in code +effect electric_combo countabsolute 1 type decal tex 59 59 @@ -1484,7 +1474,7 @@ lightradius 400 lightradiusfade 300 lightcolor 4 5 6 // flare effect -effect electro_combo +effect electric_combo countabsolute 1 type static tex 38 38 @@ -1492,7 +1482,7 @@ color 0x80C0FF 0x80C0FF size 48 48 alpha 128 128 64 // large sparks -effect electro_combo +effect electric_combo count 20 type static color 0x2030FF 0x80C0FF @@ -1503,7 +1493,7 @@ airfriction 6 liquidfriction 16 //velocityoffset 0 0 120 velocityjitter 512 512 512 -effect electro_combo +effect electric_combo count 64 type spark tex 41 41 @@ -1515,7 +1505,7 @@ bounce 2 originjitter 1 1 1 velocityjitter 512 512 512 // inner cloud of smoke -effect electro_combo +effect electric_combo count 0.25 type smoke color 0x202020 0x404040 @@ -1527,9 +1517,8 @@ velocityjitter 32 32 32 -// used in qcsrc/server/w_crylink.qc: pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots) -// used in qcsrc/server/w_crylink.qc: pointparticles(particleeffectnum("crylink_muzzleflash"), w_shotorg, w_shotdir * 1000, shots) -effect crylink_muzzleflash +// used nowhere in code +effect plasma_muzzleflash count 1 type smoke color 0x202020 0x404040 @@ -1542,7 +1531,7 @@ velocitymultiplier 0.01 lightradius 200 lightradiusfade 2000 lightcolor 1.6 0.2 2 -effect crylink_muzzleflash +effect plasma_muzzleflash count 10 type spark tex 40 40 @@ -1556,10 +1545,10 @@ airfriction 12 -// crylink impact effect +// plasma impact effect // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("crylink_impact"), org2, '0 0 0', 1) -effect crylink_impact +// used nowhere in code +effect plasma_impact countabsolute 1 type decal tex 47 47 @@ -1570,7 +1559,7 @@ originjitter 12 12 12 //lightradiusfade 300 //lightcolor 3.2 0.4 4 // purple flare effect -effect crylink_impact +effect plasma_impact countabsolute 1 type static tex 39 39 @@ -1578,7 +1567,7 @@ color 0x504060 0x504060 size 8 8 alpha 256 256 512 // purple sparks -effect crylink_impact +effect plasma_impact count 20 type spark tex 41 41 @@ -1588,7 +1577,7 @@ size 4 4 alpha 256 256 1024 velocityjitter 256 256 256 // purple splash -effect crylink_impact +effect plasma_impact count 3 type static color 0xE070FF 0xE070FF @@ -1596,7 +1585,7 @@ size 8 8 alpha 256 256 512 velocityjitter 8 8 8 // purple splash -effect crylink_impact +effect plasma_impact count 3 type static color 0xE070FF 0xE070FF @@ -1606,9 +1595,8 @@ velocityjitter 32 32 32 -// used in qcsrc/server/w_minstanex.qc: pointparticles(particleeffectnum("nex_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -// used in qcsrc/client/particles.qc: pointparticles(particleeffectnum("nex_muzzleflash"), shotorg, normalize(endpos - shotorg) * 1000, 1) -effect nex_muzzleflash +// used nowhere in code +effect lightning_muzzleflash count 10 type smoke color 0x202020 0x404040 @@ -1621,7 +1609,7 @@ velocitymultiplier 0.02 lightradius 200 lightradiusfade 200 lightcolor 2 2.5 3 -effect nex_muzzleflash +effect lightning_muzzleflash count 150 type spark tex 41 41 @@ -1635,17 +1623,17 @@ airfriction 9 -//// nex beam -//effect nex_beam +//// lightning beam +//effect lightning_beam //countabsolute 1 //type beam //tex 60 60 //color 0xFFFFFF 0xFFFFFF //size 6 6 //alpha 128 128 192 -// nex beam: ring smoke -// used in qcsrc/client/particles.qc: trailparticles(world, particleeffectnum("nex_beam"), shotorg, endpos) -effect nex_beam +// lightning beam: ring smoke +// used nowhere in code +effect lightning_beam trailspacing 32 color 0x1680A0 0x1680A0 size 4 4 @@ -1654,8 +1642,8 @@ alpha 64 128 64 airfriction 5 sizeincrease 2 type static -// nex beam: drifting smoke -effect nex_beam +// lightning beam: drifting smoke +effect lightning_beam trailspacing 6 color 0x5080A0 0x5080A0 size 1 1 @@ -1665,8 +1653,8 @@ airfriction 9 sizeincrease 8 velocityjitter 64 64 64 type static -// nex beam: bright core -effect nex_beam +// lightning beam: bright core +effect lightning_beam trailspacing 6 color 0x80CDFF 0x80CDFF size 4 4 @@ -1674,7 +1662,7 @@ size 4 4 alpha 256 256 1280 type static //sparks -effect nex_beam +effect lightning_beam trailspacing 8 color 0x1680A0 0x1680A0 size 1 1 @@ -1684,11 +1672,10 @@ airfriction 5 gravity -0.01 type snow -// nex impact +// lightning impact // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1) -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1) -effect nex_impact +// used nowhere in code +effect lightning_impact countabsolute 1 type decal tex 47 47 @@ -1699,7 +1686,7 @@ lightradius 200 lightradiusfade 250 lightcolor 4 6 8 // shockwave -effect nex_impact +effect lightning_impact countabsolute 1 type static tex 34 34 @@ -1709,7 +1696,7 @@ sizeincrease 200 // flare effect -effect nex_impact +effect lightning_impact countabsolute 1 type static tex 37 37 @@ -1717,7 +1704,7 @@ color 0x80C0FF 0x80C0FF size 8 8 alpha 256 256 256 // small sparks which form a sphere as they slow down -//effect nex_impact +//effect lightning_impact //count 256 //type spark //color 0x2030FF 0x80C0FF @@ -1728,7 +1715,7 @@ alpha 256 256 256 //liquidfriction 8 //velocityjitter 384 384 384 // small sparks which glow brightly but live briefly -effect nex_impact +effect lightning_impact count 128 type spark tex 41 41 @@ -1742,10 +1729,8 @@ airfriction 9 -// used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -// used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -// used in qcsrc/server/w_seeker.qc: pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) -effect hagar_muzzleflash +// used nowhere in code +effect small_rocket_muzzleflash count 4 type smoke color 0x202020 0x404040 @@ -1758,7 +1743,7 @@ velocitymultiplier 0.01 lightradius 200 lightradiusfade 2000 lightcolor 2 1.5 0.2 -effect hagar_muzzleflash +effect small_rocket_muzzleflash count 30 type spark tex 40 40 @@ -1772,8 +1757,8 @@ airfriction 12 -// used in qcsrc/server/w_hagar.qc: pointparticles(particleeffectnum("hagar_bounce"), self.origin, self.velocity, 1) -effect hagar_bounce +// used nowhere in code +effect small_rocket_bounce count 4 type smoke color 0x202020 0x404040 @@ -1786,7 +1771,7 @@ velocitymultiplier 0.01 lightradius 60 lightradiusfade 300 lightcolor 2 1.5 0.2 -effect hagar_bounce +effect small_rocket_bounce count 30 type spark tex 40 40 @@ -1803,10 +1788,8 @@ airfriction 12 // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1) -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1) -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("hagar_explode"), org2, '0 0 0', 1) -effect hagar_explode +// used nowhere in code +effect small_rocket_explode countabsolute 1 type decal tex 8 16 @@ -1817,7 +1800,7 @@ lightradius 120 lightradiusfade 400 lightcolor 8 4 1 // fire effect which make bright dot inside -effect hagar_explode +effect small_rocket_explode notunderwater count 10 type smoke @@ -1832,7 +1815,7 @@ liquidfriction 8 originjitter 8 8 8 velocityjitter 156 156 156 // fire effect which expands then slows -effect hagar_explode +effect small_rocket_explode notunderwater count 24 type static @@ -1848,7 +1831,7 @@ originjitter 8 8 8 velocityjitter 286 286 286 // smoke -effect hagar_explode +effect small_rocket_explode type alphastatic notunderwater tex 0 8 @@ -1862,7 +1845,7 @@ color 0x000000 0x111111 bounce 2 // underwater bubbles -effect hagar_explode +effect small_rocket_explode underwater count 32 type bubble @@ -1876,7 +1859,7 @@ liquidfriction 0.25 originjitter 16 16 16 velocityjitter 96 96 96 // bouncing sparks -effect hagar_explode +effect small_rocket_explode notunderwater count 16 type spark @@ -1893,7 +1876,7 @@ velocityjitter 256 256 256 -// used in qcsrc/server/w_rocketlauncher.qc: pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1) +// used nowhere in code effect rocketlauncher_muzzleflash count 20 type smoke @@ -1925,10 +1908,7 @@ airfriction 12 // rocket trail // smoke -// used in qcsrc/server/cl_client.qc: self.modelflags |= MF_ROCKET -// used in qcsrc/server/cl_client.qc: self.modelflags &~= MF_ROCKET -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_ROCKET"), from, to) -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_ROCKET"), from, to) +// used nowhere in code effect TR_ROCKET trailspacing 5 type alphastatic @@ -1987,7 +1967,7 @@ originjitter 1 1 1 velocityjitter 100 100 100 velocitymultiplier -0.31 -// rocket explosion (bigger than mortar and hagar) +// rocket explosion effect rocket_explode countabsolute 1 type decal @@ -2090,7 +2070,7 @@ lightcolor 1 0 0 // used nowhere in code -effect nex242_misc_laser_beam +effect lightning242_misc_laser_beam countabsolute 1 type beam tex 60 60 @@ -2100,7 +2080,7 @@ color 0xff0000 0xff0000 sizeincrease 1 // used nowhere in code -effect nex242_misc_laser_beam_end +effect lightning242_misc_laser_beam_end count 1 type spark color 0x8f4333 0xfff31b @@ -2114,7 +2094,7 @@ velocitymultiplier 100 // used nowhere in code -effect nex242_misc_laser_beam_fast +effect lightning242_misc_laser_beam_fast countabsolute 1 type beam tex 60 60 @@ -2124,7 +2104,7 @@ color 0xff0000 0xff0000 sizeincrease 0.1 // used nowhere in code -effect nex242_misc_laser_beam_fast_end +effect lightning242_misc_laser_beam_fast_end count 1 type spark color 0x8f4333 0xfff31b @@ -2137,7 +2117,7 @@ velocitymultiplier 100 // additional laser colors (mike) // used nowhere in code -effect nex242_misc_laser_green_beam +effect lightning242_misc_laser_green_beam countabsolute 1 type beam tex 60 60 @@ -2147,7 +2127,7 @@ color 0x00ff00 0x00ff00 sizeincrease 1 // used nowhere in code -effect nex242_misc_laser_green_beam_end +effect lightning242_misc_laser_green_beam_end count 1 type spark color 0x8f4333 0xfff31b @@ -2159,7 +2139,7 @@ velocityjitter 64 64 64 velocitymultiplier 100 // used nowhere in code -effect nex242_misc_laser_blue_beam +effect lightning242_misc_laser_blue_beam countabsolute 1 type beam tex 60 60 @@ -2169,7 +2149,7 @@ color 0x0000ff 0x0000ff sizeincrease 1 // used nowhere in code -effect nex242_misc_laser_blue_beam_end +effect lightning242_misc_laser_blue_beam_end count 1 type spark color 0x8f4333 0xfff31b @@ -2181,7 +2161,7 @@ velocityjitter 64 64 64 velocitymultiplier 100 // used nowhere in code -effect nex242_misc_laser_yellow_beam +effect lightning242_misc_laser_yellow_beam countabsolute 1 type beam tex 60 60 @@ -2191,7 +2171,7 @@ color 0xffff00 0xffff00 sizeincrease 1 // used nowhere in code -effect nex242_misc_laser_yellow_beam_end +effect lightning242_misc_laser_yellow_beam_end count 1 type spark color 0x8f4333 0xfff31b @@ -2203,7 +2183,7 @@ velocityjitter 64 64 64 velocitymultiplier 100 // used nowhere in code -effect nex242_misc_laser_cyan_beam +effect lightning242_misc_laser_cyan_beam countabsolute 1 type beam tex 60 60 @@ -2213,7 +2193,7 @@ color 0x00ffff 0x00ffff sizeincrease 1 // used nowhere in code -effect nex242_misc_laser_cyan_beam_end +effect lightning242_misc_laser_cyan_beam_end count 1 type spark color 0x8f4333 0xfff31b @@ -2225,7 +2205,7 @@ velocityjitter 64 64 64 velocitymultiplier 100 // used nowhere in code -effect nex242_misc_laser_magenta_beam +effect lightning242_misc_laser_magenta_beam countabsolute 1 type beam tex 60 60 @@ -2235,7 +2215,7 @@ color 0xff00ff 0xff00ff sizeincrease 1 // used nowhere in code -effect nex242_misc_laser_magenta_beam_end +effect lightning242_misc_laser_magenta_beam_end count 1 type spark color 0x8f4333 0xfff31b @@ -2247,7 +2227,7 @@ velocityjitter 64 64 64 velocitymultiplier 100 // used nowhere in code -effect nex242_misc_laser_white_beam +effect lightning242_misc_laser_white_beam countabsolute 1 type beam tex 60 60 @@ -2257,7 +2237,7 @@ color 0xffffff 0xffffff sizeincrease 1 // used nowhere in code -effect nex242_misc_laser_white_beam_end +effect lightning242_misc_laser_white_beam_end count 1 type spark color 0x8f4333 0xfff31b @@ -2269,7 +2249,7 @@ velocityjitter 64 64 64 velocitymultiplier 100 // used nowhere in code -effect nex242_misc_laser_black_beam +effect lightning242_misc_laser_black_beam countabsolute 1 type beam tex 60 60 @@ -2279,7 +2259,7 @@ color 0x000000 0x000000 sizeincrease 1 // used nowhere in code -effect nex242_misc_laser_black_beam_end +effect lightning242_misc_laser_black_beam_end count 1 type spark color 0x8f4333 0xfff31b @@ -2291,7 +2271,7 @@ velocityjitter 64 64 64 velocitymultiplier 100 // used nowhere in code -effect nex242_misc_laser_orange_beam +effect lightning242_misc_laser_orange_beam countabsolute 1 type beam tex 60 60 @@ -2301,7 +2281,7 @@ color 0xff6600 0xff6600 sizeincrease 1 // used nowhere in code -effect nex242_misc_laser_orange_beam_end +effect lightning242_misc_laser_orange_beam_end count 1 type spark color 0x8f4333 0xfff31b @@ -2315,10 +2295,10 @@ velocitymultiplier 100 -// bigger crylink impact effect +// bigger plasma impact effect // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("crylink_impactbig"), org2, '0 0 0', 1) -effect crylink_impactbig +// used nowhere in code +effect plasma_impactbig countabsolute 1 type decal tex 47 47 @@ -2329,7 +2309,7 @@ originjitter 12 12 12 //lightradiusfade 800 //lightcolor 3.2 0.4 4 // purple flare effect -effect crylink_impactbig +effect plasma_impactbig countabsolute 1 type static tex 39 39 @@ -2337,7 +2317,7 @@ color 0x504060 0x504060 size 24 24 alpha 256 256 512 // purple sparks -effect crylink_impactbig +effect plasma_impactbig count 80 type spark tex 41 41 @@ -2347,7 +2327,7 @@ size 6 6 alpha 256 256 1024 velocityjitter 512 512 512 // purple splash -effect crylink_impactbig +effect plasma_impactbig count 3 type static color 0xE070FF 0xE070FF @@ -2355,7 +2335,7 @@ size 16 16 alpha 256 256 512 velocityjitter 32 32 32 // purple splash -effect crylink_impactbig +effect plasma_impactbig count 6 type static color 0xE070FF 0xE070FF @@ -2541,8 +2521,8 @@ color 0x7cbaff 0xcfd1ff velocitymultiplier 2 // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("grabberbomb_explode"), org2, '0 0 0', 1) -effect grabberbomb_explode +// used nowhere in code +effect bomb_explode count 50 type static tex 38 38 @@ -2557,7 +2537,7 @@ velocityjitter 550 550 550 //velocitymultiplier -20 airfriction 10 // decal in the air -effect grabberbomb_explode +effect bomb_explode countabsolute 3 type static tex 38 38 @@ -2567,7 +2547,7 @@ alpha 256 265 100 sizeincrease -60 originoffset 0 0 6 // decal on the ground -effect grabberbomb_explode +effect bomb_explode countabsolute 1 type decal tex 39 39 @@ -2575,7 +2555,7 @@ size 80 100 alpha 256 256 0 originjitter 6 6 6 // some sparks -effect grabberbomb_explode +effect bomb_explode count 60 type spark tex 38 38 @@ -3032,10 +3012,9 @@ velocitymultiplier 20 velocityoffset 0 0 10 airfriction 1 -// port-o-launch trail +// portal trail // glowing vapor trail -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to) -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_WIZSPIKE"), from, to) +// used nowhere in code effect TR_WIZSPIKE trailspacing 2 type static @@ -3066,8 +3045,7 @@ velocityjitter 50 50 50 // TAG trail // glowing vapor trail -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to) -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_VORESPIKE"), from, to) +// used nowhere in code effect TR_VORESPIKE trailspacing 2 type static @@ -3096,7 +3074,7 @@ airfriction 12 originjitter 1 1 1 velocityjitter 50 50 50 -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("flac_explode"), org2, '0 0 0', 1) +// used nowhere in code effect flac_explode countabsolute 1 type decal @@ -3212,11 +3190,10 @@ velocityjitter 5 5 20 //velocitymultiplier -20 airfriction -1 -// crylink trail +// plasma trail // plasma smoke -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to) -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_CRYLINKPLASMA"), from, to) -effect TR_CRYLINKPLASMA +// used nowhere in code +effect TR_plasmaPLASMA trailspacing 64 type static color 0x5522aa 0x6622ff @@ -3229,8 +3206,8 @@ velocityjitter 8 8 8 //lighttime 0 //lightcolor 1 0 1 velocitymultiplier -0.01 -// crylink main trail -effect TR_CRYLINKPLASMA +// plasma main trail +effect TR_plasmaPLASMA trailspacing 8 type static color 0x5522aa 0x6622ff @@ -4283,7 +4260,7 @@ velocityjitter 1 1 1 velocitymultiplier 10 stretchfactor 0.7 -// rocket explosion (bigger than mortar and hagar) +// rocket explosion // decal // used nowhere in code effect fireball_explode @@ -4460,8 +4437,7 @@ lightradiusfade 10000 lightcolor 0.9 0.9 0.2 // rifle bullet trail (somewhat like a tracer) -// used in qcsrc/server/w_common.qc: zcurveparticles_from_tracetoss(particleeffectnum("tr_bullet"), self.origin, trace_endpos, self.velocity) -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("tr_bullet"), from, to) +// used nowhere in code effect tr_rifle trailspacing 128 type spark diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc index cf29ae8a..245323c3 100644 --- a/data/qcsrc/client/Main.qc +++ b/data/qcsrc/client/Main.qc @@ -1268,10 +1268,6 @@ float CSQC_Parse_TempEntity() Net_ReadZCurveParticles(); bHandled = true; break; - case TE_CSQC_NEXGUNBEAMPARTICLE: - Net_ReadNexgunBeamParticle(); - bHandled = true; - break; case TE_CSQC_TEAMNAGGER: Net_TeamNagger(); bHandled = true; diff --git a/data/qcsrc/client/particles.qc b/data/qcsrc/client/particles.qc index bb838ecd..d0c4aa3d 100644 --- a/data/qcsrc/client/particles.qc +++ b/data/qcsrc/client/particles.qc @@ -282,18 +282,3 @@ void Net_ReadZCurveParticles() } while(!(speed & 0x8000)); } - -void Net_ReadNexgunBeamParticle() -{ - vector shotorg, endpos; - shotorg_x = ReadCoord(); shotorg_y = ReadCoord(); shotorg_z = ReadCoord(); - endpos_x = ReadCoord(); endpos_y = ReadCoord(); endpos_z = ReadCoord(); - - pointparticles(particleeffectnum("nex_muzzleflash"), shotorg, normalize(endpos - shotorg) * 1000, 1); - - //draw either the old v2.3 beam or the new beam - if (cvar("cl_particles_oldnexbeam") && (getstati(STAT_ALLOW_OLDNEXBEAM) || isdemo())) - WarpZone_TrailParticles(world, particleeffectnum("TE_TEI_G3"), shotorg, endpos); - else - WarpZone_TrailParticles(world, particleeffectnum("nex_beam"), shotorg, endpos); -} diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh index 74307aef..d81983aa 100644 --- a/data/qcsrc/common/constants.qh +++ b/data/qcsrc/common/constants.qh @@ -48,15 +48,14 @@ const float TE_CSQC_PICTURE = 100; const float TE_CSQC_RACE = 101; const float TE_CSQC_SPAWN = 102; const float TE_CSQC_ZCURVEPARTICLES = 103; -const float TE_CSQC_NEXGUNBEAMPARTICLE = 104; -const float TE_CSQC_LIGHTNINGARC = 105; -const float TE_CSQC_TEAMNAGGER = 106; -const float TE_CSQC_PINGPLREPORT = 107; -const float TE_CSQC_OTHERPLREPORT = 108; -const float TE_CSQC_VOTE = 109; -const float TE_CSQC_VOTERESET = 110; -const float TE_CSQC_ANNOUNCE = 111; -const float TE_CSQC_TARGET_MUSIC = 112; +const float TE_CSQC_LIGHTNINGARC = 104; +const float TE_CSQC_TEAMNAGGER = 105; +const float TE_CSQC_PINGPLREPORT = 106; +const float TE_CSQC_OTHERPLREPORT = 107; +const float TE_CSQC_VOTE = 108; +const float TE_CSQC_VOTERESET = 109; +const float TE_CSQC_ANNOUNCE = 110; +const float TE_CSQC_TARGET_MUSIC = 111; const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder const float RACE_NET_CHECKPOINT_CLEAR = 1;