From: Rudolf Polzer Date: Sun, 14 Nov 2010 19:02:28 +0000 (+0100) Subject: bigger joinexplode effect X-Git-Tag: xonotic-v0.1.0preview~140 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=898360db2c4abcce2d2f17e651bb62548f048da5;p=xonotic%2Fxonotic-data.pk3dir.git bigger joinexplode effect --- diff --git a/effectinfo.txt b/effectinfo.txt index 9529ebecc..1947d3f06 100644 --- a/effectinfo.txt +++ b/effectinfo.txt @@ -5062,54 +5062,51 @@ gravity 1.3 stretchfactor 0.1 - -// crylink linkjoin effect +// crylink joinexplode effect // decal -// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("crylink_linkjoin"), org2, '0 0 0', 1) -effect crylink_linkjoin +// used in qcsrc/client/damage.qc: pointparticles(particleeffectnum("crylink_joinexplode"), org2, '0 0 0', 1) +effect crylink_joinexplode countabsolute 1 type decal tex 47 47 -size 8 8 +size 24 24 alpha 256 256 0 originjitter 12 12 12 -//lightradius 60 -//lightradiusfade 300 +//lightradius 200 +//lightradiusfade 800 //lightcolor 3.2 0.4 4 // purple flare effect -effect crylink_linkjoin +effect crylink_joinexplode countabsolute 1 type static tex 39 39 color 0x504060 0x504060 -size 8 8 +size 24 24 alpha 256 256 512 // purple sparks -effect crylink_linkjoin -count 10 +effect crylink_joinexplode +count 40 type spark tex 41 41 color 0xA040C0 0xA040C0 bounce 2 -size 1 2 +size 6 6 alpha 256 256 1024 -velocityjitter 256 256 256 +velocityjitter 512 512 512 // purple splash -effect crylink_linkjoin +effect crylink_joinexplode count 1.5 type static color 0xE070FF 0xE070FF -size 8 8 +size 16 16 alpha 256 256 512 -velocityjitter 8 8 8 +velocityjitter 32 32 32 // purple splash -effect crylink_linkjoin -count 1.5 +effect crylink_joinexplode +count 3 type static color 0xE070FF 0xE070FF -size 8 8 +size 16 16 alpha 256 256 1024 -velocityjitter 32 32 32 - - +velocityjitter 256 256 256 diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc index cd404334e..f17e075dd 100644 --- a/qcsrc/server/w_crylink.qc +++ b/qcsrc/server/w_crylink.qc @@ -158,7 +158,7 @@ void W_Crylink_LinkJoinEffect_Think() cvar("g_balance_crylink_secondary_joinexplode_radius") * n, world, cvar("g_balance_crylink_secondary_joinexplode_force") * n, e.projectiledeathtype, other); - pointparticles(particleeffectnum("crylink_linkjoin"), self.origin, '0 0 0', n); + pointparticles(particleeffectnum("crylink_joinexplode"), self.origin, '0 0 0', n); } } else @@ -171,7 +171,7 @@ void W_Crylink_LinkJoinEffect_Think() cvar("g_balance_crylink_primary_joinexplode_radius") * n, world, cvar("g_balance_crylink_primary_joinexplode_force") * n, e.projectiledeathtype, other); - pointparticles(particleeffectnum("crylink_linkjoin"), self.origin, '0 0 0', n); + pointparticles(particleeffectnum("crylink_joinexplode"), self.origin, '0 0 0', n); } } }