Merge branch 'skills2' into 'master'

non-magic passive skills

See merge request evol/clientdata!98

6 files changed, 27 insertions, 11 deletions

diff --git a/LICENSE b/LICENSE
index 94d9c5b2..8d3b392c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -303,9 +303,12 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 
 # Skills
     graphics/skills/bash.png (Othello, Reid)                                (CC BY-SA 3.0)        (-)
+    graphics/skills/dagger.png (Micksha)                                    (CC BY-SA 3.0)        (-)
     graphics/skills/emote.png (Reid)                                        (CC BY-SA 3.0)        (-)
     graphics/skills/fireball.png (Micksha)                                  (CC BY-SA 3.0)        (-)
     graphics/skills/heal.png (Micksha)                                      (CC BY-SA 3.0)        (-)
+    graphics/skills/owls-eye.png (Micksha)                                  (CC BY-SA 3.0)        (-)
+    graphics/skills/scythe.png (Micksha)                                    (CC BY-SA 3.0)        (-)
     graphics/skills/legacy/astralsoul.png (?, Alige)                        (GPLv2)               (-)
     graphics/skills/legacy/focus.png (?)                                    (CC BY-SA 3.0)        (Alige, Modanung)
     graphics/skills/legacy/life.png (Alige, Reid)                           (CC BY-SA 3.0)        (-)
diff --git a/graphics/particles/circle.particle.xml b/graphics/particles/circle.particle.xml
index b42aecf8..45cf9a33 100644
--- a/graphics/particles/circle.particle.xml
+++ b/graphics/particles/circle.particle.xml
@@ -8,7 +8,7 @@ A circle on the ground 60 pixels in diameter made from particles.
       <property name="position-y" value="-16"/>
       <property name="horizontal-angle" min="0" max="360"/>
       <property name="vertical-angle" min="0" max="0"/>
-      <property name="power" value="30"/>
+      <property name="power" value="10"/>
       <property name="lifetime" value="1"/>
       <property name="output" value="3"/>
       <emitter>
diff --git a/graphics/skills/dagger.png b/graphics/skills/dagger.png
new file mode 100644
index 00000000..26624688
--- /dev/null
+++ b/graphics/skills/dagger.png
diff --git a/graphics/skills/owls-eye.png b/graphics/skills/owls-eye.png
new file mode 100644
index 00000000..753c9d2e
--- /dev/null
+++ b/graphics/skills/owls-eye.png
diff --git a/graphics/skills/scythe.png b/graphics/skills/scythe.png
new file mode 100644
index 00000000..27de8802
--- /dev/null
+++ b/graphics/skills/scythe.png
diff --git a/skills.xml b/skills.xml
index 2da0ef5b..ffda4563 100644
--- a/skills.xml
+++ b/skills.xml
@@ -24,6 +24,26 @@ Copyright (C) 2010-2013 Evol Online -->
             description="Allow protect from magic attacks."
         />
     </set>
+    <set name="Passive">
+        <skill
+            id="2"
+            name="Sword Mastery"
+            icon="graphics/skills/dagger.png"
+            description="Improves your damage when using dagger- or sword-type weapons."
+        />
+        <skill
+            id="3"
+            name="2-Hand Mastery"
+            icon="graphics/skills/scythe.png"
+            description="Improves your damage when using two-hand weapons."
+        />
+        <skill
+            id="43"
+            name="Owl's Eye"
+            icon="graphics/skills/owls-eye.png"
+            description="Improves your dexterity, based on the skill level."
+        />
+    </set>
     <set name="Offensive">
         <skill
             id="5"
@@ -53,18 +73,18 @@ Copyright (C) 2010-2013 Evol Online -->
             castingSrcEffectId="23"
             dstEffectId="34"
         />
+    </set>
+    <set name="Other">
         <skill
             id="28"
             name="Healing"
             icon="graphics/skills/heal.png"
             description="Heals you or one of your comrades."
             castingMissile-particle="graphics/particles/healing.xml"
-            castingMissile-lifetime="5000"
-            castingMissile-speed="3"
             castingSrcEffectId="7"
             dstEffectId="7"
         />
-       <skill
+        <skill
             id="24"
             name="Fire Ball"
             icon="graphics/skills/fireball.png"
@@ -77,13 +97,6 @@ Copyright (C) 2010-2013 Evol Online -->
         />
     </set>
     <set name="Other">
-       <skill
-            id="28"
-            name="Heal"
-            icon="graphics/skills/heal.png"
-            description="Provides a bit of health to you, and to one of your friends."
-            castingMissile-particle="graphics/particles/healing.xml"
-        />
         <skill
             id="220"
             name="Grafiti"