X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=effectinfo.txt;h=d9874d909f8a2a44301d86da7e2f33e0563d4a02;hb=99c1b6ca80a69e112d410ee493d62f757b2c6df8;hp=a96f347e539a7b3e67a267ae0b95e1e4a0c8ce66;hpb=d2cd0d526937f5c2f892ca588690f76eb64f870f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/effectinfo.txt b/effectinfo.txt index a96f347e5..d9874d909 100644 --- a/effectinfo.txt +++ b/effectinfo.txt @@ -1405,7 +1405,7 @@ liquidfriction 0.8 velocityoffset 0 0 80 originjitter 16 16 16 velocityjitter 424 424 624 -// derbis +// debris effect grenade_explode notunderwater count 12 @@ -2272,7 +2272,7 @@ liquidfriction 0.8 velocityoffset 0 0 80 originjitter 16 16 16 velocityjitter 424 424 624 -// derbis +// debris effect rocket_explode notunderwater count 12 @@ -5500,7 +5500,7 @@ velocityjitter 250 250 150 velocitymultiplier 0.2 sizeincrease 100 stretchfactor 7.6 -// derbis +// debris effect spiderbot_minigun_impact notunderwater count 3 @@ -6248,7 +6248,7 @@ velocityoffset 0 0 370 originjitter 160 160 160 velocityjitter 924 924 924 stretchfactor 0.7 -// derbis +// debris effect explosion_big notunderwater count 16 @@ -8110,7 +8110,7 @@ bounce 1.5 liquidfriction 4 velocityjitter 16 16 16 -effect nade +effect nade_neutral trailspacing 1 type smoke color 0xFFFFFF 0xFFFFFF @@ -8120,7 +8120,7 @@ sizeincrease -1 alpha 100 100 250 //gravity -0.11 // fire -effect nade +effect nade_neutral notunderwater trailspacing 8 type smoke @@ -8130,7 +8130,7 @@ size 15 25 sizeincrease -10 alpha 30 30 150 // bubbles -effect nade +effect nade_neutral underwater trailspacing 16 type bubble @@ -8307,7 +8307,7 @@ tex 33 33 size 25 25 sizeincrease -30 -effect nade_burn +effect nade_neutral_burn trailspacing 1 type smoke color 0xFFFFFF 0xFFFFFF @@ -8317,7 +8317,7 @@ sizeincrease -1 alpha 100 100 250 //gravity -0.11 // fire -effect nade_burn +effect nade_neutral_burn notunderwater trailspacing 64 type smoke @@ -8327,7 +8327,7 @@ size 45 25 sizeincrease -30 alpha 200 200 1000 // bubbles -effect nade_burn +effect nade_neutral_burn underwater trailspacing 16 type bubble @@ -8339,7 +8339,7 @@ gravity -0.125 bounce 1.5 liquidfriction 4 velocityjitter 16 16 16 -effect nade_burn +effect nade_neutral_burn trailspacing 16 type smoke color 0xFFFFFF 0xFFFFFF @@ -8381,7 +8381,7 @@ airfriction 30 originjitter 50 50 50 velocityjitter 320 320 320 rotate -180 180 -9 9 -// fire streched +// fire stretched effect nade_blue_explode count 8 type spark @@ -8454,7 +8454,7 @@ liquidfriction 0.8 velocityoffset 0 0 80 originjitter 16 16 16 velocityjitter 424 424 624 -// derbis +// debris effect nade_blue_explode notunderwater count 12 @@ -8503,7 +8503,7 @@ airfriction 30 originjitter 50 50 50 velocityjitter 320 320 320 rotate -180 180 -9 9 -// fire streched +// fire stretched effect nade_red_explode count 8 type spark @@ -8576,7 +8576,7 @@ liquidfriction 0.8 velocityoffset 0 0 80 originjitter 16 16 16 velocityjitter 424 424 624 -// derbis +// debris effect nade_red_explode notunderwater count 8 @@ -8623,7 +8623,7 @@ airfriction 30 originjitter 50 50 50 velocityjitter 320 320 320 rotate -180 180 -9 9 -// fire streched +// fire stretched effect nade_yellow_explode count 8 type spark @@ -8696,7 +8696,7 @@ liquidfriction 0.8 velocityoffset 0 0 80 originjitter 16 16 16 velocityjitter 424 424 624 -// derbis +// debris effect nade_yellow_explode notunderwater count 8 @@ -8743,7 +8743,7 @@ airfriction 30 originjitter 50 50 50 velocityjitter 320 320 320 rotate -180 180 -9 9 -// fire streched +// fire stretched effect nade_pink_explode count 8 type spark @@ -8816,7 +8816,7 @@ liquidfriction 0.8 velocityoffset 0 0 80 originjitter 16 16 16 velocityjitter 424 424 624 -// derbis +// debris effect nade_pink_explode notunderwater count 8 @@ -8829,7 +8829,7 @@ originjitter 64 64 64 velocityjitter 324 324 324 rotate -180 180 -100 100 -effect nade_explode +effect nade_neutral_explode countabsolute 1 type decal tex 8 16 @@ -8840,7 +8840,7 @@ lightradius 300 lightradiusfade 1500 lightcolor 100 20 20 // shockwave -effect nade_explode +effect nade_neutral_explode type smoke countabsolute 1 tex 33 33 @@ -8850,7 +8850,7 @@ color 0xff0000 0xffa2a2 alpha 80 80 650 velocitymultiplier 44 // fire -effect nade_explode +effect nade_neutral_explode notunderwater count 16 type smoke @@ -8863,8 +8863,8 @@ airfriction 30 originjitter 50 50 50 velocityjitter 320 320 320 rotate -180 180 -9 9 -// fire streched -effect nade_explode +// fire stretched +effect nade_neutral_explode count 8 type spark tex 48 55 @@ -8876,7 +8876,7 @@ sizeincrease 40 velocityjitter 30 30 30 airfriction -9 //smoke -effect nade_explode +effect nade_neutral_explode type smoke count 32 blend alpha @@ -8892,7 +8892,7 @@ sizeincrease 50 airfriction 0.04 gravity 0.4 // underwater bubbles -effect nade_explode +effect nade_neutral_explode underwater count 32 type bubble @@ -8907,7 +8907,7 @@ originjitter 16 16 16 velocityjitter 196 196 196 rotate 0 0 0 0 // bouncing sparks -effect nade_explode +effect nade_neutral_explode notunderwater count 8 type spark @@ -8923,7 +8923,7 @@ velocityoffset 0 0 80 originjitter 16 16 16 velocityjitter 424 424 624 // notbouncing sparks -effect nade_explode +effect nade_neutral_explode count 16 type spark tex 40 40 @@ -8936,8 +8936,8 @@ liquidfriction 0.8 velocityoffset 0 0 80 originjitter 16 16 16 velocityjitter 424 424 624 -// derbis -effect nade_explode +// debris +effect nade_neutral_explode notunderwater count 8 type smoke @@ -9041,15 +9041,6 @@ effect arc_lightning // impact sparks (underwater) airfriction 5 liquidfriction 5 -effect arc_beam // beam core - type beam - countabsolute 1 - tex 200 200 - color 0xFFFFFF 0xFFFFFF - size 4 4 - alpha 512 512 0 - time 0.005 0.005 - effect arc_beam // sparks on beam type spark stretchfactor 1