Tweak the Electro combo particle effect to have a more pronounced border

diff --git a/effectinfo.txt b/effectinfo.txt
index da8070787f82a6b2ee47574e1174fbb10761a7b3..31fe697bd8a2c4336e68d2a9e69317494cf21c85 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -1318,7 +1318,7 @@ effect electro_combo
 effect electro_combo
        type static
        airfriction 6
-       alpha 156 156 156
+       alpha 156 156 100
        bounce 2
        color 0x2030FF 0x80C0FF
        count 5
@@ -1329,17 +1329,17 @@ effect electro_combo
        velocityjitter 512 512 512
 effect electro_combo
        type spark
-       alpha 444 512 700
+       alpha 444 512 500
        bounce 1.600000
        color 0xa9cacf 0x0054ff
        count 32
-       gravity 0.300000
        originjitter 1 1 1
        size 2 4
        stretchfactor 2
        tex 41 41
-       velocityjitter 312 312 312
-       velocitymultiplier 3
+       velocityjitter 128 128 128
+       velocitymultiplier 0.300000
+       rotate -180 180 4000 -4000
 effect electro_combo
        type smoke
        alpha 256 256 256
@@ -1351,11 +1351,10 @@ effect electro_combo
        velocityjitter 32 32 32
 effect electro_combo
        type smoke
-       alpha 40 40 100
+       alpha 40 40 20
        color 0xa9cacf 0x0054ff
        countabsolute 1
-       sizeincrease 600
-       size 30 30
+       size 120 120
        tex 33 33
        velocitymultiplier 0.300000
 effect crylink_muzzleflash

diff --git a/qcsrc/common/effects/effectinfo.inc b/qcsrc/common/effects/effectinfo.inc
index 7e8a06365941a8493cbaf67d6cb25b6b7d5dafe5..2acdfa1ff2f30b85da447f2cf644fc50768113a0 100644 (file)
--- a/qcsrc/common/effects/effectinfo.inc
+++ b/qcsrc/common/effects/effectinfo.inc
@@ -2203,12 +2203,11 @@ SUB(electro_combo) {
 SUB(electro_combo) {
        MY(alpha_min) = 444;
        MY(alpha_max) = 512;
-       MY(alpha_fade) = 700;
+       MY(alpha_fade) = 500;
        MY(bounce) = 1.600000;
        MY(color_min) = "0xa9cacf";
        MY(color_max) = "0x0054ff";
        MY(count) = 32;
-       MY(gravity) = 0.300000;
        MY(originjitter) = '1.0 1.0 1.0';
        MY(size_min) = 2;
        MY(size_max) = 4;
@@ -2216,8 +2215,8 @@ SUB(electro_combo) {
        MY(tex_min) = 41;
        MY(tex_max) = 41;
        MY(type) = "spark";
-       MY(velocityjitter) = '312.0 312.0 312.0';
-       MY(velocitymultiplier) = 3;
+       MY(velocityjitter) = '128.0 128.0 128.0';
+       MY(velocitymultiplier) = 0.300000;
 }
 // inner cloud of smoke
 SUB(electro_combo) {
@@ -2238,13 +2237,12 @@ SUB(electro_combo) {
 SUB(electro_combo) {
        MY(alpha_min) = 40;
        MY(alpha_max) = 40;
-       MY(alpha_fade) = 100;
+       MY(alpha_fade) = 20;
        MY(color_min) = "0xa9cacf";
        MY(color_max) = "0x0054ff";
        MY(countabsolute) = 1;
-       MY(sizeincrease) = 600;
-       MY(size_min) = 30;
-       MY(size_max) = 30;
+       MY(size_min) = 120;
+       MY(size_max) = 120;
        MY(tex_min) = 33;
        MY(tex_max) = 33;
        MY(type) = "smoke";