From: Mario Date: Mon, 29 Jul 2024 09:41:13 +0000 (+1000) Subject: Merge branch 'master' into Mario/electro_combo_over_time X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d048fdc183a85450186911640a9f5a2d41933089;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/electro_combo_over_time --- d048fdc183a85450186911640a9f5a2d41933089 diff --cc effectinfo.txt index 4b488ff95,da8070787..c2c75dbdd --- a/effectinfo.txt +++ b/effectinfo.txt @@@ -8390,62 -8910,19 +8910,78 @@@ effect respawn_ghos originoffset 0 0 -8 originjitter 28 28 16 velocityjitter 0 0 256 + effect item_despawn + type snow + // type smoke + blend add + alpha 192 256 256 + color 0xff9600 0xffefb8 + count 32 + originjitter 8 8 8 + sizeincrease 1 + size 0.5 1 + tex 48 55 + velocityjitter 16 16 32 + lightradius 48 + lightradiusfade 64 + lightcolor 1 0.75 0.36 + lightshadow 1 +effect electro_combo_long + type decal + alpha 256 256 0 + countabsolute 1 + lightcolor 4 5 6 + lightradiusfade 300 + lightradius 400 + originjitter 17 17 17 + size 64 64 + tex 59 59 +effect electro_combo_long + type static + alpha 128 128 64 + color 0x80C0FF 0x80C0FF + countabsolute 1 + size 48 48 + tex 38 38 +effect electro_combo_long + type static + airfriction 6 + alpha 156 156 100 + bounce 2 + color 0x2030FF 0x80C0FF + count 5 + liquidfriction 16 + sizeincrease 50 + size 32 32 + tex 0 7 + velocityjitter 512 512 512 +effect electro_combo_long + type spark + alpha 444 512 500 + bounce 1.600000 + color 0xa9cacf 0x0054ff + count 32 + originjitter 1 1 1 + size 2 4 + stretchfactor 2 + tex 41 41 + velocityjitter 128 128 128 + velocitymultiplier 0.300000 + rotate -180 180 4000 -4000 +effect electro_combo_long + type smoke + alpha 256 256 256 + color 0x202020 0x404040 + count 0.125000 + originjitter 20 20 20 + size 24 24 + tex 0 8 + velocityjitter 32 32 32 +effect electro_combo_long + type smoke + alpha 40 40 20 + color 0xa9cacf 0x0054ff + countabsolute 1 + size 120 120 + tex 33 33 + velocitymultiplier 0.300000 diff --cc qcsrc/common/effects/effectinfo.inc index a58ad7d43,7e8a06365..638e958c9 --- a/qcsrc/common/effects/effectinfo.inc +++ b/qcsrc/common/effects/effectinfo.inc @@@ -9107,101 -9144,29 +9144,126 @@@ SUB(respawn_ghost) MY(velocityjitter) = '0 0 256'; } + // originally based on goldendust + DEF(item_despawn); + SUB(item_despawn) { + MY(type) = "snow"; + // MY(type) = "smoke"; + MY(blend) = "add"; + MY(alpha_min) = 192; + MY(alpha_max) = 256; + MY(alpha_fade) = 256; + MY(color_min) = "0xff9600"; + MY(color_max) = "0xffefb8"; + MY(count) = 32; + MY(originjitter) = '8 8 8'; + MY(sizeincrease) = 1; + MY(size_min) = 0.5; + MY(size_max) = 1; + MY(tex_min) = 48; + MY(tex_max) = 55; + MY(velocityjitter) = '16 16 32'; + MY(lightradius) = 48; + MY(lightradiusfade) 64; + MY(lightcolor) '1 0.75 0.36'; + MY(lightshadow) 1; + } + +DEF(electro_combo_long); +// decal +SUB(electro_combo_long) { + MY(alpha_min) = 256; + MY(alpha_max) = 256; + MY(countabsolute) = 1; + MY(lightcolor) = '4.0 5.0 6.0'; + MY(lightradiusfade) = 300; + MY(lightradius) = 400; + MY(originjitter) = '17.0 17.0 17.0'; + MY(size_min) = 64; + MY(size_max) = 64; + MY(tex_min) = 59; + MY(tex_max) = 59; + MY(type) = "decal"; +} +// flare effect +SUB(electro_combo_long) { + MY(alpha_min) = 128; + MY(alpha_max) = 128; + MY(alpha_fade) = 64; + MY(color_min) = "0x80C0FF"; + MY(color_max) = "0x80C0FF"; + MY(countabsolute) = 1; + MY(size_min) = 48; + MY(size_max) = 48; + MY(tex_min) = 38; + MY(tex_max) = 38; + MY(type) = "static"; +} +// large sparks +SUB(electro_combo_long) { + MY(airfriction) = 6; + MY(alpha_min) = 156; + MY(alpha_max) = 156; + MY(alpha_fade) = 156; + MY(bounce) = 2; + MY(color_min) = "0x2030FF"; + MY(color_max) = "0x80C0FF"; + MY(count) = 5; + MY(liquidfriction) = 16; + MY(sizeincrease) = 50; + MY(size_min) = 32; + MY(size_max) = 32; + MY(tex_max) = 7; + MY(type) = "static"; + MY(velocityjitter) = '512.0 512.0 512.0'; +} +SUB(electro_combo_long) { + MY(alpha_min) = 444; + MY(alpha_max) = 512; + MY(alpha_fade) = 500; + MY(bounce) = 1.600000; + MY(color_min) = "0xa9cacf"; + MY(color_max) = "0x0054ff"; + MY(count) = 32; + MY(originjitter) = '1.0 1.0 1.0'; + MY(size_min) = 2; + MY(size_max) = 4; + MY(stretchfactor) = 2; + MY(tex_min) = 41; + MY(tex_max) = 41; + MY(type) = "spark"; + MY(velocityjitter) = '128.0 128.0 128.0'; + MY(velocitymultiplier) = 0.300000; +} +// inner cloud of smoke +SUB(electro_combo_long) { + MY(alpha_min) = 256; + MY(alpha_max) = 256; + MY(alpha_fade) = 256; + MY(color_min) = "0x202020"; + MY(color_max) = "0x404040"; + MY(count) = 0.125000; + MY(originjitter) = '20.0 20.0 20.0'; + MY(size_min) = 24; + MY(size_max) = 24; + MY(tex_max) = 8; + MY(type) = "smoke"; + MY(velocityjitter) = '32.0 32.0 32.0'; +} +// shockwave +SUB(electro_combo_long) { + MY(alpha_min) = 40; + MY(alpha_max) = 40; + MY(alpha_fade) = 20; + MY(color_min) = "0xa9cacf"; + MY(color_max) = "0x0054ff"; + MY(countabsolute) = 1; + MY(size_min) = 120; + MY(size_max) = 120; + MY(tex_min) = 33; + MY(tex_max) = 33; + MY(type) = "smoke"; + MY(velocitymultiplier) = 0.300000; +} + // always add new effects to the bottom of the list. And keep this comment in the bottom line of this file!