From a3705a7d11bd430f2797e0f4de9a6636c5ab077d Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Thu, 26 May 2011 02:27:34 +0000
Subject: [PATCH] Updated SMOKE particles. They look much much nicer now.
 Enjoy!

This was SVN commit r9552.
---
 binaries/data/mods/public/art/particles/smoke.xml    | 12 ++++++------
 .../mods/public/art/particles/smoke_catapult.xml     |  8 ++++----
 .../mods/public/art/particles/smoke_homestead.xml    |  6 +++---
 .../data/mods/public/art/particles/smoke_jav.xml     | 10 +++++-----
 .../public/art/textures/particles/smoke_128a.png     |  3 +++
 .../public/art/textures/particles/smoke_256a.png     |  3 +++
 .../mods/public/art/textures/particles/smoke_64a.png |  3 +++
 7 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/particles/smoke_128a.png
 create mode 100644 binaries/data/mods/public/art/textures/particles/smoke_256a.png
 create mode 100644 binaries/data/mods/public/art/textures/particles/smoke_64a.png

diff --git a/binaries/data/mods/public/art/particles/smoke.xml b/binaries/data/mods/public/art/particles/smoke.xml
index 538fd9afcf..0b12e86852 100644
--- a/binaries/data/mods/public/art/particles/smoke.xml
+++ b/binaries/data/mods/public/art/particles/smoke.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
 
-    <texture>art/textures/particles/smoke.png</texture>
-    <blend mode="multiply"/>
+    <texture>art/textures/particles/smoke_64a.png</texture>
+    <blend mode="over"/>
 
     <start_full/>
 
-    <constant name="emissionrate" value="10.0"/>
-    <uniform name="lifetime" min="8.0" max="10.0"/>
+    <constant name="emissionrate" value="9.0"/>
+    <uniform name="lifetime" min="10.0" max="12.0"/>
 
     <constant name="position.y" value="1.5"/>
 
     <uniform name="angle" min="-3.14" max="3.14"/>
 
-    <uniform name="velocity.x" min="-0.5" max="0.5"/>
+    <uniform name="velocity.x" min="-0.3" max="0.3"/>
     <uniform name="velocity.y" min="2.0" max="2.5"/>
     <uniform name="velocity.z" min="-0.5" max="0.5"/>
     <uniform name="velocity.angle" min="-2.0" max="2.0"/>
 
     <uniform name="size" min="2.5" max="3.5"/>
 
-    <uniform name="color.r" min="0.2" max="0.4"/>
+    <uniform name="color.r" min="0.6" max="1.0"/>
     <copy name="color.g" from="color.r"/>
     <copy name="color.b" from="color.r"/>
 
diff --git a/binaries/data/mods/public/art/particles/smoke_catapult.xml b/binaries/data/mods/public/art/particles/smoke_catapult.xml
index 9a76f0d99e..0477f5b0e3 100644
--- a/binaries/data/mods/public/art/particles/smoke_catapult.xml
+++ b/binaries/data/mods/public/art/particles/smoke_catapult.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
 
-    <texture>art/textures/particles/smoke.png</texture>
-    <blend mode="multiply"/>
+    <texture>art/textures/particles/smoke_128a.png</texture>
+    <blend mode="over"/>
 
     <constant name="emissionrate" value="15.0"/>
     <uniform name="lifetime" min="8.0" max="10.0"/>
@@ -18,8 +18,8 @@
 
     <uniform name="size" min="2.5" max="3.5"/>
 
-    <uniform name="color.r" min="0.2" max="0.4"/>
+    <uniform name="color.r" min="0.4" max="0.8"/>
     <copy name="color.g" from="color.r"/>
     <copy name="color.b" from="color.r"/>
-
+	
 </particles>
diff --git a/binaries/data/mods/public/art/particles/smoke_homestead.xml b/binaries/data/mods/public/art/particles/smoke_homestead.xml
index 3f73f4f007..5cd0ad4bfc 100644
--- a/binaries/data/mods/public/art/particles/smoke_homestead.xml
+++ b/binaries/data/mods/public/art/particles/smoke_homestead.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
 
-    <texture>art/textures/particles/smoke.png</texture>
-    <blend mode="multiply"/>
+    <texture>art/textures/particles/smoke_64a.png</texture>
+    <blend mode="over"/>
 
     <constant name="emissionrate" value="10.0"/>
     <uniform name="lifetime" min="8.0" max="10.0"/>
@@ -20,7 +20,7 @@
 
     <uniform name="size" min="2.5" max="3.5"/>
 
-    <uniform name="color.r" min="0.2" max="0.4"/>
+    <uniform name="color.r" min="0.3" max="0.7"/>
     <copy name="color.g" from="color.r"/>
     <copy name="color.b" from="color.r"/>
 
diff --git a/binaries/data/mods/public/art/particles/smoke_jav.xml b/binaries/data/mods/public/art/particles/smoke_jav.xml
index 4e8c860404..f7fef0f63e 100644
--- a/binaries/data/mods/public/art/particles/smoke_jav.xml
+++ b/binaries/data/mods/public/art/particles/smoke_jav.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <particles>
 
-    <texture>art/textures/particles/smoke.png</texture>
-    <blend mode="multiply"/>
+    <texture>art/textures/particles/smoke_64a.png</texture>
+    <blend mode="over"/>
 
     <constant name="emissionrate" value="9.0"/>
-    <uniform name="lifetime" min="5.0" max="8.0"/>
+    <uniform name="lifetime" min="7.0" max="8.0"/>
 	
     <constant name="position.y" value="1.0"/>
 
     <uniform name="angle" min="-3.14" max="3.14"/>
 
-    <uniform name="velocity.x" min="-0.5" max="0.5"/>
+    <uniform name="velocity.x" min="-0.3" max="0.3"/>
     <uniform name="velocity.y" min="2.0" max="2.5"/>
     <uniform name="velocity.z" min="-0.5" max="0.5"/>
     <uniform name="velocity.angle" min="-2.0" max="2.0"/>
 
     <uniform name="size" min="0.75" max="1.75"/>
 
-    <uniform name="color.r" min="0.2" max="0.4"/>
+    <uniform name="color.r" min="0.4" max="0.8"/>
     <copy name="color.g" from="color.r"/>
     <copy name="color.b" from="color.r"/>
 
diff --git a/binaries/data/mods/public/art/textures/particles/smoke_128a.png b/binaries/data/mods/public/art/textures/particles/smoke_128a.png
new file mode 100644
index 0000000000..5deb42dd74
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/particles/smoke_128a.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d574328ba5f91e809c03a00c0b689b207f0ea59907ebdd665feeb35f68999b6
+size 21400
diff --git a/binaries/data/mods/public/art/textures/particles/smoke_256a.png b/binaries/data/mods/public/art/textures/particles/smoke_256a.png
new file mode 100644
index 0000000000..9afd5942f9
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/particles/smoke_256a.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1eb4561c6837cd2e64849b7611f6bf641e2abef2d6b96ddeb6adcc6d1030d3ec
+size 65884
diff --git a/binaries/data/mods/public/art/textures/particles/smoke_64a.png b/binaries/data/mods/public/art/textures/particles/smoke_64a.png
new file mode 100644
index 0000000000..f9725adbdc
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/particles/smoke_64a.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:104179846ee10b98a28ab147d5475fca96dd78231a428423d9d47e4ec8c995ea
+size 6935