Merge branch 'arrivalargaes' into 'master'

Arrivalin Argaes

See merge request evol/clientdata!136

7 files changed, 27 insertions, 1 deletions

diff --git a/LICENSE b/LICENSE
index 2a9603f3..882827f4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -140,6 +140,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 ## Generic
     graphics/items/generic/adventurersoul.png (Micksha)                     (CC BY-SA 3.0)        (idea by TMW-BR?)
     graphics/items/generic/bottle-empty.png (FotherJ, Enchilado)            (CC BY-SA 3.0,GPLv2)  (Micksha)
+    graphics/items/generic/bowl-empty.png (Micksha)                         (CC BY-SA 3.0)        (-)
     graphics/items/generic/box-aquada.png (Hal9000)                         (CC BY-SA 3.0)        (Reid)
     graphics/items/generic/box-croconut.png (Hal9000)                       (CC BY-SA 3.0)        (Reid)
     graphics/items/generic/box-fish.png (Hal9000)                           (CC BY-SA 3.0)        (Reid)
@@ -204,6 +205,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/usable/book-old.png (Reid)                               (CC BY-SA 3.0)        (-)
     graphics/items/usable/book-pioufluffy.png (Hal9000)                     (CC BY-SA 3.0)        (Reid)
     graphics/items/usable/book-poem.png (Reid)                              (CC BY-SA 3.0)        (-)
+    graphics/items/usable/bowl-sailorstew.png (Micksha)                     (CC BY-SA 3.0)        (-)
     graphics/items/usable/bread.png (Coolkid782)                            (CC BY-SA 3.0)        (-)
     graphics/items/usable/carrot.png (Enchilado)                            (CC BY-SA 3.0)        (Reid)
     graphics/items/usable/cheese.png (Reid)                                 (CC BY-SA 3.0)        (-)
diff --git a/graphics/items/generic/bowl-empty.png b/graphics/items/generic/bowl-empty.png
new file mode 100644
index 00000000..514551a6
--- /dev/null
+++ b/graphics/items/generic/bowl-empty.png
diff --git a/graphics/items/usable/bowl-sailorstew.png b/graphics/items/usable/bowl-sailorstew.png
new file mode 100644
index 00000000..7b058fc3
--- /dev/null
+++ b/graphics/items/usable/bowl-sailorstew.png
diff --git a/graphics/sprites/npcs/sprite/unanimated.png b/graphics/sprites/npcs/sprite/unanimated.png
index a0e7dfd7..ad5f9ad1 100644
--- a/graphics/sprites/npcs/sprite/unanimated.png
+++ b/graphics/sprites/npcs/sprite/unanimated.png
diff --git a/graphics/sprites/npcs/xml/unanimated.xml b/graphics/sprites/npcs/xml/unanimated.xml
index ab9f2cbc..5fa44fac 100644
--- a/graphics/sprites/npcs/xml/unanimated.xml
+++ b/graphics/sprites/npcs/xml/unanimated.xml
@@ -2,7 +2,7 @@
 <!-- Author: Reid
 Copyright (C) 2012-2016 Evol Online -->
 
-<sprite variants="34" variant_offset="1">
+<sprite variants="36" variant_offset="1">
     <imageset name="npc"
               src="graphics/sprites/npcs/sprite/unanimated.png|S"
               width="64"
diff --git a/items.xml b/items.xml
index 83a7706d..baf22bdc 100644
--- a/items.xml
+++ b/items.xml
@@ -731,6 +731,14 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         useButton="Drink"
         type="usable"
         weight="128"/>
+    <item id="614"
+        image="usable/bowl-sailorstew.png|W:#192d2c,1c3e33,2c6b52,339455,32ae4d,95d469,f7fed5"
+        name="Sailor's Stew"
+        description="A bowl containing a fine dish for sailors, makes you strong and sturdy."
+        effect="Max. HP +2000, STR +10, VIT +5. Effect lasts for 5 minutes."
+        type="usable"
+        useButton="Eat"
+        weight="650"/>
 
     <!-- Generic Items -->
     <item id="700"
@@ -1171,6 +1179,12 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="generic"
         weight="10"
         maxFloorOffset="15"/>
+    <item id="806"
+        image="generic/bowl-empty.png"
+        name="Empty Bowl"
+        description="An empty bowl. You may fill it with fine food, in case you get hungry."
+        type="generic"
+        weight="150"/>
 
     <!-- Necklaces  -->
     <item id="1000"
diff --git a/npcs.xml b/npcs.xml
index 4379a33e..0d01f606 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -453,6 +453,16 @@ IDs 900-999 = Special
         <sprite variant="5">npcs/xml/unanimated-legacy-tall.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+    <npc id="188">
+        <!-- Morcant, the Captain in West Woodlands.  -->
+        <sprite variant="34">npcs/xml/unanimated.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
+    <npc id="189">
+        <!-- Thamas, the quiet legion soldier.  -->
+        <sprite variant="35">npcs/xml/unanimated.xml</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
 
     <!-- Animated NPCs -->