Added new effects in effectinfo.txt for the sake of Mario's thread in the Merge request

diff --git a/effectinfo.txt b/effectinfo.txt
index 7fc732b7da5037d59c87a0762f85c71f6be3a813..0f9f2f23ca05ff059d71e370c9a54d843e50f41b 100644 (file)
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -6825,6 +6825,93 @@ effect nade_neutral
        trailspacing 16
        underwater
        velocityjitter 16 16 16
+effect nade_green
+       type smoke
+       alpha 100 100 250
+       color 0x40ff9b 0x40ff9b
+       sizeincrease -1
+       size 3 3
+       tex 65 65
+       trailspacing 1
+effect nade_green
+       type smoke
+       alpha 30 30 150
+       color 0xff0000 0xffa2a2
+       notunderwater
+       sizeincrease -10
+       size 15 25
+       tex 65 65
+       trailspacing 8
+effect nade_green
+       type bubble
+       alpha 256 256 256
+       bounce 1.500000
+       color 0x40ff9b 0x40ff9b
+       gravity -0.125000
+       liquidfriction 4
+       size 1 1
+       tex 62 62
+       trailspacing 16
+       underwater
+       velocityjitter 16 16 16
+effect nade_brown
+       type smoke
+       alpha 100 100 250
+       color 0xa85400 0xa85400
+       sizeincrease -1
+       size 3 3
+       tex 65 65
+       trailspacing 1
+effect nade_brown
+       type smoke
+       alpha 30 30 150
+       color 0xff0000 0xffa2a2
+       notunderwater
+       sizeincrease -10
+       size 15 25
+       tex 65 65
+       trailspacing 8
+effect nade_brown
+       type bubble
+       alpha 256 256 256
+       bounce 1.500000
+       color 0xa85400 0xa85400
+       gravity -0.125000
+       liquidfriction 4
+       size 1 1
+       tex 62 62
+       trailspacing 16
+       underwater
+       velocityjitter 16 16 16
+effect nade_purple
+       type smoke
+       alpha 100 100 250
+       color 0x540054 0x540054
+       sizeincrease -1
+       size 3 3
+       tex 65 65
+       trailspacing 1
+effect nade_purple
+       type smoke
+       alpha 30 30 150
+       color 0xff0000 0xffa2a2
+       notunderwater
+       sizeincrease -10
+       size 15 25
+       tex 65 65
+       trailspacing 8
+effect nade_purple
+       type bubble
+       alpha 256 256 256
+       bounce 1.500000
+       color 0x540054 0x540054
+       gravity -0.125000
+       liquidfriction 4
+       size 1 1
+       tex 62 62
+       trailspacing 16
+       underwater
+       velocityjitter 16 16 16
 effect nade_red_burn
        type smoke
        alpha 100 100 250
@@ -7025,6 +7112,126 @@ effect nade_neutral_burn
        tex 71 73
        trailspacing 16
        velocityjitter 10 10 10
+effect nade_green_burn
+       type smoke
+       alpha 100 100 250
+       color 0x40ff9b 0xff3c00
+       sizeincrease -1
+       size 5 5
+       tex 65 65
+       trailspacing 1
+effect nade_green_burn
+       type smoke
+       alpha 200 200 1000
+       color 0xff0000 0xffa2a2
+       notunderwater
+       sizeincrease -30
+       size 45 25
+       tex 65 65
+       trailspacing 64
+effect nade_green_burn
+       type bubble
+       alpha 256 256 256
+       bounce 1.500000
+       color 0x40ff9b 0xff3c00
+       gravity -0.125000
+       liquidfriction 4
+       size 1 1
+       tex 62 62
+       trailspacing 16
+       underwater
+       velocityjitter 16 16 16
+effect nade_green_burn
+       type smoke
+       alpha 300 900 1500
+       color 0x40ff9b 0xff3c00
+       originjitter 2 2 2
+       rotate -180 180 20 -20
+       sizeincrease -40
+       size 15 25
+       tex 71 73
+       trailspacing 16
+       velocityjitter 10 10 10
+effect nade_brown_burn
+       type smoke
+       alpha 100 100 250
+       color 0xa85400 0xff3c00
+       sizeincrease -1
+       size 5 5
+       tex 65 65
+       trailspacing 1
+effect nade_brown_burn
+       type smoke
+       alpha 200 200 1000
+       color 0xff0000 0xffa2a2
+       notunderwater
+       sizeincrease -30
+       size 45 25
+       tex 65 65
+       trailspacing 64
+effect nade_brown_burn
+       type bubble
+       alpha 256 256 256
+       bounce 1.500000
+       color 0xa85400 0xff3c00
+       gravity -0.125000
+       liquidfriction 4
+       size 1 1
+       tex 62 62
+       trailspacing 16
+       underwater
+       velocityjitter 16 16 16
+effect nade_brown_burn
+       type smoke
+       alpha 300 900 1500
+       color 0xa85400 0xff3c00
+       originjitter 2 2 2
+       rotate -180 180 20 -20
+       sizeincrease -40
+       size 15 25
+       tex 71 73
+       trailspacing 16
+       velocityjitter 10 10 10
+effect nade_purple_burn
+       type smoke
+       alpha 100 100 250
+       color 0x540054 0xff3c00
+       sizeincrease -1
+       size 5 5
+       tex 65 65
+       trailspacing 1
+effect nade_purple_burn
+       type smoke
+       alpha 200 200 1000
+       color 0xff0000 0xffa2a2
+       notunderwater
+       sizeincrease -30
+       size 45 25
+       tex 65 65
+       trailspacing 64
+effect nade_purple_burn
+       type bubble
+       alpha 256 256 256
+       bounce 1.500000
+       color 0x540054 0xff3c00
+       gravity -0.125000
+       liquidfriction 4
+       size 1 1
+       tex 62 62
+       trailspacing 16
+       underwater
+       velocityjitter 16 16 16
+effect nade_purple_burn
+       type smoke
+       alpha 300 900 1500
+       color 0x540054 0xff3c00
+       originjitter 2 2 2
+       rotate -180 180 20 -20
+       sizeincrease -40
+       size 15 25
+       tex 71 73
+       trailspacing 16
+       velocityjitter 10 10 10
 effect nade_blue_explode
        type decal
        alpha 256 256 0
@@ -7575,6 +7782,336 @@ effect nade_neutral_explode
        size 20 40
        tex 71 73
        velocityjitter 324 324 324
+effect nade_green_explode
+       type decal
+       alpha 256 256 0
+       countabsolute 1
+       lightcolor 100 20 20
+       lightradiusfade 1500
+       lightradius 300
+       originjitter 26 26 26
+       size 88 88
+       tex 8 16
+effect nade_green_explode
+       type smoke
+       alpha 80 80 650
+       color 0xff0000 0xffa2a2
+       countabsolute 1
+       sizeincrease 1800
+       size 32 32
+       tex 33 33
+       velocitymultiplier 44
+effect nade_green_explode
+       type smoke
+       airfriction 30
+       alpha 400 656 2000
+       color 0x40ff9b 0xa647d3
+       count 16
+       notunderwater
+       originjitter 50 50 50
+       rotate -180 180 -9 9
+       sizeincrease 555
+       size 20 24
+       tex 48 55
+       velocityjitter 320 320 320
+effect nade_green_explode
+       type spark
+       airfriction -9
+       alpha 1500 3000 13000
+       color 0x40ff9b 0xff4200
+       count 8
+       sizeincrease 40
+       size 60 90
+       stretchfactor 80
+       tex 48 55
+       velocityjitter 30 30 30
+effect nade_green_explode
+       type smoke
+       airfriction 0.040000
+       alpha 128 328 390
+       blend alpha
+       color 0x222222 0x000000
+       count 32
+       gravity 0.400000
+       originjitter 50 50 10
+       rotate -180 180 2 -2
+       sizeincrease 50
+       size 60 30
+       tex 0 7
+       velocityjitter 200 200 200
+       velocityoffset 0 0 180
+effect nade_green_explode
+       type bubble
+       alpha 128 256 64
+       bounce 1.500000
+       color 0x404040 0x808080
+       count 32
+       gravity -0.125000
+       liquidfriction 0.250000
+       originjitter 16 16 16
+       size 3 6
+       tex 62 62
+       underwater
+       velocityjitter 196 196 196
+effect nade_green_explode
+       type spark
+       airfriction 1
+       alpha 644 956 484
+       bounce 1.600000
+       color 0xff0000 0xffa2a2
+       count 8
+       gravity 1
+       liquidfriction 0.800000
+       notunderwater
+       originjitter 16 16 16
+       size 1 2
+       tex 40 40
+       velocityjitter 424 424 624
+       velocityoffset 0 0 80
+effect nade_green_explode
+       type spark
+       airfriction 0.700000
+       alpha 644 956 684
+       color 0xff0000 0xffa2a2
+       count 16
+       gravity 0.500000
+       liquidfriction 0.800000
+       originjitter 16 16 16
+       size 1 2
+       tex 40 40
+       velocityjitter 424 424 624
+       velocityoffset 0 0 80
+effect nade_green_explode
+       type smoke
+       alpha 644 956 2500
+       color 0xff0000 0xffa2a2
+       count 8
+       notunderwater
+       originjitter 64 64 64
+       rotate -180 180 -100 100
+       size 20 40
+       tex 71 73
+       velocityjitter 324 324 324
+effect nade_brown_explode
+       type decal
+       alpha 256 256 0
+       countabsolute 1
+       lightcolor 100 20 20
+       lightradiusfade 1500
+       lightradius 300
+       originjitter 26 26 26
+       size 88 88
+       tex 8 16
+effect nade_brown_explode
+       type smoke
+       alpha 80 80 650
+       color 0xff0000 0xffa2a2
+       countabsolute 1
+       sizeincrease 1800
+       size 32 32
+       tex 33 33
+       velocitymultiplier 44
+effect nade_brown_explode
+       type smoke
+       airfriction 30
+       alpha 400 656 2000
+       color 0xa85400 0xa647d3
+       count 16
+       notunderwater
+       originjitter 50 50 50
+       rotate -180 180 -9 9
+       sizeincrease 555
+       size 20 24
+       tex 48 55
+       velocityjitter 320 320 320
+effect nade_brown_explode
+       type spark
+       airfriction -9
+       alpha 1500 3000 13000
+       color 0xa85400 0xff4200
+       count 8
+       sizeincrease 40
+       size 60 90
+       stretchfactor 80
+       tex 48 55
+       velocityjitter 30 30 30
+effect nade_brown_explode
+       type smoke
+       airfriction 0.040000
+       alpha 128 328 390
+       blend alpha
+       color 0x222222 0x000000
+       count 32
+       gravity 0.400000
+       originjitter 50 50 10
+       rotate -180 180 2 -2
+       sizeincrease 50
+       size 60 30
+       tex 0 7
+       velocityjitter 200 200 200
+       velocityoffset 0 0 180
+effect nade_brown_explode
+       type bubble
+       alpha 128 256 64
+       bounce 1.500000
+       color 0x404040 0x808080
+       count 32
+       gravity -0.125000
+       liquidfriction 0.250000
+       originjitter 16 16 16
+       size 3 6
+       tex 62 62
+       underwater
+       velocityjitter 196 196 196
+effect nade_brown_explode
+       type spark
+       airfriction 1
+       alpha 644 956 484
+       bounce 1.600000
+       color 0xff0000 0xffa2a2
+       count 8
+       gravity 1
+       liquidfriction 0.800000
+       notunderwater
+       originjitter 16 16 16
+       size 1 2
+       tex 40 40
+       velocityjitter 424 424 624
+       velocityoffset 0 0 80
+effect nade_brown_explode
+       type spark
+       airfriction 0.700000
+       alpha 644 956 684
+       color 0xff0000 0xffa2a2
+       count 16
+       gravity 0.500000
+       liquidfriction 0.800000
+       originjitter 16 16 16
+       size 1 2
+       tex 40 40
+       velocityjitter 424 424 624
+       velocityoffset 0 0 80
+effect nade_brown_explode
+       type smoke
+       alpha 644 956 2500
+       color 0xff0000 0xffa2a2
+       count 8
+       notunderwater
+       originjitter 64 64 64
+       rotate -180 180 -100 100
+       size 20 40
+       tex 71 73
+       velocityjitter 324 324 324
+effect nade_purple_explode
+       type decal
+       alpha 256 256 0
+       countabsolute 1
+       lightcolor 100 20 20
+       lightradiusfade 1500
+       lightradius 300
+       originjitter 26 26 26
+       size 88 88
+       tex 8 16
+effect nade_purple_explode
+       type smoke
+       alpha 80 80 650
+       color 0xff0000 0xffa2a2
+       countabsolute 1
+       sizeincrease 1800
+       size 32 32
+       tex 33 33
+       velocitymultiplier 44
+effect nade_purple_explode
+       type smoke
+       airfriction 30
+       alpha 400 656 2000
+       color 0x540054 0xa647d3
+       count 16
+       notunderwater
+       originjitter 50 50 50
+       rotate -180 180 -9 9
+       sizeincrease 555
+       size 20 24
+       tex 48 55
+       velocityjitter 320 320 320
+effect nade_purple_explode
+       type spark
+       airfriction -9
+       alpha 1500 3000 13000
+       color 0x540054 0xff4200
+       count 8
+       sizeincrease 40
+       size 60 90
+       stretchfactor 80
+       tex 48 55
+       velocityjitter 30 30 30
+effect nade_purple_explode
+       type smoke
+       airfriction 0.040000
+       alpha 128 328 390
+       blend alpha
+       color 0x222222 0x000000
+       count 32
+       gravity 0.400000
+       originjitter 50 50 10
+       rotate -180 180 2 -2
+       sizeincrease 50
+       size 60 30
+       tex 0 7
+       velocityjitter 200 200 200
+       velocityoffset 0 0 180
+effect nade_purple_explode
+       type bubble
+       alpha 128 256 64
+       bounce 1.500000
+       color 0x404040 0x808080
+       count 32
+       gravity -0.125000
+       liquidfriction 0.250000
+       originjitter 16 16 16
+       size 3 6
+       tex 62 62
+       underwater
+       velocityjitter 196 196 196
+effect nade_purple_explode
+       type spark
+       airfriction 1
+       alpha 644 956 484
+       bounce 1.600000
+       color 0xff0000 0xffa2a2
+       count 8
+       gravity 1
+       liquidfriction 0.800000
+       notunderwater
+       originjitter 16 16 16
+       size 1 2
+       tex 40 40
+       velocityjitter 424 424 624
+       velocityoffset 0 0 80
+effect nade_purple_explode
+       type spark
+       airfriction 0.700000
+       alpha 644 956 684
+       color 0xff0000 0xffa2a2
+       count 16
+       gravity 0.500000
+       liquidfriction 0.800000
+       originjitter 16 16 16
+       size 1 2
+       tex 40 40
+       velocityjitter 424 424 624
+       velocityoffset 0 0 80
+effect nade_purple_explode
+       type smoke
+       alpha 644 956 2500
+       color 0xff0000 0xffa2a2
+       count 8
+       notunderwater
+       originjitter 64 64 64
+       rotate -180 180 -100 100
+       size 20 40
+       tex 71 73
+       velocityjitter 324 324 324
 effect shockwave_attack
        type spark
        airfriction 1

diff --git a/qcsrc/common/effects/effectinfo_nades.inc b/qcsrc/common/effects/effectinfo_nades.inc
index 9c655579a431762367173ed39bb144c6b2e2878f..b8af3fbf2029657e1d129530ed2e3dbd1fa2bcae 100644 (file)
--- a/qcsrc/common/effects/effectinfo_nades.inc
+++ b/qcsrc/common/effects/effectinfo_nades.inc
@@ -54,6 +54,9 @@ nade(red,       "0xff0000", "0xff3c00", "0xff0000", "0xffa2a2")
 nade(yellow,    "0xFFFF0F", "0xFFFF0F", "0xFFFF0F", "0xFFFF0F")
 nade(pink,      "0xFF0FFF", "0xFF0FFF", "0xFF0FFF", "0xFF0FFF")
 nade(neutral,   "0xFFFFFF", "0xFFFFFF", "0xFFFFFF", "0xFFFFFF")
+nade(green,     "0x40ff9b", "0x40ff9b", "0x40ff9b", "0xffa2a2")
+nade(brown,     "0xa85400", "0xa85400", "0xa85400", "0xffa2a2")
+nade(purple,    "0x540054", "0x540054", "0x540054", "0xffa2a2")
 #undef nade
 
 #define nade_burn(name, colormin1, colormax1, colormin2, colormax2) \
@@ -132,6 +135,9 @@ nade_burn(blue,     "0x006cff", "0x0600ff", "0x0600ff", "0x9794ff")
 nade_burn(yellow,   "0xFFFF0F", "0xFFFF0F", "0xFFFF0F", "0xFFFF0F")
 nade_burn(pink,     "0xFF0FFF", "0xFF0FFF", "0xFF0FFF", "0xFF0FFF")
 nade_burn(neutral,  "0xFFFFFF", "0xFFFFFF", "0xFFFFFF", "0xFFFFFF")
+nade_burn(green,    "0x40ff9b", "0x40ff9b", "0x40ff9b", "0xffa2a2")
+nade_burn(brown,    "0xa85400", "0xa85400", "0xa85400", "0xffa2a2")
+nade_burn(purple,   "0x540054", "0x540054", "0x540054", "0xffa2a2")
 #undef nade_burn
 
 #define nade_explode(name, colorlight, colormin1, colormax1, colormin2, colormax2, colormin3, colormax3) \
@@ -313,4 +319,7 @@ nade_explode(red,       '100.0 20.0 20.0', "0xff0000", "0xffa2a2", "0xff0000", "
 nade_explode(yellow,    '100.0 20.0 20.0', "0xff0000", "0xffa2a2", "0xFFFF0F", "0xFFFF0F", "0xff0000", "0xffa2a2")
 nade_explode(pink,      '100.0 20.0 20.0', "0xff0000", "0xffa2a2", "0xFF0FFF", "0xFF0FFF", "0xff0000", "0xffa2a2")
 nade_explode(neutral,   '100.0 20.0 20.0', "0xff0000", "0xffa2a2", "0xFFFFFF", "0xFFFFFF", "0xff0000", "0xffa2a2")
+nade_explode(green,     '100.0 20.0 20.0', "0x40ff9b", "0xffa2a2", "0x40ff9b", "0x40ff9b", "0xff0000", "0xffa2a2")
+nade_explode(brown,     '100.0 20.0 20.0', "0xa85400", "0xffa2a2", "0xa85400", "0xa85400", "0xff0000", "0xffa2a2")
+nade_explode(purple,    '100.0 20.0 20.0', "0x540054", "0xffa2a2", "0x540054", "0x540054", "0xff0000", "0xffa2a2")
 #undef nade_explode

diff --git a/qcsrc/common/mutators/mutator/nades/nades.inc b/qcsrc/common/mutators/mutator/nades/nades.inc
index 24b32f84bf74e29f6f677934f8d2a334c7755c43..b9c110e0e273d07b08fd68148ddc2f98991e90b8 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.inc
+++ b/qcsrc/common/mutators/mutator/nades/nades.inc
@@ -120,9 +120,9 @@ REGISTER_NADE(AMMO) {
 REGISTER_NADE(DARK) {
     this.m_color = '0.23 0 0.23';
     this.m_name = _("Dark grenade");
-    this.m_icon = "nade_dark";  //nade icon (put texture, please)
+    this.m_icon = "nade_dark";
 #ifdef GAMEQC
     NADE_PROJECTILE(0, PROJECTILE_NADE_DARK, EFFECT_NADE_TRAIL_PURPLE);
-    NADE_PROJECTILE(1, PROJECTILE_NADE_DARK_BURN, EFFECT_NADE_TRAIL_BURN_PURPLE);
+    NADE_PROJECTILE(1, PROJECTILE_NADE_DARK_BURN, EFFECT_Null);
 #endif
 }
\ No newline at end of file

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 6025c72238d410e634ce467447dcb79838db15ea..b04ba282e350ef69ed034d0a06fca512fe7a3701 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -832,7 +832,7 @@ void nade_ammo_touch(entity this, entity toucher)
                        
                        if (this.nade_show_particles)
                        {
-                                       Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1);
+                               Send_Effect(EFFECT_HEALING, toucher.origin, '0 0 0', 1);
                        }
                }
                else if ( ammo_factor < 0 )