remove skills from wrong branch, update items and NPCs (add Melinda), fix finedress for dying

1 files changed, 15 insertions, 3 deletions

diff --git a/items.xml b/items.xml
index bf62e6c0..d93c645b 100644
--- a/items.xml
+++ b/items.xml
@@ -1013,9 +1013,10 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="equip-torso"
         weight="240"
         colors="simple"
+        iconColors="simple"
         maxFloorOffset="10">
-        <sprite gender="unisex">equipment/chest/finedress-male.xml|#606060,aaaaaa,dddddd,fcfcfc</sprite>
-        <sprite gender="female">equipment/chest/finedress-female.xml||#606060,aaaaaa,dddddd,fcfcfc</sprite>
+        <sprite gender="unisex">equipment/chest/finedress-male.xml</sprite>
+        <sprite gender="female">equipment/chest/finedress-female.xml</sprite>
     </item>
     <item id="1309"
         image="equipment/chest/warlordplate.png"
@@ -1821,6 +1822,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5022"
         image="usable/gem3-polished.png|W:#315a67,a4a4ae,dce5d6,ffffff"
         name="Diamond"
+        useButton="Gem"
         description="A diamond, polished and shining."
         type="card"
         weight="50"
@@ -1828,6 +1830,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5023"
         image="usable/gem1-polished.png|W:#581a1a,a41111,c03a3a,ff6060,ffffff"
         name="Ruby"
+        useButton="Gem"
         description="A polished ruby, blinking in bright red color."
         type="card"
         weight="50"
@@ -1835,6 +1838,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5024"
         image="usable/gem2-polished.png|W:#1f9c1f,89d689,ffffff"
         name="Emerald"
+        useButton="Gem"
         description="A polished Emerald, beautiful and green."
         type="card"
         weight="50"
@@ -1842,6 +1846,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5025"
         image="usable/gem2-polished.png|W:#4b4bbd,888af4,ffffff"
         name="Sapphire"
+        useButton="Gem"
         description="A polished sapphire, blinking in dark blue."
         type="card"
         weight="50"
@@ -1849,6 +1854,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5026"
         image="usable/gem1-polished.png|W:#ccb534,f1ea8e,ffffaa,ffffff"
         name="Topaz"
+        useButton="Gem"
         description="A Topaz, polished and beautiful."
         type="card"
         weight="50"
@@ -1856,7 +1862,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5027"
         image="usable/gem3-polished.png|W:#530a7c,b362e1,ca87ef,ffffff"
         name="Amethyst"
-        useButton="Dye"
+        useButton="Gem"
         description="A polished Amethyst. Some say it has the power to heal."
         type="card"
         weight="50"
@@ -1864,6 +1870,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5028"
         image="usable/gem-crude.png|W:#315a67,a4a4ae,dce5d6,ffffff"
         name="Crude Diamond"
+        useButton="Gem"
         description="A crude diamond, fresh from the mines."
         type="card"
         cardColor="2"
@@ -1872,6 +1879,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5029"
         image="usable/gem-crude.png|W:#581a1a,a41111,c03a3a,ff6060"
         name="Crude Ruby"
+        useButton="Gem"
         description="A crude ruby, fresh from the mines."
         type="card"
         cardColor="3"
@@ -1880,6 +1888,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5030"
         image="usable/gem-crude.png|W:#1f9c1f,89d689"
         name="Crude Emerald"
+        useButton="Gem"
         description="A crude emerald, fresh from the mines."
         type="card"
         cardColor="4"
@@ -1888,6 +1897,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5031"
         image="usable/gem-crude.png|W:#4b4bbd,888af4"
         name="Crude Sapphire"
+        useButton="Gem"
         description="A crude sapphire, fresh from the mines."
         type="card"
         cardColor="5"
@@ -1896,6 +1906,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5032"
         image="usable/gem-crude.png|W:#ccb534,f1ea8e,ffffaa"
         name="Crude Topaz"
+        useButton="Gem"
         description="A crude topaz, fresh from the mines."
         type="card"
         cardColor="6"
@@ -1904,6 +1915,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     <item id="5033"
         image="usable/gem-crude.png|W:#530a7c,b362e1,ca87ef"
         name="Crude Amethyst"
+        useButton="Gem"
         description="A crude amethyst, fresh from the mines."
         type="card"
         cardColor="7"