Correct some problem caused by the merge.

19 files changed, 430 insertions, 0 deletions

diff --git a/graphics/sprites/npcs/xml/alige.xml b/graphics/sprites/npcs/xml/alige.xml
new file mode 100644
index 00000000..ca101e2c
--- /dev/null
+++ b/graphics/sprites/npcs/xml/alige.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!-- Author : Reid, Dan
+Copyright (C) 2011  Evol Online -->
+<sprite>
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/alige.png" width="11" height="5" offsetX="0" offsetY="-13"/>
+
+    <action name="stand" imageset="npc">
+        <!-- Open eyes animation -->
+        <animation direction="left">
+            <frame index="2" delay="100"/>
+            <frame index="1" delay="90"/>
+        </animation>
+
+        <!-- Close eyes animation -->
+        <animation direction="up">
+            <frame index="1" delay="100"/>
+            <frame index="2" delay="90"/>
+        </animation>
+
+        <!-- Opened eyes -->
+        <animation direction="right">
+            <frame index="0" delay="9000"/>
+            <frame index="1" delay="90"/>
+            <frame index="2" delay="80"/>
+            <frame index="3" delay="200"/>
+            <frame index="2" delay="80"/>
+            <frame index="1" delay="80"/>
+        </animation>
+
+        <!-- Closed eyes -->
+        <animation direction="down">
+            <frame index="3"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/animated_hammock1.xml b/graphics/sprites/npcs/xml/animated_hammock1.xml
new file mode 100644
index 00000000..7d6a24b4
--- /dev/null
+++ b/graphics/sprites/npcs/xml/animated_hammock1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2011-2012  Evol Online -->
+<sprite>
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/animated_hammock.png" width="96" height="64"/>
+    <action name="stand" imageset="npc">
+        <!-- Mooving hammock. -->
+        <animation direction="left">
+            <frame index="3" delay="300"/>
+            <frame index="2" delay="180"/>
+            <frame index="1" delay="150"/>
+            <frame index="0" delay="400"/>
+            <frame index="1" delay="180"/>
+            <frame index="2" delay="150"/>
+        </animation>
+        <!-- Static hammock. -->
+        <animation direction="up">
+            <frame index="3"/>
+        </animation>
+    </action>
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs/xml/animated_hammock2.xml b/graphics/sprites/npcs/xml/animated_hammock2.xml
new file mode 100644
index 00000000..1853d7cc
--- /dev/null
+++ b/graphics/sprites/npcs/xml/animated_hammock2.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2011-2012  Evol Online -->
+<sprite>
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/animated_hammock.png" width="96" height="64"/>
+    <action name="stand" imageset="npc">
+        <!-- Mooving hammock. -->
+        <animation direction="left">
+            <frame index="7" delay="300"/>
+            <frame index="6" delay="180"/>
+            <frame index="5" delay="150"/>
+            <frame index="4" delay="400"/>
+            <frame index="5" delay="180"/>
+            <frame index="6" delay="150"/>
+        </animation>
+        <!-- Static hammock. -->
+        <animation direction="up">
+            <frame index="7"/>
+        </animation>
+    </action>
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs/xml/billybons.xml b/graphics/sprites/npcs/xml/billybons.xml
new file mode 100644
index 00000000..90757589
--- /dev/null
+++ b/graphics/sprites/npcs/xml/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/xml/elmo1.xml b/graphics/sprites/npcs/xml/elmo1.xml
new file mode 100644
index 00000000..89e31c90
--- /dev/null
+++ b/graphics/sprites/npcs/xml/elmo1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2011  Evol Online -->
+<sprite>
+    <imageset name="base" src="graphics/sprites/npcs/sprite/elmo1.png" width="50" height="70" />
+    <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/xml/gugli.xml b/graphics/sprites/npcs/xml/gugli.xml
new file mode 100644
index 00000000..37e0eadc
--- /dev/null
+++ b/graphics/sprites/npcs/xml/gugli.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!-- Author : Reid 4144
+Copyright (C) 2011-2012  Evol Online
+
+Example of the extended animation tags.
+Allow set in attribute value any frame numbers.
+
+Both of these examples show the same thing:
+	<sequence start="55" end="60" delay="75" />
+	<sequence value="55-60" delay="75" />
+	<sequence value="55,56,57,58,59,60" delay="75" /> -->
+
+<sprite>
+    <imageset name="base" src="graphics/sprites/npcs/sprite/gugli.png" width="70" height="70" offsetX ="-7" offsetY ="2"/>
+
+    <action name="stand" imageset="base">
+
+			<animation direction="default">
+				<label name="start"/>
+	<!-- 40% used on "long" label. -->
+				<goto label="long" rand="40"/>
+	<!-- 100% from the 60% unused percent are used on "simple" label. -->
+				<goto label="simple" rand="100"/>
+	<!-- Long move leg animation. -->
+				<label name="long"/>
+					<frame index="0" delay="120"/>
+					<sequence value="1,2" delay="110"/>
+					<frame index="3" delay="120"/>
+					<sequence value="2,1" delay="110"/>
+				<jump label="start"/>
+	<!-- Simple move leg animation. -->
+				<label name="simple"/>
+					<frame index="0" delay="120"/>
+					<frame index="1" delay="110"/>
+					<frame index="2" delay="120"/>
+					<frame index="1" delay="110"/>
+				<jump label="start"/>
+			</animation>
+    </action>
+
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs/xml/hammock.xml b/graphics/sprites/npcs/xml/hammock.xml
new file mode 100644
index 00000000..a2065688
--- /dev/null
+++ b/graphics/sprites/npcs/xml/hammock.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2011  Evol Online -->
+<sprite variants="2" variant_offset="1">
+
+	<imageset name="base" src="graphics/sprites/npcs/sprite/hammock.png" width="96" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="default">
+			<frame index="0" />
+		</animation>
+	</action>
+
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs/xml/julia.xml b/graphics/sprites/npcs/xml/julia.xml
new file mode 100644
index 00000000..0937934f
--- /dev/null
+++ b/graphics/sprites/npcs/xml/julia.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2010-2011  Evol Online -->
+<sprite>
+    <imageset name="base" src="graphics/sprites/npcs/sprite/julia.png" width="50" height="70" />
+    <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/xml/magic_arpan.xml b/graphics/sprites/npcs/xml/magic_arpan.xml
new file mode 100644
index 00000000..dd695d65
--- /dev/null
+++ b/graphics/sprites/npcs/xml/magic_arpan.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2011  Evol Online -->
+<sprite>
+    <imageset name="base" src="graphics/sprites/npcs/sprite/magic_arpan.png" width="32" height="64" />
+    <action name="stand" imageset="base">
+        <animation direction="default">
+<!-- Eye animation -->
+            <frame index="0" delay="7000"/>
+            <frame index="3" delay="60"/>
+            <frame index="4" delay="120"/>
+            <frame index="3" delay="70"/>
+<!-- Mouth animation -->
+            <frame index="0" delay="6000"/>
+			<sequence start="1" end="2" delay="130" repeat="4" />
+            <frame index="1" delay="90"/>
+<!-- Eye animation -->
+            <frame index="0" delay="3500"/>
+            <frame index="3" delay="60"/>
+            <frame index="4" delay="120"/>
+            <frame index="3" delay="70"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/nard.xml b/graphics/sprites/npcs/xml/nard.xml
new file mode 100644
index 00000000..7bf901b4
--- /dev/null
+++ b/graphics/sprites/npcs/xml/nard.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/nard.png" width="64" height="64" offsetX="16" />
+    <action name="stand" imageset="base">
+        <animation direction="default">
+            <frame index="0" delay="10000"/>
+            <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/xml/npc.xml b/graphics/sprites/npcs/xml/npc.xml
new file mode 100644
index 00000000..347d0ec0
--- /dev/null
+++ b/graphics/sprites/npcs/xml/npc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2012  Evol Online -->
+<sprite variants="5" variant_offset="1">
+
+	<imageset name="base" src="graphics/sprites/npcs/sprite/npc.png|S" width="64" height="64" />
+
+	<action name="stand" imageset="base">
+		<animation direction="default">
+			<frame index="0" />
+		</animation>
+	</action>
+
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs/xml/piousrocket.xml b/graphics/sprites/npcs/xml/piousrocket.xml
new file mode 100644
index 00000000..cde4eb57
--- /dev/null
+++ b/graphics/sprites/npcs/xml/piousrocket.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2011  Evol Online -->
+<sprite>
+    <imageset name="npc" src="graphics/sprites/npcs/sprite/piousrocket.png" width="13" height="50" offsetX="-2"/>
+
+    <action name="stand" imageset="npc">
+        <!-- Jump piousrocket -->
+        <animation direction="left">
+            <frame index="1" delay="90"/>
+            <frame index="2" delay="80"/>
+            <frame index="3" delay="70"/>
+            <frame index="11" delay="100"/>
+            <frame index="0" delay="80"/>
+            <frame index="1" delay="90"/>
+            <frame index="2" delay="80"/>
+            <frame index="3" delay="70"/>
+            <frame index="4" delay="100"/>
+            <sequence start="5" end="6" delay="90" />
+            <frame index="7" delay="110"/>
+            <sequence start="8" end="10" delay="90" />
+            <frame index="11" delay="100"/>
+        </animation>
+        <!-- Static piou -->
+        <animation direction="up">
+            <frame index="0"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/rattosailor.xml b/graphics/sprites/npcs/xml/rattosailor.xml
new file mode 100644
index 00000000..0ab0dc83
--- /dev/null
+++ b/graphics/sprites/npcs/xml/rattosailor.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2010-2011  Evol Online -->
+<sprite>
+    <imageset name="base" src="graphics/sprites/npcs/sprite/rattosailor.png" width="50" height="70" />
+    <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/xml/sailors.xml b/graphics/sprites/npcs/xml/sailors.xml
new file mode 100644
index 00000000..6e0fb6bb
--- /dev/null
+++ b/graphics/sprites/npcs/xml/sailors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2012  Evol Online -->
+<sprite>
+    <imageset name="base" src="graphics/sprites/npcs/sprite/sailors.png" width="278" height="149"/>
+    <action name="stand" imageset="base">
+        <animation direction="default">
+            <frame index="0" offsetY="19" offsetX="19"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/sapartan.xml b/graphics/sprites/npcs/xml/sapartan.xml
new file mode 100644
index 00000000..8f74b08a
--- /dev/null
+++ b/graphics/sprites/npcs/xml/sapartan.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/sapartan.png" width="32" height="57" />
+    <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/xml/silvio.xml b/graphics/sprites/npcs/xml/silvio.xml
new file mode 100644
index 00000000..7d6a7212
--- /dev/null
+++ b/graphics/sprites/npcs/xml/silvio.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2011  Evol Online -->
+<sprite>
+    <imageset name="base" src="graphics/sprites/npcs/sprite/silvio.png" width="40" height="50" />
+    <action name="stand" imageset="base">
+        <animation direction="default">
+            <frame index="0" delay="7000"/>
+            <frame index="1" delay="60"/>
+            <frame index="2" delay="120"/>
+            <frame index="1" delay="70"/>
+            <frame index="0" delay="3500"/>
+            <frame index="1" delay="60"/>
+            <frame index="2" delay="120"/>
+            <frame index="1" delay="70"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/sleepingorc.xml b/graphics/sprites/npcs/xml/sleepingorc.xml
new file mode 100644
index 00000000..cf361a3b
--- /dev/null
+++ b/graphics/sprites/npcs/xml/sleepingorc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- 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="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/xml/smallnpc.xml b/graphics/sprites/npcs/xml/smallnpc.xml
new file mode 100644
index 00000000..c2b1565f
--- /dev/null
+++ b/graphics/sprites/npcs/xml/smallnpc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2012  Evol Online -->
+<sprite variants="2" variant_offset="1">
+
+	<imageset name="base" src="graphics/sprites/npcs/sprite/smallnpc.png" width="32" height="32" />
+
+	<action name="stand" imageset="base">
+		<animation direction="default">
+			<frame index="0" />
+		</animation>
+	</action>
+
+</sprite>
\ No newline at end of file
diff --git a/graphics/sprites/npcs/xml/tarlan.xml b/graphics/sprites/npcs/xml/tarlan.xml
new file mode 100644
index 00000000..54dc4fe8
--- /dev/null
+++ b/graphics/sprites/npcs/xml/tarlan.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!-- Author : Reid
+Copyright (C) 2012  Evol Online -->
+<sprite>
+
+    <imageset name="tarlan" src="graphics/sprites/npcs/sprite/tarlan.png" width="64" height="64" offsetX="-8"/>
+
+    <action name="stand" imageset="tarlan">
+        <animation direction="default">
+        <!-- Getting ready to fight -->
+            <frame index="0" delay="3141" offsetX="8"/>
+            <frame index="1" delay="100" offsetX="5"/>
+            <frame index="2" delay="220" offsetX="4"/>
+        <!-- Fight -->
+            <frame index="3" delay="110"/>
+            <frame index="4" delay="140"/>
+			<sequence start="5" end="6" delay="120"/>
+            <frame index="5" delay="90"/>
+            <frame index="4" delay="140"/>
+            <frame index="3" delay="110"/>
+            <frame index="4" delay="130"/>
+			<sequence start="5" end="6" delay="120"/>
+            <frame index="5" delay="90"/>
+            <frame index="4" delay="140"/>
+            <frame index="3" delay="110"/>
+        <!-- Stop -->
+            <frame index="7" delay="110" offsetX="5"/>
+            <frame index="0" delay="100" offsetX="8"/>
+            <frame index="8" delay="800" offsetX="10"/>
+            <frame index="0" delay="120" offsetX="8"/>
+            <frame index="1" delay="100" offsetX="5"/>
+            <frame index="2" delay="210" offsetX="4"/>
+        <!-- Fight again longer and faster -->
+            <frame index="3" delay="100"/>
+            <frame index="4" delay="130"/>
+			<sequence start="5" end="6" delay="110"/>
+            <frame index="5" delay="85"/>
+            <frame index="4" delay="120"/>
+            <frame index="3" delay="95"/>
+            <frame index="4" delay="130"/>
+			<sequence start="5" end="6" delay="105"/>
+            <frame index="5" delay="80"/>
+            <frame index="4" delay="115"/>
+            <frame index="3" delay="95"/>
+            <frame index="4" delay="115"/>
+			<sequence start="5" end="6" delay="105"/>
+            <frame index="5" delay="80"/>
+            <frame index="4" delay="115"/>
+            <frame index="3" delay="95"/>
+            <frame index="4" delay="115"/>
+			<sequence start="5" end="6" delay="105"/>
+            <frame index="5" delay="80"/>
+            <frame index="4" delay="115"/>
+            <frame index="3" delay="100"/>
+            <frame index="4" delay="130"/>
+			<sequence start="5" end="6" delay="110"/>
+            <frame index="5" delay="90"/>
+            <frame index="4" delay="130"/>
+            <frame index="3" delay="105"/>
+        <!-- Get hitted -->
+            <frame index="7" delay="110" offsetX="5"/>
+            <frame index="0" delay="100" offsetX="8"/>
+            <frame index="8" delay="900" offsetX="10"/>
+            <frame index="9" delay="140" offsetX="11"/>
+        <!-- Down -->
+            <frame index="10" delay="110" offsetX="8" offsetY="2"/>
+        <!-- Bird -->
+			<sequence start="11" end="12" delay="105" repeat="8" offsetY="5" offsetX="8"/>
+        <!-- Sit -->
+            <frame index="13" delay="90" offsetY="5" offsetX="8"/>
+            <frame index="14" delay="5926" offsetY="5" offsetX="8"/>
+        <!-- Get back -->
+            <frame index="15" delay="130" offsetX="8"/>
+            <frame index="0" delay="3141" offsetX="8"/>
+        </animation>
+    </action>
+
+</sprite>
\ No newline at end of file