From 4e4596888ba61cbd9d4e26c555abe1093935d792 Mon Sep 17 00:00:00 2001
From: nmaligec <wouldnot@hotmail.com>
Date: Sat, 29 Jan 2011 07:16:30 -0500
Subject: Second last commit: updates to the crypt map, tileset and misc
 graphics.

deleted debugroom map.
---
 graphics/particles/casket-lid.xml          |  12 ++++++------
 graphics/particles/casket-monster.xml      |  13 ++++++++-----
 graphics/particles/casket-trap_96x96.png   | Bin 60924 -> 57126 bytes
 graphics/particles/gate-opening.xml        |   4 ++--
 graphics/particles/pool-horiz-2.xml        |  11 +++++++++++
 graphics/particles/pool-horiz.xml          |   4 ++--
 graphics/particles/pool-vert-2.xml         |  11 +++++++++++
 graphics/particles/pool-vert.xml           |   5 +++--
 graphics/particles/pool_32x58.particle.png | Bin 4575 -> 0 bytes
 graphics/particles/pool_32x59.particle.png | Bin 0 -> 4416 bytes
 graphics/particles/pool_65x26.particle.png | Bin 4387 -> 0 bytes
 graphics/particles/pool_65x27.particle.png | Bin 0 -> 4450 bytes
 12 files changed, 43 insertions(+), 17 deletions(-)
 create mode 100755 graphics/particles/pool-horiz-2.xml
 create mode 100755 graphics/particles/pool-vert-2.xml
 delete mode 100755 graphics/particles/pool_32x58.particle.png
 create mode 100755 graphics/particles/pool_32x59.particle.png
 delete mode 100755 graphics/particles/pool_65x26.particle.png
 create mode 100755 graphics/particles/pool_65x27.particle.png

(limited to 'graphics/particles')

diff --git a/graphics/particles/casket-lid.xml b/graphics/particles/casket-lid.xml
index a737fd6c..b5b353b9 100755
--- a/graphics/particles/casket-lid.xml
+++ b/graphics/particles/casket-lid.xml
@@ -2,16 +2,16 @@
 
 <effect>
 	<!-- The lid opening portion of the casket trap-->
-	<particle position-x="0" position-y="0" position-z="43" lifetime="110">
+	<particle position-x="0" position-y="0" position-z="43" lifetime="80">
 		<emitter>
 		<property name="position-y" value="37" />
-		<property name="lifetime" value="110"/>
+		<property name="lifetime" value="80"/>
 		<property name="output" value="1"/>
-		<property name="output-pause" value="15"/>
+		<property name="output-pause" value="12"/>
 		<animation imageset="graphics/particles/casket-trap_96x96.png" width="96" height="96">
-            <frame index="11" delay="100"/>
-			<frame index="12" delay="900"/>
-			<frame index="11" delay="100"/>
+            <frame index="10" delay="250"/>
+			<frame index="11" delay="400"/>
+			<frame index="10" delay="150"/>
         </animation>
 		</emitter>
 	</particle>
diff --git a/graphics/particles/casket-monster.xml b/graphics/particles/casket-monster.xml
index 8511851d..68e52dee 100755
--- a/graphics/particles/casket-monster.xml
+++ b/graphics/particles/casket-monster.xml
@@ -2,15 +2,18 @@
 
 <effect>
 	<!-- The monster portion of the casket trap-->
-	<particle position-x="100" position-y="0" position-z="97" lifetime="110">
+	<particle position-x="100" position-y="0" position-z="97" lifetime="80">
 		<emitter>
 		<property name="position-y" value="114" />
-		<property name="lifetime" value="110"/>
+		<property name="lifetime" value="80"/>
 		<property name="output" value="1"/>
-		<property name="output-pause" value="15"/>
+		<property name="output-pause" value="12"/>
 		<animation imageset="graphics/particles/casket-trap_96x96.png" width="96" height="96">
-            <sequence start="0" end="9" delay="100" />
-			<frame index="0" delay="100"/>
+            <frame index="0" delay="250"/>
+			<sequence start="1" end="3" delay="70" />
+			<frame index="4" delay="120"/>
+			<frame index="1" delay="70"/>
+			<frame index="0" delay="150"/>
         </animation>
 		</emitter>
 	</particle>
diff --git a/graphics/particles/casket-trap_96x96.png b/graphics/particles/casket-trap_96x96.png
index 7839fbe8..ffba9984 100755
Binary files a/graphics/particles/casket-trap_96x96.png and b/graphics/particles/casket-trap_96x96.png differ
diff --git a/graphics/particles/gate-opening.xml b/graphics/particles/gate-opening.xml
index 7292bf4d..26d82882 100755
--- a/graphics/particles/gate-opening.xml
+++ b/graphics/particles/gate-opening.xml
@@ -4,8 +4,8 @@
 	<!-- The gate opening animation -->
 	<particle position-x="0" position-y="0" position-z="32">
 		<animation imageset="graphics/sprites/npcs/npc-gate_224x192.png" width="224" height="192">
-            <sequence start="0" end="2" delay="100" />
-			<frame index="3" />
+            <sequence start="0" end="4" delay="100" />
+			<frame index="5" />
         </animation>
 	</particle>
 </effect>
diff --git a/graphics/particles/pool-horiz-2.xml b/graphics/particles/pool-horiz-2.xml
new file mode 100755
index 00000000..4b909ce4
--- /dev/null
+++ b/graphics/particles/pool-horiz-2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<effect>
+	<!-- The gate opening animation -->
+	<particle position-x="16" position-y="0" position-z="44">
+		<animation imageset="graphics/particles/pool_65x27.particle.png" width="65" height="27">
+            <sequence start="3" end="7" delay="235" />
+			<sequence start="0" end="2" delay="235" />
+        </animation>
+	</particle>
+</effect>
diff --git a/graphics/particles/pool-horiz.xml b/graphics/particles/pool-horiz.xml
index 80a5c31d..617f5594 100755
--- a/graphics/particles/pool-horiz.xml
+++ b/graphics/particles/pool-horiz.xml
@@ -3,8 +3,8 @@
 <effect>
 	<!-- The gate opening animation -->
 	<particle position-x="16" position-y="0" position-z="44">
-		<animation imageset="graphics/particles/pool_65x26.particle.png" width="65" height="26">
-            <sequence start="0" end="3" delay="400" />
+		<animation imageset="graphics/particles/pool_65x27.particle.png" width="65" height="27">
+            <sequence start="0" end="7" delay="235" />
         </animation>
 	</particle>
 </effect>
diff --git a/graphics/particles/pool-vert-2.xml b/graphics/particles/pool-vert-2.xml
new file mode 100755
index 00000000..f8aff50c
--- /dev/null
+++ b/graphics/particles/pool-vert-2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<effect>
+	<!-- The gate opening animation -->
+	<particle position-x="0" position-y="0" position-z="60">
+		<animation imageset="graphics/particles/pool_32x59.particle.png" width="32" height="59">
+			<sequence start="4" end="7" delay="235" />
+			<sequence start="0" end="3" delay="235" />
+        </animation>
+	</particle>
+</effect>
diff --git a/graphics/particles/pool-vert.xml b/graphics/particles/pool-vert.xml
index 6be72a1c..575068d4 100755
--- a/graphics/particles/pool-vert.xml
+++ b/graphics/particles/pool-vert.xml
@@ -3,8 +3,9 @@
 <effect>
 	<!-- The gate opening animation -->
 	<particle position-x="0" position-y="0" position-z="60">
-		<animation imageset="graphics/particles/pool_32x58.particle.png" width="32" height="58">
-            <sequence start="0" end="3" delay="400" />
+		<animation imageset="graphics/particles/pool_32x59.particle.png" width="32" height="59">
+			<sequence start="2" end="7" delay="235" />
+			<sequence start="0" end="1" delay="235" />
         </animation>
 	</particle>
 </effect>
diff --git a/graphics/particles/pool_32x58.particle.png b/graphics/particles/pool_32x58.particle.png
deleted file mode 100755
index ba7e13b4..00000000
Binary files a/graphics/particles/pool_32x58.particle.png and /dev/null differ
diff --git a/graphics/particles/pool_32x59.particle.png b/graphics/particles/pool_32x59.particle.png
new file mode 100755
index 00000000..ad362139
Binary files /dev/null and b/graphics/particles/pool_32x59.particle.png differ
diff --git a/graphics/particles/pool_65x26.particle.png b/graphics/particles/pool_65x26.particle.png
deleted file mode 100755
index 0be73c63..00000000
Binary files a/graphics/particles/pool_65x26.particle.png and /dev/null differ
diff --git a/graphics/particles/pool_65x27.particle.png b/graphics/particles/pool_65x27.particle.png
new file mode 100755
index 00000000..299e4f25
Binary files /dev/null and b/graphics/particles/pool_65x27.particle.png differ
-- 
cgit v1.2.3-60-g2f50