Merge branch 'master' of gitlab.com:TMW2/clientdata

tion.

3 files changed, 59 insertions, 55 deletions

diff --git a/items.xml b/items.xml
index 9dd8ed8e..51fec103 100644
--- a/items.xml
+++ b/items.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml-stylesheet type="text/xsl" href="items.xsl"?>
-<!-- Authors: 4144, Alige, Piman, Reid
-Copyright (C) 2010-2015 Evol Online -->
-
-<!--New organization (04/12/11).
+<!-- Authors: 4144, Alige, Piman, Reid, Saulc, Rakinorf
+Copyright (C) 2010-2015 Evol Online-->
+<!-- Authors: Saulc, Rakinorf
+Copyright (C) 2018 The Mana World 2-->
 
+<!--
 -0      -99       = Hairstyles
 -100    -infinity = Races
 30      500       = Weapon Animations
@@ -25,7 +26,7 @@ Copyright (C) 2010-2015 Evol Online -->
 6000    6499      = Bows
 6500    6999      = Arrows
 7000    7499      = Rings
-Colors for dyeable equipments or items are now set up by itemcolors.xml.
+Colors for dyeable equipments or items are set up by itemcolors.xml.
 -->
 
 <items>
@@ -1466,84 +1467,84 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="786"
         image="generic/tulip.png"
         name="Tulip"
-        description="A flower picked in the fields"
+        description="A flower picked in the fields."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="787"
         image="generic/spellbookpage.png"
         name="Spell Book Page"
-        description="A page torn from a magic book"
+        description="A page torn from a magic book."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="788"
         image="generic/toothbrush.png"
         name="Toothbrush"
-        description="To keep that beautiful smile going"
+        description="To keep that beautiful smile going."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="789"
         image="generic/skull.png"
         name="Skull"
-        description="don't hope to find a brain in it"
+        description="don't hope to find a brain in it."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="790"
         image="generic/silverbell.png"
         name="Silver Bell"
-        description="A bell made from pure silver"
+        description="A bell made from pure silver."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="791"
         image="generic/brokenfourleafamulet.png"
         name="Broken-Four-Leaf-Amulet "
-        description="Unlucky"
+        description="Unlucky."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="792"
         image="generic/gempowder.png"
         name="Gem Powder"
-        description="Crushed from valuable crystals"
+        description="Crushed from valuable crystals."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="793"
         image="generic/goldpieces.png"
         name="Gold Coins"
-        description="Used for buying stuff"
+        description="Used for buying stuff."
         type="generic"
         weight="6"
         maxFloorOffset="20"/>
     <item id="794"
         image="generic/grassliner.png"
         name="Grass Liner"
-        description="Perfect to feed moobous"
+        description="Perfect to feed moobous."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="795"
         image="generic/icecube.png"
         name="Ice Cube"
-        description="Dont bring it to Tulimshar"
+        description="Dont bring it to Tulimshar."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="796"
         image="generic/iten.png"
         name="Iten"
-        description="Small but heavy"
+        description="Small but heavy."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="797"
         image="generic/jackolantern.png"
         name="Jacko Lantern"
-        description="A Shiny pumkin"
+        description="A pumkin with a face on it."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
@@ -1571,7 +1572,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="801"
         image="generic/leathersuitcase.png"
         name="Leather Suitcase"
-        description="A tyipical suitcase"
+        description="A tyipical suitcase."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
@@ -1585,7 +1586,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="803"
         image="generic/loveletter.png"
         name="Love Letter"
-        description="A letter to confess to that special someone"
+        description="A letter to confess to that special someone."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
@@ -1599,21 +1600,21 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="805"
         image="generic/openedchristmasbox.png"
         name="Opened Christmas Box"
-        description=""
+        description="What was inside?"
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="806"
         image="generic/leatherpatch.png"
         name="Leather Patch"
-        description="Leather Patch"
+        description="Leather Patch."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="807"
         image="generic/petal.png"
         name="Petal"
-        description="This lovely petal was picked from a flower"
+        description="This lovely petal was picked from a flower."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
@@ -1627,28 +1628,28 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="809"
         image="generic/presentbox.png"
         name="Present Box"
-        description="What does it contain"
+        description="What does it contain."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="810"
         image="generic/quill.png"
         name="Quill"
-        description="Used to write letters"
+        description="Used to write letters."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="811"
         image="generic/rose.png"
         name="Rose"
-        description="can come in a variety of colors"
+        description="can come in a variety of colors."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="812"
         image="generic/sealedsoul.png"
         name="Sealed Soul"
-        description="A soul, sealed in a mystic vial"
+        description="A soul, sealed in a mystical vial."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
@@ -1669,28 +1670,28 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="815"
         image="generic/tuber.png"
         name="Tuber"
-        description="A seed that can be replanted"
+        description="A seed that can be replanted."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="816"
         image="generic/icebottle.png"
         name="Iced Bottle"
-        description="Frozen solid"
+        description="Frozen solid."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="817"
         image="generic/key-ship.png"
         name="Saxso Key"
-        description="Used to unlock something"
+        description="Used to unlock something."
         type="generic"
         weight="1"
         maxFloorOffset="20"/>
     <item id="818"
         image="generic/bluemanapearl.png"
         name="Blue Mana Pearl"
-        description="A pure pearl of Mana"
+        description="A pure pearl of Mana."
         type="generic"
         weight="0"
         maxFloorOffset="20"/>
@@ -1704,63 +1705,63 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="820"
         image="generic/darkcrystal.png"
         name="Dark Crystal"
-        description="Dark as the night"
+        description="Dark as the night."
         type="generic"
         weight="10"
         maxFloorOffset="20"/>
     <item id="821"
         image="generic/sunnycrystal.png"
         name="Sunny Crystal"
-        description=""
+        description="Shines as bright as the sun."
         type="generic"
         weight="10"
         maxFloorOffset="20"/>
     <item id="822"
         image="generic/druidtreebranch.png"
         name="Druid Tree Branch"
-        description=""
+        description="A branch from a druid tree."
         type="generic"
         weight="10"
         maxFloorOffset="20"/>
     <item id="823"
         image="generic/dragonscales.png"
         name="Dragon Scales"
-        description=""
+        description="Taken from a dead dragon."
         type="generic"
         weight="10"
         maxFloorOffset="20"/>
     <item id="824"
         image="generic/lightgreendiamond.png"
         name="Light Green Diamond"
-        description=""
+        description="A light green diamond."
         type="generic"
         weight="10"
         maxFloorOffset="20"/>
     <item id="825"
         image="generic/deserttablet.png"
         name="Desert Tablet"
-        description=""
+        description="A tablet found in the sand ocean."
         type="generic"
         weight="10"
         maxFloorOffset="20"/>
     <item id="826"
         image="generic/fluopowder.png"
         name="Fluo Powder"
-        description=""
+        description="Fluoresent powder."
         type="generic"
         weight="10"
         maxFloorOffset="20"/>
     <item id="827"
         image="generic/brokenmedal.png"
         name="Broken Medal"
-        description=""
+        description="Unlucky."
         type="generic"
         weight="10"
         maxFloorOffset="20"/>
     <item id="828"
         image="generic/strangecoin.png"
         name="Strange Coin"
-        description=""
+        description="Dosent look like the others."
         type="generic"
         weight="3"
         maxFloorOffset="20"/>
@@ -2373,7 +2374,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <item id="1321"
         image="equipment/chest/candorshirt.png"
         name="Candor Shirt"
-        description="."
+        description="A classical Candor shirt"
         defense="2"
         level="1"
         type="equip-torso"
@@ -2421,7 +2422,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <item id="1803"
         image="equipment/feet/candorboots.png"
         name="Candor Boots"
-        description=""
+        description="A Candor favorite"
         defense="5"
         level="4"
         type="equip-feet"
@@ -2661,7 +2662,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <item id="2217"
         image="equipment/legs/candorshorts.png"
         name="Candor Shorts"
-        description=""
+        description="A Clasic pair of shorts"
         defense="1"
         level="1"
         type="equip-legs"
@@ -2845,7 +2846,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="2708"
         image="equipment/shields/ancientshield.png"
         name="Ancient Shield"
-        description=""
+        description="No one knows its orrigins."
         defense="190"
         level="50"
         type="equip-shield"
@@ -2854,7 +2855,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="2709"
         image="equipment/shields/braknarshield.png"
         name="Braknar Shield"
-        description=""
+        description="A sturdy shield."
         defense="105"
         level="39"
         type="equip-shield"
@@ -3363,7 +3364,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <item id="2939"
         image="equipment/head/candorheadband.png"
         name="Candor Head Band"
-        description="A."
+        description="Classical Candor head band."
         defense="11"
         level="8"
         type="equip-head"
@@ -3536,7 +3537,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="3507"
         image="equipment/weapons/dagger.png"
         name="Dagger"
-        description=""
+        description="Use to stab."
         attack="50"
         attack-range="1"
         level=""
@@ -3550,7 +3551,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="3508"
         image="equipment/weapons/boneknife.png"
         name="Bone Knife"
-        description=""
+        description="A knife made from bones. Quite effective."
         attack="50"
         attack-range="1"
         level=""
@@ -3564,7 +3565,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="3509"
         image="equipment/weapons/rockknife.png"
         name="Rock Knife"
-        description=""
+        description="A rock solid knife."
         attack="50"
         attack-range="1"
         level=""
@@ -3819,7 +3820,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="6001"
         image="equipment/weapons/trainingbow.png"
         name="Training Bow"
-        description=""
+        description="Primarily used in tranining "
         attack="70"
         attack-range="5"
         missile-particle="graphics/particles/training-arrow.xml"
@@ -3836,7 +3837,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="6002"
         image="equipment/weapons/shortbow.png"
         name="Short Bow"
-        description=""
+        description="The shortest of them all."
         attack="70"
         attack-range="5"
         missile-particle="graphics/particles/training-arrow.xml"
@@ -3944,28 +3945,28 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
    <item id="6503"
         image="equipment/ammo/bonearrow.png"
         name="Bone Arrow"
-        description="."
+        description="A bone arrow"
         type="equip-ammo"
         attack="80"
         weight="1"/>
    <item id="6504"
         image="equipment/ammo/cursedarrow.png"
         name="Cursed Arrow"
-        description="."
+        description="A cursed arrow"
         type="equip-ammo"
         attack="80"
         weight="1"/>
    <item id="6505"
         image="equipment/ammo/ironarrow.png"
         name="Iron Arrow"
-        description=""
+        description="An arrow made from iron"
         type="equip-ammo"
         attack="80"
         weight="1"/>
    <item id="6506"
         image="equipment/ammo/poisonarrow.png"
         name="Poison Arrow"
-        description=""
+        description="A normal arrow diped in poison"
         type="equip-ammo"
         attack="80"
         weight="1"/>
diff --git a/pets.xml b/pets.xml
index c1f795da..9c0f1bb9 100644
--- a/pets.xml
+++ b/pets.xml
@@ -6,4 +6,7 @@ Copyright (C) 2013 Evol Online -->
     <pet id="1002" name="piou">
         <sprite>monsters/piou.xml</sprite>
     </pet>
+    <pet id="1063" name="Vampire Bat">
+        <sprite>monsters/piou.xml</sprite>
+    </pet>
 </pets>
diff --git a/quests.xml b/quests.xml
index baedff9e..6e166bef 100644
--- a/quests.xml
+++ b/quests.xml
@@ -746,7 +746,7 @@ Copyright (C) 2012-2013 Evol Online -->
             <text>This Guild offers storage and bank services.</text>
             <text></text>
             <questgiver>Lloyd</questgiver>
-            <coordinates x="101" y="37">Artis, Merchant Guild. (101,37)</coordinates>
+            <coordinates x="101" y="37">Tulimshar, Merchant Guild. (101,37)</coordinates>
             <reward>Merchant Guild access.</reward>
         </quest>
     </var>