Fix some issues with effects

diff --git a/effectinfo.txt b/effectinfo.txt
index 1cbe37d7272e96d09d654b4db7e792a3997e1f4b..93a0a1ec012643209c8ce8cf572d018cd85c1659 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -8951,82 +8951,47 @@ originjitter 64 64 64
 velocityjitter 324 324 324
 rotate -180 180 -100 100
 
-// laser_shockwave_attack
+// shockwave_attack
 // used nowhere in code
-effect laser_shockwave_attack
-// glow and light
-//countabsolute 1
-//type smoke
-//color 0xcc0000 0xff0000
-//tex 65 65
-//size 10 15
-//alpha 256 512 6280
-//airfriction 10
-//sizeincrease 1.5
-//stretchfactor 2
-//lightradius 200
-//lightradiusfade 2000
-//lightcolor 3 0.1 0.1
-// electricity
-effect laser_shockwave_attack
-count 1
-type spark
-color 0xb44215 0xff0000
-tex 43 43
-size 5 7
-bounce 0
-alpha 4096 4096 20000
-airfriction 1
-originjitter 2 2 2
-velocityjitter 10 10 10
-velocitymultiplier 10
-sizeincrease 1.5
-stretchfactor 2.3
-rotate -180 180 4000 -4000
-// fire
-effect laser_shockwave_attack
-count 1
-type spark
-color 0xff4200 0xff0000
-tex 8 15
-size 7 9
-bounce 0
-alpha 4096 4096 20000
-airfriction 1
-originjitter 2 2 2
-velocityjitter 10 10 10
-velocitymultiplier 10
-sizeincrease 1.5
-stretchfactor 2
-
-// new_laser_impact
-// used nowhere in code
-// decal
-effect new_laser_impact
-countabsolute 1
-type decal
-tex 8 16
-size 72 72
-alpha 256 256 0
-originjitter 2 2 2
-// flare effect
-//effect new_laser_impact
-//countabsolute 1
-//type static
-//tex 39 39
-//color 0xFF2010 0xFF2010
-//alpha 256 256 1024
-//size 24 24
-// sparks that rapidly expand and rapidly slow down to form an interesting spherical effect
-effect new_laser_impact
-count 128
-type spark
-color 0x800000 0xFF8020
-alpha 256 256 1024
-size 4 4
-bounce 1.5
-gravity 0.5
-airfriction 1
-liquidfriction 1
-originjitter 20 20 20
-velocityjitter 256 256 256
+effect shockwave_attack // glow and light
+       //countabsolute 1
+       //type smoke
+       //color 0xcc0000 0xff0000
+       //tex 65 65
+       //size 10 15
+       //alpha 256 512 6280
+       //airfriction 10
+       //sizeincrease 1.5
+       //stretchfactor 2
+       //lightradius 200
+       //lightradiusfade 2000
+       //lightcolor 3 0.1 0.1
+effect shockwave_attack // electricity
+       count 1
+       type spark
+       color 0xb44215 0xff0000
+       tex 43 43
+       size 5 7
+       bounce 0
+       alpha 4096 4096 20000
+       airfriction 1
+       originjitter 2 2 2
+       velocityjitter 10 10 10
+       velocitymultiplier 10
+       sizeincrease 1.5
+       stretchfactor 2.3
+       rotate -180 180 4000 -4000
+effect shockwave_attack // fire
+       count 1
+       type spark
+       color 0xff4200 0xff0000
+       tex 8 15
+       size 7 9
+       bounce 0
+       alpha 4096 4096 20000
+       airfriction 1
+       originjitter 2 2 2
+       velocityjitter 10 10 10
+       velocitymultiplier 10
+       sizeincrease 1.5
+       stretchfactor 2

diff --git a/qcsrc/common/weapons/w_blaster.qc b/qcsrc/common/weapons/w_blaster.qc
index e4198c28404b8185df640500ecb7afc430f2069c..f39d35e6090e96c09d46d1e41a4af1903ecb52b4 100644 (file)
--- a/qcsrc/common/weapons/w_blaster.qc
+++ b/qcsrc/common/weapons/w_blaster.qc
@@ -270,7 +270,7 @@ float W_Blaster(float request)
                {
                        vector org2;
                        org2 = w_org + w_backoff * 6;
-                       pointparticles(particleeffectnum("new_laser_impact"), org2, w_backoff * 1000, 1);
+                       pointparticles(particleeffectnum("laser_impact"), org2, w_backoff * 1000, 1);
                        if(!w_issilent) { sound(self, CH_SHOTS, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM); }
                        return TRUE;
                }

diff --git a/qcsrc/common/weapons/w_shockwave.qc b/qcsrc/common/weapons/w_shockwave.qc
index 999d6b21b00354727a99ee7f3a4f30313a8b9c66..fa42e78aa1d69bd56beaf02e5a2b6ebfdea1989d 100644 (file)
--- a/qcsrc/common/weapons/w_shockwave.qc
+++ b/qcsrc/common/weapons/w_shockwave.qc
@@ -726,7 +726,7 @@ float W_Shockwave(float req)
                {
                        vector org2;
                        org2 = w_org + w_backoff * 2;
-                       pointparticles(particleeffectnum("shockwave_impact"), org2, w_backoff * 1000, 1);
+                       pointparticles(particleeffectnum("laser_impact"), org2, w_backoff * 1000, 1); // WEAPONTODO: replace with proper impact effect
                        return TRUE;
                }
                case WR_INIT: