From c6cdc4e2fe83be2d960908b52a2a1be496a46c8e Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sun, 11 Jan 2009 17:32:43 +0000
Subject: Merge sprites for leather and desert shirts

---
 graphics/sprites/chest-leather-female.png | Bin 11528 -> 11200 bytes
 graphics/sprites/chest-leather-female.xml | 206 +++++++++++++++---------------
 graphics/sprites/chest-leather-male.png   | Bin 23461 -> 19688 bytes
 graphics/sprites/chest-leather-male.xml   | 206 +++++++++++++++---------------
 items.xml                                 |   7 +-
 5 files changed, 210 insertions(+), 209 deletions(-)

diff --git a/graphics/sprites/chest-leather-female.png b/graphics/sprites/chest-leather-female.png
index a7f2dde0..d75cf8c6 100644
Binary files a/graphics/sprites/chest-leather-female.png and b/graphics/sprites/chest-leather-female.png differ
diff --git a/graphics/sprites/chest-leather-female.xml b/graphics/sprites/chest-leather-female.xml
index 9052c491..d32cebfd 100644
--- a/graphics/sprites/chest-leather-female.xml
+++ b/graphics/sprites/chest-leather-female.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/chest-leather-female.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>
-
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/chest-leather-female.png|W;R" 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>
\ No newline at end of file
diff --git a/graphics/sprites/chest-leather-male.png b/graphics/sprites/chest-leather-male.png
index fcf137a7..bc5a3c65 100644
Binary files a/graphics/sprites/chest-leather-male.png and b/graphics/sprites/chest-leather-male.png differ
diff --git a/graphics/sprites/chest-leather-male.xml b/graphics/sprites/chest-leather-male.xml
index 82caf473..6e15e2ce 100644
--- a/graphics/sprites/chest-leather-male.xml
+++ b/graphics/sprites/chest-leather-male.xml
@@ -1,104 +1,104 @@
-<?xml version="1.0"?>
-<sprite name="player" action="stand">
-
-	<imageset name="base" src="graphics/sprites/chest-leather-male.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>
-
+<?xml version="1.0"?>
+<sprite name="player" action="stand">
+
+	<imageset name="base" src="graphics/sprites/chest-leather-male.png|W;R" 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>
\ No newline at end of file
diff --git a/items.xml b/items.xml
index d2031f21..6dee1e6d 100644
--- a/items.xml
+++ b/items.xml
@@ -304,8 +304,8 @@
         weight="30"
         defense="4"
         max-per-slot="1">
-        <sprite gender="male">chest-leather-male.xml</sprite>
-        <sprite gender="female">chest-leather-female.xml</sprite>
+        <sprite gender="male">chest-leather-male.xml|#573a26,9e7654,d3b79e,ffffff;#b96b3d,fbf5f1</sprite>
+        <sprite gender="female">chest-leather-female.xml|#824300,fc8200,ffffff;#ffff00</sprite>
     </item>
     <item id="524"
         image="armor-head-fancyhat.png"
@@ -546,7 +546,8 @@
         weight="50"
         defense="6"
         max-per-slot="1">
-        <sprite>item002.xml</sprite>
+        <sprite gender="male">chest-leather-male.xml|#443c21,85794a,beb590,ffffff;#824035,d6a19a</sprite>
+        <sprite gender="female">chest-leather-female.xml|#a0945e,ffffff;#b6574a</sprite>
     </item>
     <item id="547"
         image="weapon-polearm-bardiche.png"
-- 
cgit v1.2.3-70-g09d2