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

10 files changed, 0 insertions, 54 deletions

diff --git a/graphics/items/equipment/chest/finedress.png b/graphics/items/equipment/chest/finedress.png
new file mode 100644
index 00000000..af928f11
--- /dev/null
+++ 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/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/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
new file mode 100644
index 00000000..6a55302b
--- /dev/null
+++ 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
new file mode 100644
index 00000000..1b598246
--- /dev/null
+++ b/graphics/sprites/equipment/chest/finedress-male.png
diff --git a/items.xml b/items.xml
index 3af70065..b191937c 100644
--- a/items.xml
+++ b/items.xml
@@ -1014,16 +1014,10 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         type="equip-torso"
         weight="240"
         colors="simple"
-<<<<<<< 9e0bdba0ea0f30537713a567ea39b05820b819d9
         iconColors="simple"
         maxFloorOffset="10">
         <sprite gender="unisex">equipment/chest/finedress-male.xml</sprite>
         <sprite gender="female">equipment/chest/finedress-female.xml</sprite>
-=======
-        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>
->>>>>>> Add items for Melinda: Fine dress, beer
     </item>
     <item id="1309"
         image="equipment/chest/warlordplate.png"
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"