From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 5 Jan 2012 00:42:55 +0000 (+0200)
Subject: Larger changes and improvements to the damage particles. Added different types of... 
X-Git-Tag: xonotic-v0.6.0~110^2^2~54
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eb3aeb12cb42f0f0cc9af7060f8d3a620fb7a790;p=xonotic%2Fxonotic-data.pk3dir.git

Larger changes and improvements to the damage particles. Added different types of sparks to plasma/ energy damage, made rocket flames look a lot better, and also tweaked bullet blood
---

diff --git a/effectinfo.txt b/effectinfo.txt
index 81e464a3b..dfc83b7ae 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -6546,7 +6546,7 @@ count 3
 type smoke
 tex 0 8
 color 0x880000 0xff4400
-size 4 8
+size 2 4
 sizeincrease 8
 alpha 128 16 128
 gravity 0
@@ -6559,10 +6559,10 @@ rotate 0 180 -30 30
 // shotgun damage effect, normal blood
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_shotgun
-count 0.5
+count 0.6
 type blood
 tex 24 32
-size 2 5
+size 2 4
 alpha 256 256 64
 color 0xA8FFFF 0xA8FFFFF
 bounce -1
@@ -6574,21 +6574,21 @@ staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
 effect weapondamage_shotgun
-countabsolute 1
+count 1
 type alphastatic
 tex 0 8
 size 8 16
 alpha 100 256 400
 color 0x000000 0x420000
-originjitter 3 3 3
+originjitter 1 1 1
 
 // shotgun damage effect, alien blood
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_shotgun_alien
-count 0.5
+count 0.6
 type blood
 tex 24 32
-size 2 5
+size 2 4
 alpha 256 256 64
 color 0xDC9BCD 0xDC9BCD
 bounce -1
@@ -6600,21 +6600,21 @@ staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
 effect weapondamage_shotgun_alien
-countabsolute 1
+count 1
 type alphastatic
 tex 0 8
 size 8 16
 alpha 100 256 400
 color 0x000000 0x204010
-originjitter 3 3 3
+originjitter 1 1 1
 
 // shotgun damage effect, robot blood
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_shotgun_robot
-count 0.5
+count 0.6
 type blood
 tex 24 32
-size 2 5
+size 2 4
 alpha 256 256 64
 color 0xC0D890 0xC0D890
 bounce -1
@@ -6626,105 +6626,105 @@ staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
 effect weapondamage_shotgun_robot
-countabsolute 1
+count 1
 type alphastatic
 tex 0 8
 size 8 16
 alpha 100 256 400
 color 0x000000 0x301860
-originjitter 3 3 3
+originjitter 1 1 1
 
 // uzi damage effect, normal blood
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_uzi
-count 0.25
+count 0.3
 type blood
 tex 24 32
-size 1 4
+size 2 4
 alpha 256 256 64
 color 0xA8FFFF 0xA8FFFFF
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
 effect weapondamage_uzi
-countabsolute 1
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x420000
-originjitter 2 2 2
+originjitter 0 0 0
 
 // uzi damage effect, alien blood
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_uzi_alien
-count 0.25
+count 0.3
 type blood
 tex 24 32
-size 1 4
+size 2 4
 alpha 256 256 64
 color 0xDC9BCD 0xDC9BCD
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
 effect weapondamage_uzi_alien
-countabsolute 1
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x204010
-originjitter 2 2 2
+originjitter 0 0 0
 
 // uzi damage effect, robot blood
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_uzi_robot
-count 0.25
+count 0.3
 type blood
 tex 24 32
-size 1 4
+size 2 4
 alpha 256 256 64
 color 0xC0D890 0xC0D890
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
 effect weapondamage_uzi_robot
-countabsolute 1
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x301860
-originjitter 2 2 2
+originjitter 0 0 0
 
 // minelayer damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_minelayer
 //notunderwater
-count 2
+count 3
 type smoke
 tex 48 55
 size 4 8
-alpha 256 16 256
+alpha 512 64 1024
 gravity -0.5
 color 0x8f0d00 0xff5a00
-sizeincrease -10
-originjitter 4 4 4
+sizeincrease -15
+originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
 effect weapondamage_minelayer
@@ -6749,15 +6749,15 @@ lightcolor 0.7 0.4 0.2
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_grenadelauncher
 //notunderwater
-count 2
+count 3
 type smoke
 tex 48 55
 size 4 8
-alpha 256 16 256
+alpha 512 64 1024
 gravity -0.5
 color 0x8f0d00 0xff5a00
-sizeincrease -10
-originjitter 4 4 4
+sizeincrease -15
+originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
 effect weapondamage_grenadelauncher
@@ -6811,6 +6811,20 @@ velocityjitter 0.4 0.4 0.6
 velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
+// bouncing sparks
+effect weapondamage_electro
+notunderwater
+count 0.5
+type spark
+color 0x003090 0x00CCFF
+size 1 1
+alpha 256 256 384
+gravity 0.2
+airfriction 1
+bounce 1.5
+liquidfriction 0.8
+velocityoffset 0 0 20
+velocityjitter 64 64 64
 // light
 effect weapondamage_electro
 trailspacing 8
@@ -6825,7 +6839,7 @@ count 2
 type static
 tex 38 38
 color 0xff44ff 0x9966ff
-size 3 6
+size 2 4
 sizeincrease -8
 alpha 48 16 48
 gravity -0.0001
@@ -6851,6 +6865,20 @@ velocityjitter 0.4 0.4 0.6
 velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
+// floating sparks
+effect weapondamage_crylink
+notunderwater
+count 0.2
+type spark
+color 0x903090 0xFFD0FF
+size 0.5 0.5
+sizeincrease -8
+alpha 192 192 256
+gravity 0
+airfriction 0.2
+liquidfriction 0.8
+velocityoffset 0 0 0
+velocityjitter 48 48 48
 // light
 effect weapondamage_crylink
 trailspacing 8
@@ -6865,7 +6893,7 @@ count 3
 type smoke
 tex 0 8
 color 0x880000 0xff4400
-size 4 8
+size 2 4
 sizeincrease 10
 alpha 128 16 128
 gravity 0
@@ -6908,6 +6936,20 @@ velocityjitter 0.5 0.5 0.8
 velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
+// bouncing sparks
+effect weapondamage_nex
+count 0.2
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 1 1
+alpha 255 255 112
+bounce 1.6
+stretchfactor 0.7
+velocityjitter 100 100 300
+velocitymultiplier 3
+airfriction 2
+gravity 1
 // light
 effect weapondamage_nex
 trailspacing 8
@@ -6948,6 +6990,20 @@ velocityjitter 0.5 0.5 0.8
 velocitymultiplier 0
 airfriction -0.35
 rotate 0 180 -30 30
+// bouncing sparks
+effect weapondamage_minstanex
+count 0.2
+type spark
+tex 41 41
+color 0xD9FDFF 0xD9FDFF
+size 1 1
+alpha 255 255 112
+bounce 1.6
+stretchfactor 0.7
+velocityjitter 100 100 300
+velocitymultiplier 3
+airfriction 2
+gravity 1
 // light
 effect weapondamage_minstanex
 trailspacing 8
@@ -6958,94 +7014,94 @@ lightcolor 0.6 0.8 0.8
 // sniperrifle damage effect, normal blood
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_sniperrifle
-count 0.25
+count 0.3
 type blood
 tex 24 32
-size 1 4
+size 2 4
 alpha 256 256 64
 color 0xA8FFFF 0xA8FFFFF
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
 effect weapondamage_sniperrifle
-countabsolute 1
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x420000
-originjitter 2 2 2
+originjitter 0 0 0
 
 // sniperrifle damage effect, alien blood
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_sniperrifle_alien
-count 0.25
+count 0.3
 type blood
 tex 24 32
-size 1 4
+size 2 4
 alpha 256 256 64
 color 0xDC9BCD 0xDC9BCD
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
 effect weapondamage_sniperrifle_alien
-countabsolute 1
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x204010
-originjitter 2 2 2
+originjitter 0 0 0
 
 // sniperrifle damage effect, robot blood
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_sniperrifle_robot
-count 0.25
+count 0.3
 type blood
 tex 24 32
-size 1 4
+size 2 4
 alpha 256 256 64
 color 0xC0D890 0xC0D890
 bounce -1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
+velocityjitter 32 32 32
 velocitymultiplier 5
 staincolor 0x808080 0x808080
 staintex 16 24
 //blood mist
 effect weapondamage_sniperrifle_robot
-countabsolute 1
+count 1
 type alphastatic
 tex 0 8
 size 6 12
 alpha 100 256 400
 color 0x000000 0x301860
-originjitter 2 2 2
+originjitter 0 0 0
 
 // seeker damage effect
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_seeker
 //notunderwater
-count 2
+count 3
 type smoke
 tex 48 55
-size 3 7
-alpha 256 16 256
-gravity -0.5
-color 0x8f0d00 0xff5a00
+size 4 8
+alpha 512 32 1024
+gravity -0.3
+color 0x8f0c00 0xff2200
 sizeincrease -10
-originjitter 4 4 4
+originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
 effect weapondamage_seeker
@@ -7053,7 +7109,7 @@ type alphastatic
 count 2
 tex 0 8
 size 2 4
-sizeincrease 5
+sizeincrease 10
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
@@ -7070,15 +7126,15 @@ lightcolor 0.7 0.5 0.1
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum(effectnum), org, '0 0 0', 1);
 effect weapondamage_hagar
 //notunderwater
-count 2
+count 3
 type smoke
 tex 48 55
-size 3 7
-alpha 256 16 256
-gravity -0.5
-color 0x8f0d00 0xff5a00
+size 4 8
+alpha 512 32 1024
+gravity -0.3
+color 0x8f0c00 0xff3a00
 sizeincrease -10
-originjitter 4 4 4
+originjitter 2 2 2
 velocityjitter 22 22 50
 // smoke
 effect weapondamage_hagar
@@ -7086,7 +7142,7 @@ type alphastatic
 count 2
 tex 0 8
 size 2 4
-sizeincrease 5
+sizeincrease 10
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
@@ -7106,8 +7162,8 @@ effect weapondamage_fireball
 count 4
 type smoke
 tex 48 55
-size 10 20
-alpha 192 16 192
+size 5 10
+alpha 256 16 512
 gravity -0.5
 color 0x8f0d00 0xff5a00
 sizeincrease -10
@@ -7118,8 +7174,8 @@ effect weapondamage_fireball
 type alphastatic
 count 4
 tex 0 8
-size 8 16
-sizeincrease 5
+size 4 8
+sizeincrease 10
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
@@ -7139,24 +7195,24 @@ effect weapondamage_rocketlauncher
 count 3
 type smoke
 tex 48 55
-size 7 14
-alpha 256 16 256
-gravity -0.5
-color 0x8f0d00 0xff5a00
+size 5 10
+alpha 512 64 1024
+gravity -0.7
+color 0x8f0c00 0xff2a00
 sizeincrease -10
-originjitter 6 6 6
-velocityjitter 22 22 50
+originjitter 4 4 4
+velocityjitter 22 22 30
 // smoke
 effect weapondamage_rocketlauncher
 type alphastatic
 count 3
 tex 0 8
-size 5 10
-sizeincrease 5
+size 4 8
+sizeincrease 10
 alpha 128 32 128
 color 0x000000 0x111111
 gravity -0.3
-originjitter 6 6 6
+originjitter 4 4 4
 velocityjitter 11 11 50
 // light
 effect weapondamage_rocketlauncher