From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 2 Apr 2011 22:16:49 +0000 (+0300)
Subject: Uzi effects, as well as tweaks to the shotgun ones.
X-Git-Tag: xonotic-v0.6.0~110^2^2~163
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3aefe637cf39fb10db9e4acf3fc132fb5d82d68f;p=xonotic%2Fxonotic-data.pk3dir.git

Uzi effects, as well as tweaks to the shotgun ones.
---

diff --git a/effectinfo.txt b/effectinfo.txt
index 1f447a779..63d26a4a3 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -5285,7 +5285,7 @@ effect weapondamage_shotgun
 count 0.5
 type blood
 tex 24 32
-size 3 8
+size 4 9
 alpha 256 256 64
 color 0xA8FFFF 0xA8FFFFF
 bounce -1
@@ -5311,7 +5311,7 @@ effect weapondamage_shotgun_alien
 count 0.5
 type blood
 tex 24 32
-size 3 8
+size 4 9
 alpha 256 256 64
 color 0xDC9BCD 0xDC9BCD
 bounce -1
@@ -5337,7 +5337,7 @@ effect weapondamage_shotgun_robot
 count 0.5
 type blood
 tex 24 32
-size 3 8
+size 4 9
 alpha 256 256 64
 color 0xC0D890 0xC0D890
 bounce -1
@@ -5357,6 +5357,84 @@ alpha 100 256 400
 color 0x000000 0x301860
 originjitter 11 11 11
 
+// 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
+type blood
+tex 24 32
+size 3 8
+alpha 256 256 64
+color 0xA8FFFF 0xA8FFFFF
+bounce -1
+airfriction 1
+liquidfriction 4
+velocityjitter 64 64 64
+velocitymultiplier 5
+staincolor 0x808080 0x808080
+staintex 16 24
+//blood mist
+effect weapondamage_uzi
+countabsolute 1
+type alphastatic
+tex 0 8
+size 6 12
+alpha 100 256 400
+color 0x000000 0x420000
+originjitter 11 11 11
+
+// 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
+type blood
+tex 24 32
+size 3 8
+alpha 256 256 64
+color 0xDC9BCD 0xDC9BCD
+bounce -1
+airfriction 1
+liquidfriction 4
+velocityjitter 64 64 64
+velocitymultiplier 5
+staincolor 0x808080 0x808080
+staintex 16 24
+//blood mist
+effect weapondamage_uzi_alien
+countabsolute 1
+type alphastatic
+tex 0 8
+size 6 12
+alpha 100 256 400
+color 0x000000 0x204010
+originjitter 11 11 11
+
+// 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
+type blood
+tex 24 32
+size 3 8
+alpha 256 256 64
+color 0xC0D890 0xC0D890
+bounce -1
+airfriction 1
+liquidfriction 4
+velocityjitter 64 64 64
+velocitymultiplier 5
+staincolor 0x808080 0x808080
+staintex 16 24
+//blood mist
+effect weapondamage_uzi_robot
+countabsolute 1
+type alphastatic
+tex 0 8
+size 6 12
+alpha 100 256 400
+color 0x000000 0x301860
+originjitter 11 11 11
+
 // --------------------------------
 // End of Weapon Damage Effects
 // --------------------------------
\ No newline at end of file