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

13 files changed, 25 insertions, 51 deletions

diff --git a/graphics/items/equipment/chest/finedress.png b/graphics/items/equipment/chest/finedress.png
index 94277603..af928f11 100644
--- a/graphics/items/equipment/chest/finedress.png
+++ b/graphics/items/equipment/chest/finedress.png
diff --git a/graphics/skills/aura.png b/graphics/skills/aura.png
deleted file mode 100644
index 28d95708..00000000
--- a/graphics/skills/aura.png
+++ /dev/null
diff --git a/graphics/skills/axe.png b/graphics/skills/axe.png
deleted file mode 100644
index 53aafbc7..00000000
--- a/graphics/skills/axe.png
+++ /dev/null
diff --git a/graphics/skills/bash.png b/graphics/skills/bash.png
deleted file mode 100644
index 7c7d3115..00000000
--- a/graphics/skills/bash.png
+++ /dev/null
diff --git a/graphics/skills/dagger.png b/graphics/skills/dagger.png
deleted file mode 100644
index 41960c58..00000000
--- a/graphics/skills/dagger.png
+++ /dev/null
diff --git a/graphics/skills/doubledagger.png b/graphics/skills/doubledagger.png
deleted file mode 100644
index a66b9a4b..00000000
--- a/graphics/skills/doubledagger.png
+++ /dev/null
diff --git a/graphics/skills/emote.png b/graphics/skills/emote.png
deleted file mode 100644
index 7de5e244..00000000
--- a/graphics/skills/emote.png
+++ /dev/null
diff --git a/graphics/skills/swordslash.png b/graphics/skills/swordslash.png
deleted file mode 100644
index 3d1b4e8b..00000000
--- a/graphics/skills/swordslash.png
+++ /dev/null
diff --git a/graphics/sprites/equipment/chest/finedress-female.png b/graphics/sprites/equipment/chest/finedress-female.png
index 86ad95ea..6a55302b 100644
--- a/graphics/sprites/equipment/chest/finedress-female.png
+++ b/graphics/sprites/equipment/chest/finedress-female.png
diff --git a/graphics/sprites/equipment/chest/finedress-male.png b/graphics/sprites/equipment/chest/finedress-male.png
index 8c385aa1..1b598246 100644
--- a/graphics/sprites/equipment/chest/finedress-male.png
+++ b/graphics/sprites/equipment/chest/finedress-male.png
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"
diff --git a/npcs.xml b/npcs.xml
index 38e0722b..d4b9c2be 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -585,6 +585,16 @@ IDs 900-999 = Special
         <sprite>npcs/xml/mona.xml</sprite>
         <menu name="Talk" command="talk 'NAME'"/>
     </npc>
+    <npc id="451">
+        <!-- HURNS - Elven Female, walking sprite for Melinda NPC. -->
+        <sprite>races/elven-female.xml</sprite>
+        <sprite>equipment/feet/boots-female.xml|#594d36,b49b6c,f4d293</sprite>
+        <sprite>equipment/chest/finedress-female.xml|#620e48,bf1b8b,e32bcf,ffb6f7</sprite>
+        <sprite>equipment/hands/armbands-female.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
+        <sprite>equipment/neck/copper-necklace.xml|#315a67,a4a4ae,dce5d6,ffffff</sprite>
+        <sprite>hairstyles/hairstyle22.xml|#16211f,162e29,195145,1d7a62,29a27a,51de9c,c9f7bc</sprite>
+        <menu name="Talk" command="talk 'NAME'"/>
+    </npc>
 
     <!-- Test NPCs -->
     <npc id="800" allowDelete="false">
diff --git a/skills.xml b/skills.xml
index e94d4197..af72a714 100644
--- a/skills.xml
+++ b/skills.xml
@@ -66,54 +66,6 @@ Copyright (C) 2010-2013 Evol Online -->
             dstEffectId="34"
         />
     </set>
-    <set name="Onehand">
-        <skill
-            id="2474"
-            name="Sword training"
-            description="Passive skill. Sword training will improve your efficiency with one-handed weapons and enable further skills."
-            icon="graphics/skills/dagger.png"
-            levelUpEffectId="1"
-        />
-        <skill
-            id="2"
-            name="Sword mastery"
-            description="Passive skill. Sword mastery will make you a great fighter and provide further skills at a certain level."
-            icon="graphics/skills/dagger.png"
-            levelUpEffectId="1"
-        />
-        <skill
-            id="7"
-            name="Magnum break"
-            description="Produces a fire blast at a 5x5 area around the caster. Pushes enemies back 2 cells. Costs a small amount of hp."
-            icon="graphics/skills/swordslash.png"
-            particle="hellblaze.particle.xml"
-            levelUpEffectId="1"
-        />
-        <skill
-            id="48"
-            name="Double attack"
-            description="Allows a doubled attack with a chance of up to 50%, depending on skill level."
-            icon="graphics/skills/doubledagger.png"
-            particle="crit.particle.xml"
-            levelUpEffectId="1"
-        />
-        <skill
-            id="110"
-            name="Hammerfall"
-            description="Slams your weapon on the ground and makes all enemies within range stunned."
-            icon="graphics/skills/axe.png"
-            particle="circle.particle.xml"
-            levelUpEffectId="1"
-        />
-    <skill
-            id="155"
-            name="Crazy uproar"
-            description="Makes you scream like a viking, which will improve your strength."
-            icon="graphics/skills/aura.png"
-            particle="circle.particle.xml"
-            castingAnimation="emote.xml"
-        />
-    </set>
     <set name="Other">
        <skill
             id="28"