Remove the confused tree sprite and use the tileset instead.

Change the confused tree xml and its ID to 400.

4 files changed, 44 insertions, 16 deletions

diff --git a/LICENSE b/LICENSE
index a7a31691..381ea902 100644
--- a/LICENSE
+++ b/LICENSE
@@ -393,7 +393,6 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/npcs/sprite/treeleaf.png (Sogomn)                      (CC BY-SA 3.0)        (Reid)
     graphics/sprites/npcs/sprite/unanimated.png (Lien, Modanung, Reid)      (CC BY-SA 3.0)        (Crush, Fother, Talaroc)
     graphics/sprites/npcs/sprite/unanimated-tall.png (Modanung, Nard, Reid) (GPLv2)               (Yuuki)
-    graphics/sprites/npcs/sprite/confused-tree.png (Reid)                   (GPLv2)               (-)
 ## Races
     graphics/sprites/races/demon-female.png (Modanung, Talaroc)             (CC BY-SA 3.0)        (Alige, Reid, Saphy)
     graphics/sprites/races/demon-male.png (Modanung, Talaroc)               (CC BY-SA 3.0)        (Alige, Reid, Saphy)
diff --git a/graphics/sprites/npcs/sprite/confused-tree.png b/graphics/sprites/npcs/sprite/confused-tree.png
deleted file mode 100644
index 866f33d3..00000000
--- a/graphics/sprites/npcs/sprite/confused-tree.png
+++ /dev/null
diff --git a/graphics/sprites/npcs/xml/confused-tree.xml b/graphics/sprites/npcs/xml/confused-tree.xml
index f11da4be..9ee86953 100644
--- a/graphics/sprites/npcs/xml/confused-tree.xml
+++ b/graphics/sprites/npcs/xml/confused-tree.xml
@@ -1,9 +1,34 @@
-<?xml version="1.0"?>
-<sprite variants="1" variant_offset="1">
-  <imageset name="base" src="graphics/sprites/npcs/sprite/confused-tree.png" width="160" height="160"/>
-  <action name="stand" imageset="base">
-    <animation direction="default">
-      <frame index="0"/>
-    </animation>
-  </action>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2017 The Mana World -->
+
+<sprite>
+    <imageset name="npc"
+              src="graphics/tilesets/tree-x4x5.png"
+              width="128"
+              height="160"/>
+
+    <action name="stand" imageset="npc">
+        <!-- Winter -->
+        <animation direction="default">
+            <!-- TODO: change when we will have remaining frames -->
+            <frame index="1"/>
+        </animation>
+
+        <!-- Spring -->
+        <animation direction="downleft">
+            <!-- TODO: change when we will have remaining frames -->
+            <frame index="0"/>
+        </animation>
+
+        <!-- Summer -->
+        <animation direction="left">
+            <frame index="0"/>
+        </animation>
+
+        <!-- Autumn -->
+        <animation direction="leftup">
+            <frame index="1"/>
+        </animation>
+    </action>
 </sprite>
diff --git a/npcs.xml b/npcs.xml
index 3b046ac6..f4dc46eb 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -3,9 +3,10 @@
 Copyright (C) 2010-2016 Evol Online -->
 
 <!--
-IDs 100-300 = Unanimated
-IDs 301-900 = Animated
-IDs 990-999 = Special
+IDs 100-400 = Unanimated
+IDs 401-799 = Animated
+IDs 800-899 = Test
+IDs 900-999 = Special
 -->
 
 <npcs>
@@ -257,7 +258,14 @@ IDs 990-999 = Special
         <sprite>npcs/xml/jumpingtipiou.xml|#a36209,892b2e,cc9b14,b84335,ebc12e,ee613c,fff568,fbac71</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+
     <!-- Animated NPCs -->
+
+    <npc id="400" allowDelete="false">
+        <!-- Hurnscald confused tree -->
+        <sprite>npcs/xml/confused-tree.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
     <npc id="401" targetCursor="small">
         <!-- Awesome Eyes, reminds you of someone. -->
         <sprite>npcs/xml/alige.xml</sprite>
@@ -577,10 +585,6 @@ IDs 990-999 = Special
         <sprite>npcs/xml/mona.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
-    <npc id="451" allowDelete="false">
-        <!-- Hurnscald confused tree -->
-        <sprite>npcs/xml/confused-tree.xml</sprite>
-    </npc>
 
     <!-- Test NPCs -->
     <npc id="800" allowDelete="false">