From 3bceaacaf60535677143286667425bd10c9192eb Mon Sep 17 00:00:00 2001
From: Philipp Sehmisch <tmw@crushnet.org>
Date: Sat, 8 Sep 2007 00:13:39 +0000
Subject: Improved fire effects by using animated particles.

---
 graphics/particles/aniblaze.png             | Bin 0 -> 369 bytes
 graphics/particles/cookingfire.particle.xml |   9 ++++++---
 graphics/particles/fireplace.particle.xml   |  15 +++++++++------
 graphics/particles/flame.particle.xml       |  13 ++++++++-----
 4 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 graphics/particles/aniblaze.png

(limited to 'graphics')

diff --git a/graphics/particles/aniblaze.png b/graphics/particles/aniblaze.png
new file mode 100644
index 00000000..80ebf967
Binary files /dev/null and b/graphics/particles/aniblaze.png differ
diff --git a/graphics/particles/cookingfire.particle.xml b/graphics/particles/cookingfire.particle.xml
index 575e6335..7d361c27 100644
--- a/graphics/particles/cookingfire.particle.xml
+++ b/graphics/particles/cookingfire.particle.xml
@@ -3,7 +3,7 @@
 <effect>
 	<particle
 		position-x = "0"
-		position-y = "-8"
+		position-y = "-6"
 		position-z = "8"
 		>
 		<emitter>
@@ -13,7 +13,10 @@
 			<property name="vertical-angle" min="0" max="90"/>
 			<property name="power" min="0" max="0.25"/>
 			<property name="gravity" value="-0.02"/>
-			<property name="image" value="graphics/particles/blaze.png"/>
+			<animation imageset="graphics/particles/aniblaze.png" width="6" height="6">
+				<sequence start="0" end="14" delay="10" />
+				<frame index="8" delay="1000" />
+			</animation>
 			<property name="lifetime" min="20" max="40"/>
 			<property name="output" min="0" max="4"/>
 			<property name="fade-in" value="0"/>
@@ -21,7 +24,7 @@
 		</emitter>
 		<emitter>
 			<property name="position-x" min="16" max="24"/>
-			<property name="position-y" min="-16" max="-8"/>
+			<property name="position-y" min="-18" max="-10"/>
 			<property name="position-z" min="32" max="32"/>
 			<property name="image" value="graphics/particles/fog-medium-white-a.png"/>
 			<property name="horizontal-angle" min="0" max="360"/>
diff --git a/graphics/particles/fireplace.particle.xml b/graphics/particles/fireplace.particle.xml
index da043ccf..2e03a0e5 100644
--- a/graphics/particles/fireplace.particle.xml
+++ b/graphics/particles/fireplace.particle.xml
@@ -11,13 +11,16 @@
 			<property name="position-y" min="-24" max="-8"/>
 			<property name="horizontal-angle" min="0" max="360"/>
 			<property name="vertical-angle" min="0" max="90"/>
-			<property name="power" min="0.25" max="0.5"/>
-			<property name="gravity" value="-0.05"/>
-			<property name="image" value="graphics/particles/blaze.png"/>
-			<property name="lifetime" min="20" max="30"/>
-			<property name="output" min="0" max="6"/>
+			<property name="power" min="0.1" max="0.3"/>
+			<property name="gravity" value="-0.04"/>
+			<animation imageset="graphics/particles/aniblaze.png" width="6" height="6">
+				<sequence start="0" end="14" delay="20" />
+				<frame index="8" delay="1000" />
+			</animation>
+			<property name="lifetime" min="25" max="30"/>
+			<property name="output" min="0" max="18"/>
 			<property name="fade-in" value="0"/>
-			<property name="fade-out" value="30"/>
+			<property name="fade-out" value="5"/>
 		</emitter>
 	</particle>
 </effect>
\ No newline at end of file
diff --git a/graphics/particles/flame.particle.xml b/graphics/particles/flame.particle.xml
index d53e61f9..4e907234 100644
--- a/graphics/particles/flame.particle.xml
+++ b/graphics/particles/flame.particle.xml
@@ -10,12 +10,15 @@
 			<property name="horizontal-angle" min="0" max="360"/>
 			<property name="vertical-angle" min="0" max="90"/>
 			<property name="power" min="0.25" max="0.5"/>
-			<property name="gravity" value="-0.05"/>
-			<property name="image" value="graphics/particles/blaze.png"/>
-			<property name="lifetime" min="20" max="30"/>
-			<property name="output" min="0" max="4"/>
+			<property name="gravity" value="-0.04"/>
+			<animation imageset="graphics/particles/aniblaze.png" width="6" height="6">
+				<sequence start="0" end="14" delay="20" />
+				<frame index="8" delay="1000" />
+			</animation>
+			<property name="lifetime" min="25" max="30"/>
+			<property name="output" min="0" max="6"/>
 			<property name="fade-in" value="0"/>
-			<property name="fade-out" value="30"/>
+			<property name="fade-out" value="10"/>
 		</emitter>
 	</particle>
 </effect>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2