Merge remote branch 'origin/master' into fruitiex/fruitbalance

diff --cc effectinfo.txt
index a55f7870f98106fd2de5235cf3efd578384a66ff,dddf34c8883ee105c6117a7550224eb86af4ad7f..4116ae438241bf98c1d92ae2002bd69999262615
--- 1/effectinfo.txt
--- 2/effectinfo.txt
+++ b/effectinfo.txt
@@@ -4976,55 -4976,27 +4976,65 @@@ velocityjitter 156 156 15
  // used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
  // used in qcsrc/server/w_electro.qc: pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
  effect electro_lightning
+ countabsolute 1
+ type decal
+ tex 59 59
+ size 16 16
+ alpha 256 256 0
+ originjitter 2 2 2
+ lightradius 50
+ lightradiusfade 200
+ lightcolor 3.125 4.375 10
+ effect electro_lightning
  count 300
  type spark
 -color 0x283880 0x283880 // 0x202020 0x404040
 +color 0x501860 0x501860 // 0x202020 0x404040
 +tex 65 65
 +size 6 6
 +alpha 100 206 1724
 +originjitter 1.5 1.5 1.5
 +velocityjitter 6 6 6
 +sizeincrease 10
 +velocitymultiplier 2000
 +effect electro_lightning
 +count 30
 +type spark
 +tex 8 15
 +color 0xDDFDFF 0xFDFDFF
 +size 2 5
 +alpha 110 170 1500
 +originjitter 1 1 1
 +velocityjitter 150 150 150
 +velocitymultiplier 0.5
 +airfriction 2
 +stretchfactor 1.5
 +effect electro_lightning
 +count 50
 +type spark
 +tex 41 41
 +color 0xFDFDFF 0xF9FDFF
 +size 2 3
 +alpha 110 170 1500
 +originjitter 1 1 1
 +velocityjitter 350 350 350
 +velocitymultiplier 2.5
 +airfriction 8
 +gravity 1.3
 +stretchfactor 0.1
 +
 +// used in qcsrc/server/w_gauntlet.qc:        pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1)
 +effect gauntlet_lightning
 +count 300
 +type spark
 +color 0x280000 0x280000 // 0x202020 0x404040
  tex 65 65
- size 5 5
+ size 3 3
  alpha 256 256 1024
  originjitter 1.5 1.5 1.5
  velocityjitter 6 6 6
- sizeincrease 20
+ sizeincrease 15
  velocitymultiplier 2000
 -effect electro_lightning
 +effect gauntlet_lightning
  count 30
  type spark
  tex 8 15

diff --cc qcsrc/client/hook.qc
index 513c7926334dd139a66dc322a7dcca2bf7fca2dd,e53cd0026fd6b3b46e21ac5f4737ee18d793ef22..2fe9a86dd9b0762f03724133d669bfa22e67e835
--- 1/qcsrc/client/hook.qc
--- 2/qcsrc/client/hook.qc
+++ b/qcsrc/client/hook.qc
@@@ -176,10 -182,9 +182,10 @@@ void Draw_GrapplingHook(
                case ENT_CLIENT_HOOK:
                        break;
                case ENT_CLIENT_LGBEAM:
-                       pointparticles(particleeffectnum("electro_lightning"), b, normalize(a - b), frametime);
+                       pointparticles(particleeffectnum("electro_lightning"), trace_endpos, normalize(atrans - trace_endpos), frametime);
                        break;
                case ENT_CLIENT_GAUNTLET:
 +                      pointparticles(particleeffectnum("gauntlet_lightning"), b, normalize(a - b), frametime);
                        break;
        }
  }

diff --cc qcsrc/server/w_electro.qc
Simple merge