From 606a57efbb515fe536547c2ffea6d237092d750a Mon Sep 17 00:00:00 2001
From: Wombat <hpwombat@yahoo.com>
Date: Sat, 15 Jan 2011 22:07:56 -0500
Subject: Fatal error with skeleton fixed, new desert_x2

Fatal error with skeleton fixed by using player_male_base_old.xml
New desert_x2.png tileset, old version is still in repo marked as "old"
---
 graphics/sprites/monsters/monster-skeleton.xml |   2 +-
 graphics/sprites/player_male_base_old.xml      | 110 +++++++++++++++++++++++++
 graphics/tiles/desert_x2.png                   | Bin 24207 -> 28154 bytes
 graphics/tiles/desert_x2_old.png               | Bin 0 -> 24207 bytes
 4 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 graphics/sprites/player_male_base_old.xml
 create mode 100644 graphics/tiles/desert_x2_old.png

(limited to 'graphics')

diff --git a/graphics/sprites/monsters/monster-skeleton.xml b/graphics/sprites/monsters/monster-skeleton.xml
index cb468320..1eef0ca5 100644
--- a/graphics/sprites/monsters/monster-skeleton.xml
+++ b/graphics/sprites/monsters/monster-skeleton.xml
@@ -3,6 +3,6 @@
 
 	<imageset name="base" src="graphics/sprites/monsters/monster-skeleton.png|W" width="64" height="64" />
 
-	<include file="player_male_base.xml"/>
+	<include file="player_male_base_old.xml"/>
 
 </sprite>
diff --git a/graphics/sprites/player_male_base_old.xml b/graphics/sprites/player_male_base_old.xml
new file mode 100644
index 00000000..2b1fae81
--- /dev/null
+++ b/graphics/sprites/player_male_base_old.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" 
+		src=      "graphics/sprites/player_male_base.png" 
+		width=    "64" 
+		height=   "64" 
+	/>
+
+	<action name   =    "stand" 
+				imageset 	 = "base"
+				>
+		<animation direction="down">
+		  <frame index="0" />
+		</animation>
+		<animation direction="left">
+		  <frame index="18" />
+		</animation>
+		<animation direction="up">
+		  <frame index="36" />
+		</animation>
+		<animation direction="right">
+		  <frame index="54" />
+		</animation>
+	</action>
+
+	<action name="walk" imageset="base">
+		<animation direction="down">
+			<sequence start="1" end="6" delay="75" />
+		</animation>
+		<animation direction="left">
+			<sequence start="19" end="24" delay="75" />
+		</animation>
+		<animation direction="up">
+			<sequence start="37" end="42" delay="75" />
+		</animation>
+		<animation direction="right">
+			<sequence start="55" end="60" delay="75" />
+		</animation>
+	</action>
+
+	<action name="sit" imageset="base">
+		<animation direction="down">
+		 <frame index="7" />
+		</animation>
+		<animation direction="left">
+		 <frame index="25" />
+		</animation>
+		<animation direction="up">
+		 <frame index="43" />
+		</animation>
+		<animation direction="right">
+		 <frame index="61" />
+		</animation>
+	</action>
+
+	<action name="dead" imageset="base">
+		<animation direction="down">
+		  <frame index="8" />
+		</animation>
+		<animation direction="left">
+		  <frame index="26" />
+		</animation>
+		<animation direction="up">
+		  <frame index="44" />
+		</animation>
+		<animation direction="right">
+		  <frame index="62" />
+		</animation>
+	</action>
+
+	<action name="attack" imageset="base">
+		<animation direction="down">
+			<sequence start="9" end="12" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="27" end="30" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="45" end="48" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="63" end="66" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+	<action name="attack_bow" imageset="base">
+		<animation direction="down">
+			<sequence start="13" end="17" delay="75" />
+			<end />
+		</animation>
+		<animation direction="left">
+			<sequence start="31" end="35" delay="75" />
+			<end />
+		</animation>
+		<animation direction="up">
+			<sequence start="49" end="53" delay="75" />
+			<end />
+		</animation>
+		<animation direction="right">
+			<sequence start="67" end="71" delay="75" />
+			<end />
+		</animation>
+	</action>
+
+</sprite>
diff --git a/graphics/tiles/desert_x2.png b/graphics/tiles/desert_x2.png
index 658a6291..099862cf 100644
Binary files a/graphics/tiles/desert_x2.png and b/graphics/tiles/desert_x2.png differ
diff --git a/graphics/tiles/desert_x2_old.png b/graphics/tiles/desert_x2_old.png
new file mode 100644
index 00000000..658a6291
Binary files /dev/null and b/graphics/tiles/desert_x2_old.png differ
-- 
cgit v1.2.3-60-g2f50