From 91a9e9788958a8d185e8094d01f69fd2a47385d9 Mon Sep 17 00:00:00 2001
From: tux9th <mr.x@aon.at>
Date: Wed, 12 Jun 2013 14:37:49 +0200
Subject: Adding Dark Magic:

	* Added in ea_skills.xml.
	* Added in skills.xml.
	* Added Dark Magic image, done by wushin, enchilado and Alige.
	* Edited license.txt.
	* Added particle effect for Dark Magic.
---
 ea-skills.xml                        |   1 +
 effects.xml                          |   2 ++
 graphics/particles/magic.darkred.xml |  18 ++++++++++++++++++
 graphics/skills/magic/dark.png       | Bin 0 -> 4180 bytes
 license.txt                          |   1 +
 skills.xml                           |   1 +
 6 files changed, 23 insertions(+)
 create mode 100644 graphics/particles/magic.darkred.xml
 create mode 100644 graphics/skills/magic/dark.png

diff --git a/ea-skills.xml b/ea-skills.xml
index 523d188a..614cea10 100644
--- a/ea-skills.xml
+++ b/ea-skills.xml
@@ -16,6 +16,7 @@
     <skill id="343" name="Transmutation Magic" icon="graphics/skills/magic/transmutation.png"/>
     <skill id="344" name="Nature Magic" icon="graphics/skills/magic/nature.png"/>
     <skill id="345" name="Astral Magic" icon="graphics/skills/magic/astral.png"/>
+    <skill id="346" name="Dark Magic" icon="graphics/skills/magic/dark.png"/>
   </set>
   <set name="Focus">
     <skill id="339" name="Focusing" icon="graphics/skills/focus/focus.png"/>
diff --git a/effects.xml b/effects.xml
index fd9303b4..18c4a9f8 100644
--- a/effects.xml
+++ b/effects.xml
@@ -43,6 +43,8 @@
   <effect id="6" particle="graphics/particles/magic.green.xml"/>
   <!-- astral -->
   <effect id="7" particle="graphics/particles/magic.blue.xml"/>
+  <!-- dark -->
+  <effect id="8" particle="graphics/particles/magic.darkred.xml"/>
   <effect id="10" particle="graphics/particles/magic.default.xml"/>
   <effect id="11" particle="graphics/particles/magic.shield.xml"/>
   <!--  <effect id="12" particle="graphics/particles/magic.haste.xml"/>-->
diff --git a/graphics/particles/magic.darkred.xml b/graphics/particles/magic.darkred.xml
new file mode 100644
index 00000000..96460946
--- /dev/null
+++ b/graphics/particles/magic.darkred.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:#ff0000,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="1" 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/skills/magic/dark.png b/graphics/skills/magic/dark.png
new file mode 100644
index 00000000..886f4311
Binary files /dev/null and b/graphics/skills/magic/dark.png differ
diff --git a/license.txt b/license.txt
index 63970192..2d6af506 100644
--- a/license.txt
+++ b/license.txt
@@ -552,6 +552,7 @@ http://creativecommons.org/licenses/by-sa/3.0/
     graphics/skills/magic/nature.png (????, Alige)                                                            (GPLv2)
     graphics/skills/magic/transmutation.png (????, Alige)                                                     (GPLv2)
     graphics/skills/magic/war.png (Alige)                                                                     (GPLv2), (CC BY-SA 3.0)
+    graphics/skills/magic/dark.png (Alige, wushin, enchilado)                                                 (GPLv2), (CC BY-SA 3.0)
 
 # Sprites
     graphics/sprites/emote.png (Alige, Arikel, DerLoisl, Modanung, Reid)                                      (GPLv2), (CC BY-SA 3.0)
diff --git a/skills.xml b/skills.xml
index c12375af..9e1d87ac 100644
--- a/skills.xml
+++ b/skills.xml
@@ -17,6 +17,7 @@
     <skill id="343" name="Transmutation Magic" icon="graphics/skills/magic/transmutation.png"/>
     <skill id="344" name="Nature Magic" icon="graphics/skills/magic/nature.png"/>
     <skill id="345" name="Astral Magic" icon="graphics/skills/magic/astral.png"/>
+    <skill id="346" name="Dark Magic" icon="graphics/skills/magic/dark.png"/>
   </set>
   <set name="Focus">
     <skill id="339" name="Focusing" icon="graphics/skills/focus/focus.png"/>
-- 
cgit v1.2.3-70-g09d2