Add content from !2

26 files changed, 721 insertions, 26 deletions

diff --git a/LICENSE b/LICENSE
index 2a0175bc..3623b09d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -387,8 +387,13 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/particles/aniblaze.png (Crush)                                 (GPLv2, CC BY-SA 3.0) (Mickhsa)
     graphics/particles/aniblaze-medium.png (Crush)                          (GPLv2, CC BY-SA 3.0) (Mickhsa)
     graphics/particles/arrow-directions.png (Alige, Crush)                  (CC BY-SA 3.0)        (-)
+    graphics/particles/arrow-down.png (LEGACY)                              (CC BY-SA 3.0)        (-)
+    graphics/particles/arrow-directions.png (Alige, Crush)                  (CC BY-SA 3.0)        (-)
+    graphics/particles/arrowh.png (LEGACY)                                  (CC BY-SA 3.0)        (-)
     graphics/particles/blaze.png (Crush)                                    (GPLv2, CC BY-SA 3.0) (Mickhsa)
     graphics/particles/bubble.png (Crush)                                   (CC BY-SA 3.0)        (-)
+    graphics/particles/electricity.particle.png (LEGACY)                    (CC BY-SA 3.0)        (-)
+    graphics/particles/fireball.png (LEGACY)                                (CC BY-SA 3.0)        (-)
     graphics/particles/fog-medium.png (Crush)                               (CC BY-SA 3.0)        (Reid)
     graphics/particles/fog-medium2.png (Crush)                              (CC BY-SA 3.0)        (Reid)
     graphics/particles/fog-medium3.png (Crush)                              (CC BY-SA 3.0)        (Reid)
@@ -398,6 +403,10 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/particles/gloworb-medium.png (Crush)                           (CC BY-SA 3.0)        (-)
     graphics/particles/heart.png (Coolkid782, Reid)                         (CC BY-SA 3.0)        (-)
     graphics/particles/hexagon.png (Crush)                                  (CC BY-SA 3.0)        (-)
+    graphics/particles/hex-facet-50.png (LEGACY)                            (CC BY-SA 3.0)        (-)
+    graphics/particles/lightning1-240.png (LEGACY)                          (CC BY-SA 3.0)        (-)
+    graphics/particles/lightning2-263.png (LEGACY)                          (CC BY-SA 3.0)        (-)
+    graphics/particles/lightning3-275.png (LEGACY)                          (CC BY-SA 3.0)        (-)
     graphics/particles/orb-large.png (Reid)                                 (CC BY-SA 3.0)        (-)
     graphics/particles/orb-large2.png (Reid)                                (CC BY-SA 3.0)        (-)
     graphics/particles/orb-medium.png (Crush)                               (CC BY-SA 3.0)        (-)
@@ -410,11 +419,14 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 
 # Skills
     graphics/skills/bash.png (Othello, Reid)                                (CC BY-SA 3.0)        (-)
+    graphics/skills/coldbolt.png (Micksha)                                  (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/lightning.png (Micksha)                                 (CC BY-SA 3.0)        (-)
     graphics/skills/owls-eye.png (Micksha)                                  (CC BY-SA 3.0)        (-)
+    graphics/skills/provoke.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)
diff --git a/effects.xml b/effects.xml
index af788fbf..c8dd04f1 100644
--- a/effects.xml
+++ b/effects.xml
@@ -38,6 +38,11 @@ Copyright (C) 2010-2014 Evol Online -->
     <effect id="30" audio="npcs/fishing-bite.ogg"/> <!-- Fish biting the bait, in the fishing script. -->
     <effect id="33" audio="monsters/piou/hit1.ogg"/> <!-- when clicking the flying piou -->
     <effect id="34" particle="graphics/particles/fire-explosion.xml"/> <!-- An explosion of white particles / LEGACY -->
+    <effect id="35" particle="graphics/particles/magic-shield.xml"/> <!-- A magic shield particle effect. -->
+    <effect id="36" particle="graphics/particles/magic.shield-ends.xml"/>
+    <effect id="37" particle="graphics/particles/lightning1.xml"/>
+    <effect id="38" particle="graphics/particles/magic.black.xml"/>
+    <effect id="39" particle="graphics/particles/electricity.blue.xml"/>
     <effect id="344"/> <!-- @summon GM command particle effect. -->
 
     <!-- known server special effects
diff --git a/graphics/particles/arrow-down.png b/graphics/particles/arrow-down.png
new file mode 100644
index 00000000..da94afcf
--- /dev/null
+++ b/graphics/particles/arrow-down.png
diff --git a/graphics/particles/arrow-hail.xml b/graphics/particles/arrow-hail.xml
new file mode 100644
index 00000000..8dc40cd8
--- /dev/null
+++ b/graphics/particles/arrow-hail.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="400" lifetime="1000">
+    <!-- <property name="follow-parent" value="0"/> -->
+    <emitter>
+      <!-- <property name="follow-parent" value="0"/> -->
+      <property name="lifetime" min="180" max="180"/>
+      <property name="position-x" min="-250" max="350"/>
+      <property name="position-y" min="-350" max="250"/>
+      <property name="vertical-angle" value="255"/>
+      <property name="power" value="14"/>
+      <property name="output" min="5" max="15"/>
+      <property name="output-pause" min="5" max="10"/>
+      <property name="gravity" value="0.09"/>
+      <property name="image" value="graphics/particles/arrow-down.png"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/arrow.particle.xml b/graphics/particles/arrow.particle.xml
new file mode 100644
index 00000000..37409035
--- /dev/null
+++ b/graphics/particles/arrow.particle.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="32" lifetime="128">
+    <rotation imageset="graphics/particles/arrowh.png" width="16" height="16">
+      <sequence start="0" end="7"/>
+    </rotation>
+  </particle>
+</effect>
diff --git a/graphics/particles/arrowh.png b/graphics/particles/arrowh.png
new file mode 100644
index 00000000..11826070
--- /dev/null
+++ b/graphics/particles/arrowh.png
diff --git a/graphics/particles/electricity.blue.xml b/graphics/particles/electricity.blue.xml
new file mode 100644
index 00000000..192e067f
--- /dev/null
+++ b/graphics/particles/electricity.blue.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="0" lifetime="300">
+    <emitter>
+      <property name="lifetime" value="30"/>
+      <property name="output" value="1"/>
+      <property name="position-x" min="-16" max="16"/>
+      <property name="position-y" min="-16" max="16"/>
+      <property name="gravity" value="-2"/>
+      <property name="momentum" value="0.3"/>
+      <animation imageset="graphics/particles/electricity.particle.png|W:#0000FF" width="15" height="15">
+        <sequence start="0" end="7" delay="20"/>
+      </animation>
+      <property name="fade-out" value="30"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/electricity.particle.png b/graphics/particles/electricity.particle.png
new file mode 100644
index 00000000..c4487d45
--- /dev/null
+++ b/graphics/particles/electricity.particle.png
diff --git a/graphics/particles/fireball.png b/graphics/particles/fireball.png
new file mode 100644
index 00000000..d9fa08ba
--- /dev/null
+++ b/graphics/particles/fireball.png
diff --git a/graphics/particles/fireball.xml b/graphics/particles/fireball.xml
new file mode 100644
index 00000000..ab946341
--- /dev/null
+++ b/graphics/particles/fireball.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="32" lifetime="128">
+    <image>graphics/particles/fireball.png</image>
+    <emitter>
+      <property name="image" value="graphics/particles/star-small.png|W:#631414,c3771c,f8d96f"/>
+      <property name="lifetime" value="90"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="90"/>
+      <property name="output" min="0" max="1"/>
+      <property name="power" min="0" max="2"/>
+      <property name="horizontal-angle" min="-15" max="-175"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="200"/>
+      <property name="vertical-angle" min="0" max="90"/>
+    </emitter>
+    <emitter>
+      <property name="image" value="graphics/particles/star-small.png|W:#631400,c37700,f8d900"/>
+      <property name="lifetime" value="90"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="90"/>
+      <property name="output" min="0" max="1"/>
+      <property name="power" min="0" max="2"/>
+      <property name="horizontal-angle" min="-15" max="-175"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="200"/>
+      <property name="vertical-angle" min="0" max="90"/>
+    </emitter>
+    <emitter>
+      <property name="image" value="graphics/particles/orb-small.png|W:#932a15"/>
+      <property name="lifetime" value="90"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="90"/>
+      <property name="output" min="0" max="1"/>
+      <property name="power" min="0" max="2"/>
+      <property name="horizontal-angle" min="-15" max="-175"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="200"/>
+      <property name="vertical-angle" min="0" max="90"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/hex-facet-50.png b/graphics/particles/hex-facet-50.png
new file mode 100644
index 00000000..310304dd
--- /dev/null
+++ b/graphics/particles/hex-facet-50.png
diff --git a/graphics/particles/lightning1-240.png b/graphics/particles/lightning1-240.png
new file mode 100644
index 00000000..65064104
--- /dev/null
+++ b/graphics/particles/lightning1-240.png
diff --git a/graphics/particles/lightning1.xml b/graphics/particles/lightning1.xml
new file mode 100644
index 00000000..0fe869b0
--- /dev/null
+++ b/graphics/particles/lightning1.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+An explosion of white particles.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="120" lifetime="1">
+    <emitter>
+      <property name="power" min="0" max="0"/>
+      <property name="gravity" value="0"/>
+      <property name="image" value="graphics/particles/lightning1-240.png"/>
+      <property name="lifetime" min="5" max="10"/>
+      <property name="output" value="1"/>
+      <property name="fade-out" value="8"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/lightning2-263.png b/graphics/particles/lightning2-263.png
new file mode 100644
index 00000000..6f084ef5
--- /dev/null
+++ b/graphics/particles/lightning2-263.png
diff --git a/graphics/particles/lightning2.xml b/graphics/particles/lightning2.xml
new file mode 100644
index 00000000..6f5d059d
--- /dev/null
+++ b/graphics/particles/lightning2.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+An explosion of white particles.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="131" lifetime="1">
+    <emitter>
+      <property name="power" min="0" max="0"/>
+      <property name="gravity" value="0"/>
+      <property name="image" value="graphics/particles/lightning2-263.png"/>
+      <property name="lifetime" min="5" max="10"/>
+      <property name="output" value="1"/>
+      <property name="fade-out" value="8"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/lightning3-275.png b/graphics/particles/lightning3-275.png
new file mode 100644
index 00000000..ac1e1cb6
--- /dev/null
+++ b/graphics/particles/lightning3-275.png
diff --git a/graphics/particles/lightning3.xml b/graphics/particles/lightning3.xml
new file mode 100644
index 00000000..3734f1f8
--- /dev/null
+++ b/graphics/particles/lightning3.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+An explosion of white particles.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="137" lifetime="1">
+    <emitter>
+      <property name="power" min="0" max="0"/>
+      <property name="gravity" value="0"/>
+      <property name="image" value="graphics/particles/lightning3-275.png"/>
+      <property name="lifetime" min="5" max="10"/>
+      <property name="output" value="1"/>
+      <property name="fade-out" value="8"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/magic.black.xml b/graphics/particles/magic.black.xml
new file mode 100644
index 00000000..88c8f9b8
--- /dev/null
+++ b/graphics/particles/magic.black.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="0" lifetime="128">
+    <emitter>
+      <animation imageset="graphics/particles/sparkle.png|W:#000000" width="15" height="15">
+        <sequence start="0" end="3" delay="50"/>
+        <frame index="0" delay="100"/>
+      </animation>
+      <property name="vertical-angle" value="90"/>
+      <property name="power" min="1" max="1"/>
+      <property name="lifetime" min="15" max="25"/>
+      <property name="output" min="0" max="1"/>
+      <property name="position-x" min="-16" max="16"/>
+      <property name="position-y" min="-16" max="16"/>
+      <property name="position-z" min="29" max="40"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/magic.shield-ends.xml b/graphics/particles/magic.shield-ends.xml
new file mode 100644
index 00000000..41d83e73
--- /dev/null
+++ b/graphics/particles/magic.shield-ends.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="85" lifetime="1">
+    <emitter>
+      <property name="vertical-angle" value="270"/>
+      <property name="power" value="4"/>
+      <property name="lifetime" value="1"/>
+      <property name="output" min="1" max="1"/>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="-11" max="11"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="4" end="4" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="11" max="33"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="3" end="3" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="34" max="56"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="2" end="2" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="56" max="78"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="1" end="1" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="79" max="101"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="0" end="0" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="101" max="123"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="7" end="7" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="124" max="146"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="6" end="6" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="146" max="168"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="0" end="0" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="169" max="191"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="4" end="4" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="191" max="213"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="3" end="3" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="214" max="236"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="2" end="2" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="236" max="258"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="1" end="1" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="259" max="281"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="0" end="0" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="281" max="303"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="7" end="7" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="304" max="326"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="6" end="6" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="326" max="348"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="10" max="15"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="0" end="0" delay="10000"/>
+          </animation>
+          <property name="position-z" min="-85" max="0"/>
+          <property name="gravity" value="0.2"/>
+          <property name="lifetime" value="40"/>
+          <property name="fade-out" value="40"/>
+        </emitter>
+      </emitter>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/magic.shield.xml b/graphics/particles/magic.shield.xml
new file mode 100644
index 00000000..b964298b
--- /dev/null
+++ b/graphics/particles/magic.shield.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="0" lifetime="1">
+    <emitter>
+      <property name="vertical-angle" value="90"/>
+      <property name="power" value="4"/>
+      <property name="lifetime" value="25"/>
+      <property name="output" min="1" max="1"/>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="-11" max="11"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="4" end="4" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="11" max="33"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="3" end="3" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="34" max="56"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="2" end="2" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="56" max="78"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="1" end="1" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="79" max="101"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="0" end="0" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="101" max="123"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="7" end="7" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="124" max="146"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="6" end="6" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="146" max="168"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="5" end="5" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="169" max="191"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="4" end="4" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="191" max="213"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="3" end="3" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="214" max="236"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="2" end="2" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="236" max="258"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="1" end="1" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="259" max="281"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="0" end="0" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="281" max="303"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="7" end="7" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="304" max="326"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="6" end="6" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+      <emitter>
+        <property name="vertical-angle" value="0"/>
+        <property name="horizontal-angle" min="326" max="348"/>
+        <property name="power" min="18" max="20"/>
+        <property name="lifetime" value="1"/>
+        <property name="output" min="0" max="2"/>
+        <emitter>
+          <animation imageset="graphics/particles/hex-facet-50.png|W:#ff0000" width="9" height="11">
+            <sequence start="5" end="5" delay="10000"/>
+          </animation>
+          <property name="lifetime" value="40"/>
+          <property name="fade-in" value="5"/>
+        </emitter>
+      </emitter>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/skills/coldbolt.png b/graphics/skills/coldbolt.png
new file mode 100644
index 00000000..3c717c8b
--- /dev/null
+++ b/graphics/skills/coldbolt.png
diff --git a/graphics/skills/lightning.png b/graphics/skills/lightning.png
new file mode 100644
index 00000000..1ba61a00
--- /dev/null
+++ b/graphics/skills/lightning.png
diff --git a/graphics/skills/provoke.png b/graphics/skills/provoke.png
new file mode 100644
index 00000000..ed635979
--- /dev/null
+++ b/graphics/skills/provoke.png
diff --git a/skills.xml b/skills.xml
index ffda4563..62e3d5c4 100644
--- a/skills.xml
+++ b/skills.xml
@@ -3,26 +3,13 @@
 Copyright (C) 2010-2013 Evol Online -->
 
 <skills>
-    <set name="Basic">
+    <set name="General">
         <skill
             id="1"
             name="Basic"
             icon="graphics/skills/emote.png"
             description="Allow do basic things like sitting, smiling or trading."
         />
-        <skill
-            id="20000"
-            name="Mass provoke"
-            icon="graphics/skills/legacy/resistpoison.png"
-            description="Allow provoke many monsters."
-            castingAnimation="emote.xml"
-        />
-        <skill
-            id="20001"
-            name="Magic shield"
-            icon="graphics/skills/legacy/life.png"
-            description="Allow protect from magic attacks."
-        />
     </set>
     <set name="Passive">
         <skill
@@ -55,7 +42,7 @@ Copyright (C) 2010-2013 Evol Online -->
         <skill
             id="14"
             name="Cold Touch"
-            icon="graphics/skills/legacy/astralsoul.png"
+            icon="graphics/skills/coldbolt.png"
             description="Sends water darts on your foe."
             castingMissile-particle="graphics/particles/ice-particle.xml"
             castingMissile-lifetime="10000"
@@ -73,16 +60,22 @@ 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"
-            castingSrcEffectId="7"
-            dstEffectId="7"
+            id="19"
+            name="Fire Bolt"
+            icon="graphics/skills/fireball.png"
+            description="Throw a fire bolt."
+            castingMissile-particle="graphics/particles/arrow.particle.xml"
+            dstEffectId="34"
+        />
+        <skill
+            id="20"
+            name="Lightning Bolt"
+            icon="graphics/skills/lightning.png"
+            description="A single lightning from sky."
+            hitEffectId="37"
+            castingSrcEffectId="38"
+            castingDstEffectId="-1"
         />
         <skill
             id="24"
@@ -96,18 +89,44 @@ Copyright (C) 2010-2013 Evol Online -->
             dstEffectId="34"
         />
     </set>
+    <set name="Support">
+        <skill
+            id="28"
+            name="Healing"
+            icon="graphics/skills/heal.png"
+            description="Heals you or one of your comrades."
+            castingMissile-particle="graphics/particles/healing.xml"
+            castingSrcEffectId="7"
+            dstEffectId="7"
+        />
+        <skill
+            id="20001"
+            name="Magic shield"
+            icon="graphics/skills/legacy/life.png"
+            description="Allow protect from magic attacks."
+        />
+    </set>
     <set name="Other">
         <skill
             id="220"
             name="Grafiti"
             description="Draw text on ground."
-            useTextParameter="true"/>
+            useTextParameter="true"
+        />
+        <skill
+            id="20000"
+            name="Mass provoke"
+            icon="graphics/skills/provoke.png"
+            description="Allow provoke many monsters."
+            castingAnimation="emote.xml"
+        />
     </set>
     <set name="Restricted">
         <skill
             id="20002"
             name="Super Menu"
             description="Gives access to all debug and administrative options"
-            invokeCmd="@numa"/>
+            invokeCmd="@numa"
+        />
     </set>
 </skills>
diff --git a/skillunits.xml b/skillunits.xml
index 066f17e9..789699ed 100644
--- a/skillunits.xml
+++ b/skillunits.xml
@@ -29,6 +29,10 @@ Copyright (C) 2015 Evol Online -->
     <skillunit id="205" name="Dimension door">
         <sprite>npcs/xml/artisindoor.xml</sprite>
     </skillunit>
+    <!-- SEVERE_RAINSTORM -->
+    <skillunit id="219" name="Severe rainstorm">
+        <particlefx>graphics/particles/arrow-hail.xml</particlefx>
+    </skillunit>
     <!-- GN_DEMONIC_FIRE -->
 <!--
     <skillunit id="231">
diff --git a/status-effects.xml b/status-effects.xml
index ba5a12cf..c43e7ebe 100644
--- a/status-effects.xml
+++ b/status-effects.xml
@@ -262,6 +262,8 @@ end-message:                Displays a message when the effect end.
         icon="icons/spell-protection.xml"
         start-particle="graphics/particles/magic-shield.xml"
         end-particle="graphics/particles/magic-shield-end.xml"
+		start-message="You feel more protected."
+		end-message="You feel less protected."
     />
 
     <!-- OPTION_SIGHT -->