From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 26 Nov 2011 23:31:24 +0000 (+0200)
Subject: Xonotic port: Use Morphed's new blood. Don't get any funny ideas, I'm talking about... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c54b1742e2030dc02dea09a70e55a35dc75b3d9;p=voretournament%2Fvoretournament.git

Xonotic port: Use Morphed's new blood. Don't get any funny ideas, I'm talking about some particle effects :P
---

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index 18f9e9e8..f1f7fbe0 100644
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -738,25 +738,30 @@ velocityjitter 512 512 512
 // used in qcsrc/client/gibs.qc:	pointparticles(particleeffectnum("blood"), self.origin + '0 0 1', '0 0 30', 10)
 // used in qcsrc/client/gibs.qc:			pointparticles(particleeffectnum("blood"), org, vel, amount * 16)
 effect blood
-count 0.333
-type blood
+count 0.4
+type spark
+blend invmod
 tex 24 32
-size 3 8
-alpha 256 256 64
+size 5 11
+alpha 1560 2560 7000
 color 0xA8FFFF 0xA8FFFFF
 bounce -1
-airfriction 1
-liquidfriction 4
-velocityjitter 64 64 64
-velocitymultiplier 5
+airfriction 0.4
+velocityjitter 99 99 55
+//velocitymultiplier 2
 staincolor 0x808080 0x808080
 staintex 16 24
+stainsize 1 2
+stretchfactor 20
+sizeincrease 20
 //blood mist
 effect blood
 countabsolute 1
 type alphastatic
-tex 0 8
+blend invmod
+tex 24 32
 size 25 30
+sizeincrease 20
 alpha 100 256 400
 color 0x000000 0x420000
 originjitter 11 11 11
@@ -785,26 +790,38 @@ stretchfactor 0.6
 // normal super gory blood trail (used by gibs)
 // used in qcsrc/client/gibs.qc:		trailparticles(self, particleeffectnum("TR_BLOOD"), oldorg, self.origin)
 effect TR_BLOOD
-trailspacing 16
-type blood
+trailspacing 20
+type spark
+blend invmod
 color 0xA8FFFF 0xA8FFFF
 tex 24 32
-size 8 8
-alpha 384 384 192
+size 4 19
+alpha 384 984 1492
 bounce -1
-airfriction 1
-liquidfriction 4
+gravity 0.4
+airfriction -2
+liquidfriction 1
 velocityjitter 64 64 64
-velocitymultiplier 0.5
+velocitymultiplier -0.1
 staincolor 0x808080 0x808080
 staintex 16 24
-
-
+stainsize 1 2
+stretchfactor 7
+sizeincrease -5
+// splash around gib
+effect TR_BLOOD
+trailspacing 42
+type blood
+color 0xA8FFFF 0xA8FFFF
+tex 24 32
+size 4 6
+alpha 684 684 7492
+sizeincrease 500
 
 // thinner blood trail (used by quake zombies)
 // used in qcsrc/client/gibs.qc:		trailparticles(self, particleeffectnum("TR_SLIGHTBLOOD"), oldorg, self.origin)
 effect TR_SLIGHTBLOOD
-trailspacing 32
+trailspacing 64
 type blood
 color 0xA8FFFF 0xA8FFFF
 tex 24 32
@@ -3486,86 +3503,147 @@ tex 40 40
 //lighttime 0
 
 effect alien_blood
-count 0.333
-type blood
+count 0.4
+type spark
+blend invmod
 tex 24 32
-size 3 8
-alpha 256 256 64
+size 5 11
+alpha 1560 2560 7000
 color 0xDC9BCD 0xDC9BCD
 bounce -1
-airfriction 1
-liquidfriction 4
-velocityjitter 64 64 64
-velocitymultiplier 5
-staincolor 0x808080 0x808080
+airfriction 0.4
+velocityjitter 99 99 55
+//velocitymultiplier 2
+staincolor 0xDC9BCD 0xDC9BCD
 staintex 16 24
+stainsize 1 2
+stretchfactor 25
+sizeincrease 20
 //blood mist
 effect alien_blood
 countabsolute 1
-type alphastatic
-tex 0 8
+type smoke
+blend invmod
+tex 24 32
 size 25 30
-alpha 100 256 400
-color 0x000000 0x204010
+sizeincrease 20
+alpha 3000 5560 12000
+color 0xDC9BCD 0xDC9BCD
 originjitter 11 11 11
 
 effect robot_blood
-count 0.333
-type blood
-tex 24 32
-size 3 8
+count 0.167
+type spark
+tex 70 70
+size 1 2
 alpha 256 256 64
-color 0xC0D890 0xC0D890
+color 0xff3000 0xff7373
 bounce -1
+gravity 1
 airfriction 1
 liquidfriction 4
-velocityjitter 64 64 64
-velocitymultiplier 5
-staincolor 0x808080 0x808080
-staintex 16 24
-//blood mist
+velocityjitter 264 264 264
+velocityoffset 0 0 100
+//shockwave
 effect robot_blood
 countabsolute 1
-type alphastatic
-tex 0 8
-size 25 30
-alpha 100 256 400
-color 0x000000 0x301860
+type smoke
+tex 74 74
+size 2 2
+alpha 0 90 1000
+color 0xff8400 0xffbb72
 originjitter 11 11 11
+sizeincrease 800
+// electo sparcks
+effect robot_blood
+count 0.1
+type smoke
+tex 71 73
+size 20 40
+alpha 256 256 5120
+color 0xff3000 0xff8585
+originjitter 41 41 21
+rotate -180 180 4000 -4000
+
 
 
 effect alien_TR_BLOOD
-trailspacing 16
-type blood
+trailspacing 20
+type spark
+blend invmod
 color 0xC080B0 0xC080B0
 tex 24 32
-size 8 8
-alpha 384 384 192
+size 4 19
+alpha 384 984 1492
 bounce -1
-airfriction 1
-liquidfriction 4
+gravity 0.4
+airfriction -2
+liquidfriction 1
 velocityjitter 64 64 64
-velocitymultiplier 0.5
-staincolor 0x808080 0x808080
+velocitymultiplier -0.1
+staincolor 0xC080B0 0xC080B0
 staintex 16 24
+stainsize 1 2
+stretchfactor 7
+sizeincrease -5
+// splash around gib
+effect TR_BLOOD
+trailspacing 42
+type blood
+color 0xA8FFFF 0xA8FFFF
+tex 24 32
+size 4 6
+alpha 684 684 7492
+sizeincrease 500
 
 effect robot_TR_BLOOD
 trailspacing 16
-type blood
+type spark
+blend invmod
 color 0xC0D890 0xC0D890
 tex 24 32
-size 8 8
-alpha 384 384 192
+size 4 13
+alpha 384 984 1892
 bounce -1
-airfriction 1
-liquidfriction 4
+gravity 0.4
+airfriction -2
+liquidfriction 1
 velocityjitter 64 64 64
-velocitymultiplier 0.5
+velocitymultiplier -0.3
 staincolor 0x808080 0x808080
 staintex 16 24
+stainsize 1 3
+stretchfactor 6
+sizeincrease -6
+// fire
+effect robot_TR_BLOOD
+notunderwater
+trailspacing 16
+type spark
+tex 48 55
+color 0x902010 0xff3600
+size 5 20
+alpha 128 256 900
+gravity -1
+airfriction 4
+liquidfriction 4
+stretchfactor 5
+sizeincrease 10
+velocityjitter 44 44 44
+// arcs
+effect robot_TR_BLOOD
+trailspacing 128
+type smoke
+tex 71 73
+color 0xff3000 0xff8585
+size 25 30
+alpha 1128 1256 44900
+rotate -180 180 4000 -4000
+velocityjitter 44 44 44
+
 
 effect alien_TR_SLIGHTBLOOD
-trailspacing 32
+trailspacing 64
 type blood
 color 0xC080B0 0xC080B0
 tex 24 32
@@ -3580,7 +3658,7 @@ staincolor 0x808080 0x808080
 staintex 16 24
 
 effect robot_TR_SLIGHTBLOOD
-trailspacing 32
+trailspacing 64
 type blood
 color 0xC0D890 0xC0D890
 tex 24 32
@@ -3614,50 +3692,101 @@ alpha 256 256 1280
 velocityjitter 256 256 256
 
 effect bloodshower
-count 50
-type blood
+count 125
+type spark
+blend invmod
 tex 24 32
-size 8 8
+size 8 28
 color 0xA8FFFF 0xA8FFFFF
-alpha 256 256 64
+alpha 156 656 1664
 bounce -1
-airfriction 1
+gravity 1
+stretchfactor 3
 liquidfriction 4
-velocityjitter 64 64 64
-velocitymultiplier 1
+velocityjitter 764 764 764
+// velocitymultiplier 1
 staincolor 0x808080 0x808080
 staintex 16 24
+stainsize 1 2
+// center blood
+effect bloodshower
+countabsolute 0.1
+type smoke
+blend invmod
+tex 24 32
+size 1 28
+sizeincrease 300
+originjitter 50 50 50
+color 0xA8FFFF 0xA8FFFFF
+alpha 156 656 1664
 
 effect alien_bloodshower
-count 50
-type blood
+count 125
+type spark
+blend invmod
 tex 24 32
-size 8 8
+size 8 28
 color 0xC080B0 0xC080B0
-alpha 256 256 64
+alpha 156 656 1664
 bounce -1
-airfriction 1
+gravity 1
+stretchfactor 3
 liquidfriction 4
-velocityjitter 64 64 64
-velocitymultiplier 1
-staincolor 0x808080 0x808080
+velocityjitter 764 764 764
+// velocitymultiplier 1
+staincolor 0xC080B0 0xC080B0
 staintex 16 24
+stainsize 1 2
+// center blood
+effect bloodshower
+countabsolute 0.1
+type smoke
+blend invmod
+tex 24 32
+size 1 28
+sizeincrease 300
+originjitter 50 50 50
+color 0xA8FFFF 0xA8FFFFF
+alpha 156 656 1664
+
 
 effect robot_bloodshower
-count 50
-type blood
+count 100
+type spark
+blend invmod
 tex 24 32
-size 8 8
+size 8 28
 color 0xC0D890 0xC0D890
-alpha 256 256 64
+alpha 156 656 1664
 bounce -1
-airfriction 1
+gravity 1
+stretchfactor 3
 liquidfriction 4
-velocityjitter 64 64 64
-velocitymultiplier 1
-staincolor 0x808080 0x808080
+velocityjitter 764 764 764
+// velocitymultiplier 1
+staincolor 0xC0D890 0xC0D890
 staintex 16 24
-
+stainsize 1 2
+// arc
+effect robot_bloodshower
+count 2.5
+type smoke
+tex 71 73
+color 0xff3000 0xff8585
+size 25 40
+alpha 1128 1256 4200
+rotate -180 180 99 -99
+velocityjitter 44 44 44
+originjitter 150 150 150
+// shockwave
+effect robot_bloodshower
+count 2.5
+type smoke
+tex 74 74
+color 0xff3000 0xff8585
+size 5 50
+sizeincrease 3000
+alpha 11 125 990
 
 //red_ground_quake
 //smoke
@@ -4089,7 +4218,7 @@ type smoke
 // core decal
 effect particlegibs_damage_hit
 type blood
-count 1
+count 0.5
 tex 0 8
 size 5 10
 color 0xA8FFFF 0xA8FFFFF
@@ -4104,7 +4233,7 @@ staintex 16 24
 // front blood
 effect particlegibs_damage_hit
 type blood
-count 0.2
+count 0.1
 tex 24 32
 size 10 20
 color 0xA8FFFF 0xA8FFFFF
@@ -4121,7 +4250,7 @@ staintex 16 24
 // back blood
 effect particlegibs_damage_hit
 type blood
-count 0.2
+count 0.1
 tex 24 32
 size 5 15
 color 0xA8FFFF 0xA8FFFFF
@@ -4145,7 +4274,7 @@ staintex 16 24
 // small core blood no decals
 effect particlegibs_damage_dissolve
 type blood
-count 64
+count 32
 tex 0 8
 size 15 20
 color 0x00ffff 0x82ffff
@@ -4160,7 +4289,7 @@ staintex 16 24
 // core decal
 effect particlegibs_damage_dissolve
 type blood
-count 24
+count 12
 tex 0 8
 size 20 40
 color 0xA8FFFF 0xA8FFFFF
@@ -4176,7 +4305,7 @@ staintex 16 24
 // front blood
 effect particlegibs_damage_dissolve
 type blood
-count 64
+count 32
 tex 24 32
 size 10 20
 color 0xA8FFFF 0xA8FFFFF
@@ -4194,7 +4323,7 @@ staintex 16 24
 // back blood
 effect particlegibs_damage_dissolve
 type blood
-count 64
+count 32
 tex 24 32
 size 5 15
 color 0xA8FFFF 0xA8FFFFF
@@ -4212,7 +4341,7 @@ staintex 16 24
 // small bits
 effect particlegibs_damage_dissolve
 type blood
-count 150
+count 75
 tex 24 32
 size 1 1
 color 0xA8FFFF 0xA8FFFFF
diff --git a/data/particles/particlefont.tga b/data/particles/particlefont.tga
index 8ee89adb..a2334822 100644
Binary files a/data/particles/particlefont.tga and b/data/particles/particlefont.tga differ