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

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

diff --git a/data/particles/particlefont.tga b/data/particles/particlefont.tga
index 8ee89adb08bc7ad249a7ff3162ce9bf74ce66315..a23348225edd26dc8f246b1a2ab9c45d495a0024 100644 (file)
Binary files a/data/particles/particlefont.tga and b/data/particles/particlefont.tga differ