Merge branch 'treasure' into 'master'

Treasure!

See merge request evol/clientdata!154

8 files changed, 55 insertions, 2 deletions

diff --git a/LICENSE b/LICENSE
index 80743491..1186dcdb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -130,7 +130,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/equipment/weapons/piouslayer.png (Reid)                  (CC BY-SA 3.0)        (Enchilado)
     graphics/items/equipment/weapons/scythe.png (Micksha)                   (CC BY-SA 3.0)        (-)
     graphics/items/equipment/weapons/setzer.png (LEGACY)                    (GPLv2)               (-)
-    graphics/items/equipment/weapons/sharpknife.png (EJlol)                 (CC BY-SA 3.0)        (Reid, Micksha)
+    graphics/items/equipment/weapons/sharpknife.png (EJlol)                 (CC BY-SA 3.0)        (Micksha, Reid)
     graphics/items/equipment/weapons/shortbow.png (LEGACY)                  (CC BY-SA 3.0,GPLv2)  (Micksha)
     graphics/items/equipment/weapons/traininggladius.png (Reid)             (CC BY-SA 3.0)        (-)
     graphics/items/equipment/weapons/wand.png (Micksha)                     (CC BY-SA 3.0)        (-)
@@ -166,9 +166,11 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/generic/hardspike.png (Crush,Enchilado)                  (GPLv2,CC BY-SA 3.0)  (Micksha)
     graphics/items/generic/ironore.png (Crush, Enchilado)                   (GPLv2,CC BY-SA 3.0)  (Micksha)
     graphics/items/generic/key-ship.png (Hal9000)                           (CC BY-SA 3.0)        (Reid)
+    graphics/items/generic/key-treasure.png (Hal9000)                       (CC BY-SA 3.0)        (Micksha, Reid)
     graphics/items/generic/letter-stamp.png (Reid)                          (CC BY-SA 3.0)        (-)
     graphics/items/generic/maggotslime.png (:grey_question:)                (GPLv2)               (Micksha)
     graphics/items/generic/magic-feather.png (Micksha)                      (CC BY-SA 3.0)        (-)
+    graphics/items/generic/map-treasure.png (LEGACY)                        (CC BY-SA 3.0)        (Micksha)
     graphics/items/generic/moss.png (Reid)                                  (CC BY-SA 3.0)        (-)
     graphics/items/generic/mug-empty.png (Micksha)                          (CC BY-SA 3.0)        (-)
     graphics/items/generic/mushroom-spores.png (Reid)                       (CC BY-SA 3.0)        (-)
@@ -667,6 +669,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/npcs/sprite/chefgado.png (Hal9000)                     (CC BY-SA 3.0)        (Talaroc)
     graphics/sprites/npcs/sprite/chelios.png (ChefChelios)                  (CC BY-SA 3.0)        (Reid)
     graphics/sprites/npcs/sprite/chest.png (Hal9000)                        (CC BY-SA 3.0)        (-)
+    graphics/sprites/npcs/sprite/chest2.png (Hal9000)                       (CC BY-SA 3.0)        (Micksha)
     graphics/sprites/npcs/sprite/chest-big.png (Hal9000)                    (CC BY-SA 3.0)        (-)
     graphics/sprites/npcs/sprite/cookiemaster.png (Hal9000, Reid)           (CC BY-SA 3.0)        (Alige)
     graphics/sprites/npcs/sprite/edouard.png (Kr0n0)                        (CC BY-SA 3.0)        (Alige, Reid)
diff --git a/graphics/items/generic/key-treasure.png b/graphics/items/generic/key-treasure.png
new file mode 100644
index 00000000..90406a43
--- /dev/null
+++ b/graphics/items/generic/key-treasure.png
diff --git a/graphics/items/generic/map-treasure.png b/graphics/items/generic/map-treasure.png
new file mode 100644
index 00000000..4ef7d580
--- /dev/null
+++ b/graphics/items/generic/map-treasure.png
diff --git a/graphics/sprites/npcs/sprite/chest2.png b/graphics/sprites/npcs/sprite/chest2.png
new file mode 100644
index 00000000..168cf6c3
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/chest2.png
diff --git a/graphics/sprites/npcs/xml/chest2.xml b/graphics/sprites/npcs/xml/chest2.xml
new file mode 100644
index 00000000..61b19745
--- /dev/null
+++ b/graphics/sprites/npcs/xml/chest2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha, Hal9000
+Copyright (C) 2012 - 2020 Evol Online -->
+
+<sprite>
+    <imageset name="chest"
+              src="graphics/sprites/npcs/sprite/chest2.png"
+              width="32"
+              height="32"/>
+
+    <action name="stand" imageset="chest">
+        <!-- Chest Closed. -->
+        <animation direction="default">
+            <frame index="0"/>
+        </animation>
+
+        <!-- Chest Opening. -->
+        <animation direction="left">
+            <frame index="1" delay="110"/>
+        </animation>
+
+        <!-- Chest Opened. -->
+        <animation direction="up">
+            <frame index="2"/>
+        </animation>
+
+        <!-- Chest Closing. -->
+        <animation direction="right">
+            <frame index="1" delay="110"/>
+        </animation>
+    </action>
+</sprite>
diff --git a/items.xml b/items.xml
index 79927b97..7d6318f1 100644
--- a/items.xml
+++ b/items.xml
@@ -739,6 +739,13 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="usable"
         useButton="Eat"
         weight="650"/>
+    <item id="615"
+        image="generic/map-treasure.png"
+        name="Treasure Map"
+        description="Points to a location where a valuable treasure may be bured. Perhaps you should try to find the place and dig there."
+        useButton="Read"
+        type="usable"
+        weight="14"/>
 
     <!-- Generic Items -->
     <item id="700"
@@ -1213,6 +1220,12 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
 		type="generic"
 		weight="25"
 		sellProtected="true"/>
+	<item id="808"
+		image="generic/key-treasure.png"
+		name="Treasure Key"
+		description="A small, golden Key. Which chest would it fit in?"
+		type="generic"
+		weight="2"/>
 
     <!-- Necklaces  -->
     <item id="1000"
diff --git a/npcs.xml b/npcs.xml
index d5611371..a59e82af 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -976,6 +976,11 @@ IDs 900-999 = Special
         <sprite>npcs/xml/toichi.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+    <npc id="469" targetCursor="small" targetOffsetX="4" targetOffsetY="2">
+        <!-- Chest, an opening container. -->
+        <sprite>npcs/xml/chest2.xml</sprite>
+        <menu name="Open" command="talk 'NAME'"/>
+    </npc>
 
     <!-- Test NPCs -->
     <npc id="800" allowDelete="false">
diff --git a/quests.xml b/quests.xml
index 7804ea55..eae4da39 100644
--- a/quests.xml
+++ b/quests.xml
@@ -492,7 +492,7 @@ Copyright (C) 2012-2013 Evol Online -->
             <name>The Buried Treasure</name>
             <text>Q'Onan, the orc sailor from Nard's crew, used to be a thief.</text>
             <text>His last "business" involved robbing a nobleman. But he didn't succeed completely, he had to bury the chest full of coins to save himself.</text>
-            <text>He only knows an approximate location of the chest on Artis Hill (180, 27), so you'll have to do a little digging to find the chest.</text>
+            <text>He only knows an approximate location of the chest on Artis Hill ({@@var2}, {@@var3}), so you'll have to do a little digging to find the chest.</text>
             <text></text>
             <questgiver>Q'Onan</questgiver>
             <coordinates x="186" y="107">Artis, La Johanne. (186,107)</coordinates>