Remove the additional particle effect included for combos over time

diff --git a/effectinfo.txt b/effectinfo.txt
index c2c75dbdd876c98780645023006989d6c3617264..da8070787f82a6b2ee47574e1174fbb10761a7b3 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -8926,62 +8926,3 @@ effect item_despawn
        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 --git a/qcsrc/common/effects/all.inc b/qcsrc/common/effects/all.inc
index 0df2a3e032cd6a1644cc68bf5bcdca2ebf27af3c..1bd7ad9ed06156d38865205d80290b6c54fe97e3 100644 (file)
--- a/qcsrc/common/effects/all.inc
+++ b/qcsrc/common/effects/all.inc
@@ -41,7 +41,6 @@ EFFECT(0, GRENADE_MUZZLEFLASH,      "grenadelauncher_muzzleflash")
 
 EFFECT(0, ELECTRO_BALLEXPLODE,      "electro_ballexplode")
 EFFECT(0, ELECTRO_COMBO,            "electro_combo")
-EFFECT(0, ELECTRO_COMBO_LONG,       "electro_combo_long")
 EFFECT(0, ELECTRO_IMPACT,           "electro_impact")
 EFFECT(0, ELECTRO_MUZZLEFLASH,      "electro_muzzleflash")
 

diff --git a/qcsrc/common/effects/effectinfo.inc b/qcsrc/common/effects/effectinfo.inc
index 638e958c9d1a2ffdfc63aa9985827c5a752f8027..7e8a06365941a8493cbaf67d6cb25b6b7d5dafe5 100644 (file)
--- a/qcsrc/common/effects/effectinfo.inc
+++ b/qcsrc/common/effects/effectinfo.inc
@@ -9169,101 +9169,4 @@ SUB(item_despawn) {
        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!

diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index d7712eb11ac464852e9e52fdfe027504d9242e8c..6b692c1eff3da4bc80d77b595d96692566252be3 100644 (file)
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -666,10 +666,7 @@ METHOD(Electro, wr_impacteffect, void(entity thiswep, entity actor))
         if(w_deathtype & HITTYPE_SPLASH)
         {
             org2 = w_org + w_backoff * 2;
-            if(particleeffectnum(EFFECT_ELECTRO_COMBO_LONG) >= 0)
-                pointparticles(EFFECT_ELECTRO_COMBO_LONG, org2, '0 0 0', 1);
-            else
-                pointparticles(EFFECT_ELECTRO_COMBO, org2, '0 0 0', 1);
+            pointparticles(EFFECT_ELECTRO_COMBO, org2, '0 0 0', 1);
             if(!w_issilent)
                 sound(actor, CH_SHOTS, SND_ELECTRO_IMPACT_COMBO, VOL_BASE, ATTEN_NORM);
         }