From 98abfb74ff95939076913f037f124dc5061999e0 Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Thu, 5 Jan 2012 15:11:03 +0100
Subject: Rename frederico in billybons, Correct duplicate frames on
 acc-chick-egg xml, Correct sleepingorc and hammock NPC's xml, Remove table on
 Nard NPC, Add animated hammock instead of the bed in 000-2-3 and changed the
 room shape.

---
 graphics/sprites/accessories/acc-chick-egg.xml |   8 +++-----
 graphics/sprites/npcs/XML1/billybons.xml       |  16 ++++++++++++++++
 graphics/sprites/npcs/XML1/frederico.xml       |  16 ----------------
 graphics/sprites/npcs/XML1/hammock.xml         |   2 +-
 graphics/sprites/npcs/XML1/sleepingorc.xml     |  17 +++++++++--------
 graphics/sprites/npcs/sprite/billybons.png     | Bin 0 -> 3673 bytes
 graphics/sprites/npcs/sprite/frederico.png     | Bin 3673 -> 0 bytes
 graphics/sprites/npcs/sprite/nard.png          | Bin 3441 -> 3453 bytes
 8 files changed, 29 insertions(+), 30 deletions(-)
 create mode 100644 graphics/sprites/npcs/XML1/billybons.xml
 delete mode 100644 graphics/sprites/npcs/XML1/frederico.xml
 create mode 100644 graphics/sprites/npcs/sprite/billybons.png
 delete mode 100644 graphics/sprites/npcs/sprite/frederico.png

(limited to 'graphics/sprites')

diff --git a/graphics/sprites/accessories/acc-chick-egg.xml b/graphics/sprites/accessories/acc-chick-egg.xml
index ec7a6af8..ebecdda1 100644
--- a/graphics/sprites/accessories/acc-chick-egg.xml
+++ b/graphics/sprites/accessories/acc-chick-egg.xml
@@ -624,9 +624,8 @@ Copyright (C) 2011  Evol Online -->
 			<frame index="2" delay="80" offsetY="-4"/>
 			<frame index="6" delay="60" offsetY="-3"/>
 			<frame index="6" delay="50" offsetY="-2"/>
-			<frame index="6" delay="50" offsetY="-1"/>
 			<!-- Normal jump x1-->
-			<frame index="6" delay="45" offsetY="-1"/>
+			<frame index="6" delay="95" offsetY="-1"/>
 			<frame index="6" delay="45" offsetY="-2"/>
 			<frame index="6" delay="45" offsetY="-3"/>
 			<frame index="6" delay="45" offsetY="-4"/>
@@ -634,7 +633,7 @@ Copyright (C) 2011  Evol Online -->
 			<frame index="6" delay="45" offsetY="-2"/>
 			<frame index="6" delay="45" offsetY="-1"/>
 			<!-- Back turning jump -->
-			<frame index="6" delay="100" offsetY="-1"/>
+			<frame index="6" delay="95" offsetY="-1"/>
 			<frame index="6" delay="45" offsetY="-2"/>
 			<frame index="6" delay="45" offsetY="-3"/>
 			<frame index="6" delay="45" offsetY="-4"/>
@@ -678,9 +677,8 @@ Copyright (C) 2011  Evol Online -->
 			<frame index="0" delay="80" offsetY="-4"/>
 			<frame index="7" delay="60" offsetY="-3"/>
 			<frame index="7" delay="50" offsetY="-2"/>
-			<frame index="7" delay="50" offsetY="-1"/>
 			<!-- Normal jump x1-->
-			<frame index="7" delay="45" offsetY="-1"/>
+			<frame index="7" delay="95" offsetY="-1"/>
 			<frame index="7" delay="45" offsetY="-2"/>
 			<frame index="7" delay="45" offsetY="-3"/>
 			<frame index="7" delay="45" offsetY="-4"/>
diff --git a/graphics/sprites/npcs/XML1/billybons.xml b/graphics/sprites/npcs/XML1/billybons.xml
new file mode 100644
index 00000000..90757589
--- /dev/null
+++ b/graphics/sprites/npcs/XML1/billybons.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2012  Evol Online -->
+<sprite>
+    <imageset name="base" src="graphics/sprites/npcs/sprite/billybons.png" width="49" height="42" offsetX="17" />
+    <action name="stand" imageset="base">
+        <animation direction="default">
+            <frame index="0" delay="7000"/>
+            <frame index="1" delay="60"/>
+            <frame index="2" delay="80"/>
+            <frame index="0" delay="3500"/>
+            <frame index="1" delay="60"/>
+            <frame index="2" delay="80"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/XML1/frederico.xml b/graphics/sprites/npcs/XML1/frederico.xml
deleted file mode 100644
index 4e39c43c..00000000
--- a/graphics/sprites/npcs/XML1/frederico.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!-- Author : Reid
-Copyright (C) 2012  Evol Online -->
-<sprite>
-    <imageset name="base" src="graphics/sprites/npcs/sprite/frederico.png" width="49" height="42" offsetX="17" />
-    <action name="stand" imageset="base">
-        <animation direction="default">
-            <frame index="0" delay="7000"/>
-            <frame index="1" delay="60"/>
-            <frame index="2" delay="80"/>
-            <frame index="0" delay="3500"/>
-            <frame index="1" delay="60"/>
-            <frame index="2" delay="80"/>
-        </animation>
-    </action>
-</sprite>
diff --git a/graphics/sprites/npcs/XML1/hammock.xml b/graphics/sprites/npcs/XML1/hammock.xml
index 03b51669..a2065688 100644
--- a/graphics/sprites/npcs/XML1/hammock.xml
+++ b/graphics/sprites/npcs/XML1/hammock.xml
@@ -3,7 +3,7 @@
 Copyright (C) 2011  Evol Online -->
 <sprite variants="2" variant_offset="1">
 
-	<imageset name="base" src="graphics/sprites/npcs/sprite/zhammock.png" width="96" height="64" />
+	<imageset name="base" src="graphics/sprites/npcs/sprite/hammock.png" width="96" height="64" />
 
 	<action name="stand" imageset="base">
 		<animation direction="default">
diff --git a/graphics/sprites/npcs/XML1/sleepingorc.xml b/graphics/sprites/npcs/XML1/sleepingorc.xml
index 4aeaab8f..cf361a3b 100644
--- a/graphics/sprites/npcs/XML1/sleepingorc.xml
+++ b/graphics/sprites/npcs/XML1/sleepingorc.xml
@@ -2,12 +2,13 @@
 <!-- Author : Reid
 Copyright (C) 2010-2012  Evol Online -->
 <sprite>
-   <imageset name="base" src="graphics/sprites/npcs/sprite/sleepingorc.png" width="32" height="64" />
-		<action name="stand" imageset="base">
-			<animation direction="left">
-				<sequence start="0" end="2" delay="380" />
-        		<frame index="1" delay="380" />
-       	 	<frame index="0" delay="500" />
-       	</animation>
-    	</action>
+	<imageset name="base" src="graphics/sprites/npcs/sprite/sleepingorc.png" width="32" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="default">
+			<sequence start="0" end="2" delay="380" />
+			<frame index="1" delay="380" />
+			<frame index="0" delay="500" />
+		</animation>
+	</action>
 </sprite>
diff --git a/graphics/sprites/npcs/sprite/billybons.png b/graphics/sprites/npcs/sprite/billybons.png
new file mode 100644
index 00000000..6b84f873
Binary files /dev/null and b/graphics/sprites/npcs/sprite/billybons.png differ
diff --git a/graphics/sprites/npcs/sprite/frederico.png b/graphics/sprites/npcs/sprite/frederico.png
deleted file mode 100644
index 6b84f873..00000000
Binary files a/graphics/sprites/npcs/sprite/frederico.png and /dev/null differ
diff --git a/graphics/sprites/npcs/sprite/nard.png b/graphics/sprites/npcs/sprite/nard.png
index 0c0cba54..50656762 100644
Binary files a/graphics/sprites/npcs/sprite/nard.png and b/graphics/sprites/npcs/sprite/nard.png differ
-- 
cgit v1.2.3-70-g09d2