Merge branch 'Gumicommit' into 'master'

Gumicommit

See merge request evol/clientdata!60

16 files changed, 243 insertions, 0 deletions

diff --git a/graphics/sprites/npcs/sprite/hinnak.png b/graphics/sprites/npcs/sprite/hinnak.png
new file mode 100644
index 00000000..7da5a110
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/hinnak.png
diff --git a/graphics/sprites/npcs/sprite/koga.png b/graphics/sprites/npcs/sprite/koga.png
new file mode 100644
index 00000000..fc35090d
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/koga.png
diff --git a/graphics/sprites/npcs/sprite/lumberjack.png b/graphics/sprites/npcs/sprite/lumberjack.png
new file mode 100644
index 00000000..67ca603d
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/lumberjack.png
diff --git a/graphics/sprites/npcs/sprite/richard.png b/graphics/sprites/npcs/sprite/richard.png
new file mode 100644
index 00000000..bc0c8769
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/richard.png
diff --git a/graphics/sprites/npcs/sprite/rowboat.png b/graphics/sprites/npcs/sprite/rowboat.png
new file mode 100644
index 00000000..bf85c20d
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/rowboat.png
diff --git a/graphics/sprites/npcs/sprite/sophialla.png b/graphics/sprites/npcs/sprite/sophialla.png
new file mode 100644
index 00000000..549560f7
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/sophialla.png
diff --git a/graphics/sprites/npcs/sprite/unanimated-legacy-tall.png b/graphics/sprites/npcs/sprite/unanimated-legacy-tall.png
new file mode 100644
index 00000000..19b9b14c
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/unanimated-legacy-tall.png
diff --git a/graphics/sprites/npcs/sprite/unanimated-legacy.png b/graphics/sprites/npcs/sprite/unanimated-legacy.png
new file mode 100644
index 00000000..c35c4663
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/unanimated-legacy.png
diff --git a/graphics/sprites/npcs/xml/hinnak.xml b/graphics/sprites/npcs/xml/hinnak.xml
new file mode 100644
index 00000000..bf2a3fc3
--- /dev/null
+++ b/graphics/sprites/npcs/xml/hinnak.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2018 Evol Online -->
+
+<sprite>
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/hinnak.png"
+              width="64"
+              height="64"/>
+
+    <action name="stand" imageset="npc">    
+        <animation direction="default">
+            <label name="start"/>
+            <goto label="static" rand="98"/>
+            <goto label="cutting" rand="2"/>
+            <!-- winking -->
+            <label name="cutting"/>
+                <frame index="0" delay="200"/>
+                <frame index="1" delay="100"/>
+                <frame index="2" delay="100"/>
+                <frame index="3" delay="100"/>
+                <frame index="2" delay="100"/>
+                <frame index="1" delay="100"/>
+                <frame index="0" delay="200"/>
+            <goto label="start"/>
+            <!-- Static Animation -->
+            <label name="static"/>
+                <frame index="0" delay="400"/>
+            <goto label="start"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/koga.xml b/graphics/sprites/npcs/xml/koga.xml
new file mode 100644
index 00000000..6b3f17ad
--- /dev/null
+++ b/graphics/sprites/npcs/xml/koga.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2018 Evol Online -->
+
+<sprite>
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/koga.png"
+              width="634"
+              height="477"/>
+
+    <action name="stand" imageset="npc">
+        <animation direction="default">
+            <frame index="0"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/lumberjack.xml b/graphics/sprites/npcs/xml/lumberjack.xml
new file mode 100644
index 00000000..9c802c9d
--- /dev/null
+++ b/graphics/sprites/npcs/xml/lumberjack.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2018 Evol Online -->
+
+<sprite>
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/lumberjack.png"
+              width="42"
+              height="63"/>
+
+    <action name="stand" imageset="npc">    
+        <animation direction="default">
+            <label name="start"/>
+            <goto label="static" rand="75"/>
+            <goto label="blinking" rand="100"/>
+            <!-- winking -->
+            <label name="blinking"/>
+                <frame index="0" delay="1000"/>
+                <frame index="1" delay="80"/>
+                <frame index="0" delay="240"/>
+                <frame index="1" delay="80"/>
+            <goto label="start"/>
+            <!-- Static Animation -->
+            <label name="static"/>
+                <frame index="0" delay="400"/>
+            <goto label="start"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/richard.xml b/graphics/sprites/npcs/xml/richard.xml
new file mode 100644
index 00000000..2a8bd562
--- /dev/null
+++ b/graphics/sprites/npcs/xml/richard.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2018 Evol Online -->
+
+<sprite>
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/richard.png"
+              width="64"
+              height="64"/>
+    <action name="stand" imageset="npc">    
+        <animation direction="default">
+            <label name="start"/>
+            <goto label="static" rand="95"/>
+            <goto label="winking" rand="100"/>
+            <!-- winking -->
+            <label name="winking"/>
+                <sequence start="0" end="2" delay="160"/>
+                <sequence start="2" end="4" repeat="2" delay="120"/>
+                <frame index="4" delay="50"/>
+                <frame index="1" delay="80"/>
+                <frame index="0" delay="240"/>
+            <goto label="start"/>
+            <!-- Static Animation -->
+            <label name="static"/>
+                <frame index="0" delay="400"/>
+            <goto label="start"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/rowboat.xml b/graphics/sprites/npcs/xml/rowboat.xml
new file mode 100644
index 00000000..ec3c0d28
--- /dev/null
+++ b/graphics/sprites/npcs/xml/rowboat.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2018 Evol Online -->
+
+<sprite>
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/rowboat.png"
+              width="192"
+              height="160"
+              offsetY="0"
+              offsetX="0"/>
+
+    <action name="stand" imageset="npc">
+        <animation direction="right">
+            <frame index="6"/>
+        </animation>
+        <animation direction="left">
+            <frame index="6"/>
+        </animation>
+        <animation direction="up">
+            <frame index="13"/>
+        </animation>
+        <animation direction="down">
+            <frame index="13"/>
+        </animation>
+    </action>
+        <!-- Rowing -->
+    <action name="row" imageset="npc">
+        <!-- Right -->
+        <animation direction="right">
+            <sequence start="0" end="2" delay="175"/>
+            <sequence start="3" end="5" delay="150"/>
+        </animation>
+        <!-- Left  -->
+        <animation direction="left">
+            <sequence start="7" end="9" delay="175"/>
+            <sequence start="10" end="12" delay="150"/>
+        </animation>
+        <!-- Up -->
+        <animation direction="up">
+            <sequence start="14" end="16" delay="175"/>
+            <sequence start="17" end="19" delay="150"/>
+        </animation>
+        <!-- Down -->
+        <animation direction="down">
+            <sequence start="21" end="23" delay="175"/>
+            <sequence start="24" end="26" delay="150"/>
+        </animation>
+    </action>
+    <action name="dead" imageset="npc">
+        <!-- Dead -->
+        <animation direction="right">
+            <sequence start="20" end="27" delay="250" repeat="100"/>
+            <frame index="27" delay="10000"/>
+        </animation>
+        <animation direction="left">
+            <sequence start="20" end="27" delay="250" repeat="100"/>
+            <frame index="27" delay="10000"/>
+        </animation>
+        <animation direction="up">
+            <sequence start="20" end="27" delay="250" repeat="100"/>
+            <frame index="27" delay="10000"/>
+        </animation>
+        <animation direction="down">
+            <sequence start="20" end="27" delay="250" repeat="100"/>
+            <frame index="27" delay="10000"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/sophialla.xml b/graphics/sprites/npcs/xml/sophialla.xml
new file mode 100644
index 00000000..ed0d907c
--- /dev/null
+++ b/graphics/sprites/npcs/xml/sophialla.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2015 Evol Online -->
+
+<sprite>
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/sophialla.png"
+              width="64"
+              height="64"/>
+
+    <action name="stand" imageset="npc">    
+        <animation direction="default">
+            <label name="start"/>
+            <goto label="static" rand="95"/>
+            <goto label="lookup" rand="50"/>
+            <goto label="look" rand="100"/>
+            <!-- lookup -->
+            <label name="lookup"/>
+                <frame index="0" delay="240"/>
+                <frame index="1" delay="480"/>
+            <goto label="start"/>
+            <!-- lookstraight -->
+            <label name="look"/>
+                <sequence start="0" end="3" delay="150"/>
+                <frame index="3" delay="500"/>
+                <frame index="2" delay="150"/>
+                <frame index="1" delay="150"/>
+                <frame index="0" delay="500"/>
+            <goto label="start"/>
+            <!-- Static Animation -->
+            <label name="static"/>
+                <frame index="0" delay="400"/>
+            <goto label="start"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml b/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml
new file mode 100644
index 00000000..aa710046
--- /dev/null
+++ b/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid, Micksha
+Copyright (C) 2015-2018 Evol Online -->
+
+<sprite variants="5" variant_offset="1">
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/unanimated-legacy-tall.png|S"
+              width="64"
+              height="96"/>
+
+    <action name="stand" imageset="npc">
+        <animation direction="default">
+            <frame index="0"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/unanimated-legacy.xml b/graphics/sprites/npcs/xml/unanimated-legacy.xml
new file mode 100644
index 00000000..9bd463d7
--- /dev/null
+++ b/graphics/sprites/npcs/xml/unanimated-legacy.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid, Micksha
+Copyright (C) 2018 Evol Online -->
+
+<sprite variants="32" variant_offset="1">
+    <imageset name="npc"
+              src="graphics/sprites/npcs/sprite/unanimated-legacy.png|S"
+              width="64"
+              height="64"/>
+
+    <action name="stand" imageset="npc">
+        <animation direction="default">
+            <frame index="0"/>
+        </animation>
+    </action>
+</sprite>