X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=effectinfo.txt;h=782521447a3c96ab998a73b28028c6c5f6f95d94;hp=0ca352eea140d1ec92eb7b21ef91f2dfedc98596;hb=af818d85ab5246b8ecd1743ecf808d39e4396445;hpb=f8287888da112f1cd5d711903be8f840ff9f0d70 diff --git a/effectinfo.txt b/effectinfo.txt index 0ca352eea..782521447 100644 --- a/effectinfo.txt +++ b/effectinfo.txt @@ -7411,8 +7411,8 @@ velocityjitter 64 64 64 //lightcolor 1 0.9 0.7 //lightshadow 1 - // heal ray muzzleflash + effect healray_muzzleflash countabsolute 1 type smoke @@ -8949,48 +8949,3 @@ alpha 644 956 2500 originjitter 64 64 64 velocityjitter 324 324 324 rotate -180 180 -100 100 - -// shockwave_attack -// used nowhere in code -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