give unique ids to magic spell effects

14 files changed, 548 insertions, 7 deletions

diff --git a/effects.xml b/effects.xml
index 9c6ccc0d..5fa951ed 100644
--- a/effects.xml
+++ b/effects.xml
@@ -39,23 +39,23 @@
   <!-- 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="11" particle="graphics/particles/magic.shield.xml"/> <!-- #betsanc (protect) hit -->
   <!--  <effect id="12" particle="graphics/particles/magic.haste.xml"/>-->
   <effect id="13" particle="graphics/particles/magic.hit.xml"/>
   <effect id="14" particle="graphics/particles/magic.hit.evil.xml"/>
   <effect id="15" particle="graphics/particles/fire-burst.xml"/>
   <effect id="16" particle="graphics/particles/fire-explosion.xml"/>
-  <effect id="17" particle="graphics/particles/lightning1.xml"/>
-  <effect id="18" particle="graphics/particles/lightning2.xml"/>
-  <effect id="19" particle="graphics/particles/lightning3.xml"/>
+  <effect id="17" particle="graphics/particles/lightning1.xml"/> <!-- #ingrav (lightning strike) hit -->
+  <effect id="18" particle="graphics/particles/lightning2.xml"/> <!-- #ingrav (lightning strike) hit -->
+  <effect id="19" particle="graphics/particles/lightning3.xml"/> <!-- #ingrav (lightning strike) hit -->
   <effect id="20" particle="graphics/particles/magic.teleport.xml"/>
   <!--  <effect id="20" particle="graphics/particles/magic.barrier.xml"/> -->
   <effect id="21" particle="graphics/particles/pentagram-buildup-short.xml"/>
   <effect id="22" particle="graphics/particles/pentagram-burst.xml"/>
   <effect id="24" particle="graphics/particles/magic.teleport.xml"/>
-  <effect id="25" particle="graphics/particles/rain.xml"/>
+  <effect id="25" particle="graphics/particles/rain.xml"/> <!-- #kaflosh (rain) hit -->
   <effect id="26" particle="graphics/particles/hit.particle.xml"/>
-  <effect id="27" particle="graphics/particles/arrow-hail.xml"/>
+  <effect id="27" particle="graphics/particles/arrow-hail.xml"/> <!-- #frillyar (arrow hail) hit -->
   <effect id="28" particle="graphics/particles/crit.particle.xml"/>
   <effect id="30" particle="graphics/particles/large-explosion.xml"/>
   <effect id="31" particle="graphics/particles/medium-explosion.xml"/>
@@ -79,7 +79,7 @@
   <effect id="48" particle="graphics/particles/questdone.particle.xml"/>
   <effect id="49" particle="graphics/particles/hug.particle.xml"/>
   <effect id="69" particle="graphics/particles/python.xml" audio="env/fart.ogg"/>
-  <effect id="111" particle="graphics/particles/magic.shield-ends.xml"/>
+  <effect id="111" particle="graphics/particles/magic.shield-ends.xml"/> <!-- #betsanc (protect) end -->
   <!-- <effect id="112" particle="graphics/particles/magic.haste-ends.xml"/>-->
   <!-- <effect id="113" particle="graphics/particles/magic.barrier-ends.xml"/> -->
   <effect id="114" particle="graphics/particles/electricity.red.xml"/>
@@ -95,4 +95,58 @@
   <!-- Add the data needed for the electricity boss battle. -->
   <effect id="402" audio="system/ship-bell2.ogg"/>
   <effect id="403" audio="monsters/bat/bat-hit1.ogg"/>
+  <!-- magic v3 spells -->
+  <effect id="500" particle="graphics/particles/fire-burst.xml"/> <!-- #discharge -->
+  <effect id="501" particle="graphics/particles/magic.generic.xml"/> <!-- #confringo (wand) cast -->
+  <effect id="503" particle="graphics/particles/magic.green.xml"/> <!-- #itenplz (aggravate) cast -->
+  <effect id="504" particle="graphics/particles/magic.default.xml"/> <!-- #itenplz (aggravate) hit -->
+  <effect id="505" particle="graphics/particles/magic.generic.xml"/> <!-- #miteyo (detect magic) cast -->
+  <effect id="506" particle="graphics/particles/magic.default.xml"/> <!-- #miteyo (detect magic) hit -->
+  <effect id="507" particle="graphics/particles/magic.default.xml"/> <!-- #abizit (magic experience) cast -->
+  <effect id="508" particle="graphics/particles/magic.default.xml"/> <!-- #flar (flare dart) cast -->
+  <effect id="510" particle="graphics/particles/magic.grow-plant.xml"/> <!-- (grow plant) cast -->
+  <effect id="511" particle="graphics/particles/pentagram-burst.xml"/> <!-- (grow plant) spawn -->
+  <effect id="512" particle="graphics/particles/magic.white.xml"/> <!-- #lum (lesser heal) cast -->
+  <effect id="513" particle="graphics/particles/magic.white.xml"/> <!-- #lum (lesser heal) hit -->
+  <effect id="514" particle="graphics/particles/magic.black.xml"/> <!-- #chiza (magic blade) cast -->
+  <effect id="516" particle="graphics/particles/magic.red.xml"/> <!-- #gole (make sulphur) cast -->
+  <effect id="517" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalmurk (summon maggot) cast -->
+  <effect id="518" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalmurk (summon maggot) spawn -->
+  <effect id="519" particle="graphics/particles/magic.red.xml"/> <!-- #parum (transmute wood) cast -->
+  <effect id="520" particle="graphics/particles/magic.black.xml"/> <!-- #frillyar (arrow hail) cast -->
+  <effect id="521" particle="graphics/particles/magic.blue.xml"/> <!-- #asorm (astral barrier) cast -->
+  <effect id="522" particle="graphics/particles/magic.default.xml"/> <!-- #asorm (astral barrier) hit -->
+  <effect id="523" particle="graphics/particles/magic.default.xml"/> <!-- #asorm (astral barrier) end -->
+  <effect id="524" particle="graphics/particles/magic.generic.xml"/> <!-- #inwilt (detect player) cast -->
+  <effect id="525" particle="graphics/particles/magic.generic.xml"/> <!-- #manpahil (enchant lifestone) cast -->
+  <effect id="526" particle="graphics/particles/magic.green.xml"/> <!-- #plugh (flying backpack) cast -->
+  <effect id="527" particle="graphics/particles/magic.generic.xml"/> <!-- #plugh (flying backpack) hit -->
+  <effect id="528" particle="graphics/particles/magic.generic.xml"/> <!-- #plugh (flying backpack) end -->
+  <effect id="529" particle="graphics/particles/magic.green.xml"/> <!-- #joyplim (happy curse) cast -->
+  <effect id="530" particle="graphics/particles/magic.blue.xml"/> <!-- #anwiltyp (hide) cast -->
+  <effect id="531" particle="graphics/particles/magic.default.xml"/> <!-- #anwiltyp (hide) hit -->
+  <effect id="532" particle="graphics/particles/magic.generic.xml"/> <!-- #anwiltyp (hide) end -->
+  <effect id="533" particle="graphics/particles/magic.white.xml"/> <!-- #inma (lay on hands) cast -->
+  <effect id="534" particle="graphics/particles/magic.white.xml"/> <!-- #inma (lay on hands) hit -->
+  <effect id="535" particle="graphics/particles/magic.black.xml"/> <!-- #ingrav (lightning strike) cast -->
+  <effect id="536" particle="graphics/particles/magic.black.xml"/> <!-- #upmarmu (magic knuckles) cast -->
+  <effect id="537" particle="graphics/particles/magic.red.xml"/> <!-- #kularzufrill (make arrows) cast -->
+  <effect id="538" particle="graphics/particles/magic.red.xml"/> <!-- #zukminbirf (make iron powder) cast -->
+  <effect id="539" particle="graphics/particles/magic.red.xml"/> <!-- (make shirt/short tanktop/tanktop) cast -->
+  <effect id="540" particle="graphics/particles/magic.green.xml"/> <!-- #betsanc (protect) cast -->
+  <effect id="541" particle="graphics/particles/magic.green.xml"/> <!-- #kaflosh (rain) cast -->
+  <effect id="542" particle="graphics/particles/magic.green.xml"/> <!-- #chipchip (shear) cast -->
+  <effect id="543" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalakarenk (summon fluffy) cast -->
+  <effect id="544" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalakarenk (summon fluffy) spawn -->
+  <effect id="545" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalboo (summon mouboo) cast -->
+  <effect id="546" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalboo (summon mouboo) spawn -->
+  <effect id="547" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalgina (summon pinky) cast -->
+  <effect id="548" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalgina (summon pinky) spawn -->
+  <effect id="549" particle="graphics/particles/magic.dark-summon.xml"/> <!-- #halhiss (summon snake) cast -->
+  <effect id="550" particle="graphics/particles/pentagram-burst.xml"/> <!-- #halhiss (summon snake) spawn -->
+  <effect id="551" particle="graphics/particles/magic.astral-summon.xml"/> <!-- #kalrenk (summon spiky shroom) cast -->
+  <effect id="552" particle="graphics/particles/pentagram-burst.xml"/> <!-- #kalrenk (summon spiky shroom) spawn -->
+  <effect id="553" particle="graphics/particles/magic.dark-summon.xml"/> <!-- #helorp (summon wicked shroom) cast -->
+  <effect id="554" particle="graphics/particles/pentagram-burst.xml"/> <!-- #helorp (summon wicked shroom) spawn -->
+  <effect id="555" particle="graphics/particles/magic.darkred.xml"/> <!-- #phlex (toxic dart) cast -->
 </being-effects>
diff --git a/graphics/particles/magic.astral-summon.xml b/graphics/particles/magic.astral-summon.xml
new file mode 100644
index 00000000..d4151600
--- /dev/null
+++ b/graphics/particles/magic.astral-summon.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="0" lifetime="1">
+    <emitter>
+      <animation imageset="graphics/particles/sparkle.png|W:#0000e0,7080ff" 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="30" max="60"/>
+      <property name="output" min="6" max="20"/>
+      <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>
+    <emitter>
+      <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="60"/>
+      <property name="lifetime" value="1"/>
+      <property name="output" value="150"/>
+      <emitter>
+        <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+        <property name="lifetime" value="77"/>
+        <property name="fade-in" value="57"/>
+        <property name="fade-out" value="20"/>
+        <property name="output" value="1"/>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="57"/>
+      <property name="position-y" value="-35"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="180"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="-57"/>
+      <property name="position-y" value="-35"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="36"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="35"/>
+      <property name="position-y" value="33"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="252"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-y" value="-76"/>
+      <property name="position-x" value="0"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="108"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="-35"/>
+      <property name="position-y" value="33"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="324"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#ffffff"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/magic.dark-summon.xml b/graphics/particles/magic.dark-summon.xml
new file mode 100644
index 00000000..174d19ec
--- /dev/null
+++ b/graphics/particles/magic.dark-summon.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="0" lifetime="1">
+    <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="30" max="60"/>
+      <property name="output" min="6" max="20"/>
+      <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>
+    <emitter>
+      <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="60"/>
+      <property name="lifetime" value="1"/>
+      <property name="output" value="150"/>
+      <emitter>
+        <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+        <property name="lifetime" value="77"/>
+        <property name="fade-in" value="57"/>
+        <property name="fade-out" value="20"/>
+        <property name="output" value="1"/>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="57"/>
+      <property name="position-y" value="-35"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="180"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="-57"/>
+      <property name="position-y" value="-35"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="36"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="35"/>
+      <property name="position-y" value="33"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="252"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-y" value="-76"/>
+      <property name="position-x" value="0"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="108"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="-35"/>
+      <property name="position-y" value="33"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="324"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#000000"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/magic.grow-plant.xml b/graphics/particles/magic.grow-plant.xml
new file mode 100644
index 00000000..175c8fee
--- /dev/null
+++ b/graphics/particles/magic.grow-plant.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="0" lifetime="1">
+    <emitter>
+      <animation imageset="graphics/particles/sparkle.png|W:#b00000,ff8020" 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="30" max="60"/>
+      <property name="output" min="6" max="20"/>
+      <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>
+    <emitter>
+      <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="60"/>
+      <property name="lifetime" value="1"/>
+      <property name="output" value="150"/>
+      <emitter>
+        <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+        <property name="lifetime" value="77"/>
+        <property name="fade-in" value="57"/>
+        <property name="fade-out" value="20"/>
+        <property name="output" value="1"/>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="57"/>
+      <property name="position-y" value="-35"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="180"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="-57"/>
+      <property name="position-y" value="-35"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="36"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="35"/>
+      <property name="position-y" value="33"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="252"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-y" value="-76"/>
+      <property name="position-x" value="0"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="108"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+    <emitter>
+      <property name="position-x" value="-35"/>
+      <property name="position-y" value="33"/>
+      <property name="lifetime" value="1"/>
+      <emitter>
+        <property name="horizontal-angle" value="324"/>
+        <property name="vertical-angle" min="0" max="0"/>
+        <property name="power" value="2"/>
+        <property name="lifetime" value="57"/>
+        <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+        <emitter>
+          <property name="image" value="graphics/particles/orb-small.png|W:#00a000,30ff30"/>
+          <property name="lifetime" value="20"/>
+          <property name="fade-out" value="20"/>
+          <property name="output" value="1"/>
+        </emitter>
+      </emitter>
+    </emitter>
+  </particle>
+</effect>
diff --git a/items/misc/_include.xml b/items/misc/_include.xml
index 53975c0d..dfa85400 100644
--- a/items/misc/_include.xml
+++ b/items/misc/_include.xml
@@ -12,4 +12,11 @@
   <include name="items/misc/item33_.xml"/>
   <include name="items/misc/item34_.xml"/>
   <include name="items/misc/item35_.xml"/>
+  <include name="items/misc/item1700_magicblade.xml"/>
+  <include name="items/misc/item1701_toxicdart.xml"/>
+  <include name="items/misc/item1703_wand.xml"/>
+  <include name="items/misc/item1704_flaredart.xml"/>
+  <include name="items/misc/item1705_wand_staff.xml"/>
+  <include name="items/misc/item1706_magicknuckles.xml"/>
+  <include name="items/misc/item1707_shear.xml"/>
 </items>
diff --git a/items/misc/item1700_magicblade.xml b/items/misc/item1700_magicblade.xml
new file mode 100644
index 00000000..6c55157a
--- /dev/null
+++ b/items/misc/item1700_magicblade.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="1700" name="Magic Blade" attack-action="attack" attack-range="1" missile-particle="graphics/particles/magic.darkred.xml">
+    <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+  </item>
+</items>
diff --git a/items/misc/item1701_toxicdart.xml b/items/misc/item1701_toxicdart.xml
new file mode 100644
index 00000000..1ba18381
--- /dev/null
+++ b/items/misc/item1701_toxicdart.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="1701" name="Toxic Dart" attack-action="attack_bow" attack-range="1" missile-particle="graphics/particles/arrow.particle.xml"/>
+</items>
diff --git a/items/misc/item1703_wand.xml b/items/misc/item1703_wand.xml
new file mode 100644
index 00000000..72009700
--- /dev/null
+++ b/items/misc/item1703_wand.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="1703" name="Wand" attack-action="attack" attack-range="3" missile-particle="graphics/particles/magic.red.xml">
+    <sprite gender="unisex">equipment/weapons/wand.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+  </item>
+</items>
diff --git a/items/misc/item1704_flaredart.xml b/items/misc/item1704_flaredart.xml
new file mode 100644
index 00000000..e60fb9a6
--- /dev/null
+++ b/items/misc/item1704_flaredart.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="1704" name="Flare Dart" attack-action="attack_bow" attack-range="1" missile-particle="graphics/particles/arrow.particle.xml"/>
+</items>
diff --git a/items/misc/item1705_wand_staff.xml b/items/misc/item1705_wand_staff.xml
new file mode 100644
index 00000000..3c85661a
--- /dev/null
+++ b/items/misc/item1705_wand_staff.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="1705" name="Wand" attack-action="attack" attack-range="3" missile-particle="graphics/particles/magic.red.xml">
+    <sprite gender="unisex">equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+    <sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+  </item>
+</items>
diff --git a/items/misc/item1706_magicknuckles.xml b/items/misc/item1706_magicknuckles.xml
new file mode 100644
index 00000000..df019e4e
--- /dev/null
+++ b/items/misc/item1706_magicknuckles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="1706" name="Magic Knuckles" attack-action="attack" attack-range="1" missile-particle="graphics/particles/crit.particle.xml">
+    <sprite gender="unisex">equipment/hands/bromenalgloves.xml</sprite>
+    <sprite gender="female">equipment/hands/bromenalgloves-female.xml</sprite>
+  </item>
+</items>
diff --git a/items/misc/item1707_shear.xml b/items/misc/item1707_shear.xml
new file mode 100644
index 00000000..bb48b004
--- /dev/null
+++ b/items/misc/item1707_shear.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="1707" name="Shears" attack-action="attack" attack-range="1" missile-particle="graphics/particles/magic.blue.xml">
+    <sprite>equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+  </item>
+</items>
diff --git a/skills.xml b/skills.xml
index ab2ec015..3cf669f7 100644
--- a/skills.xml
+++ b/skills.xml
@@ -21,18 +21,39 @@
     <!-- e.g. without level 2 in Life Magic they can't cast level 2 spells of that school. -->
     <skill id="340" name="Magic" level="1" icon="graphics/skills/magic/basic.png" description="Cast Lvl 1 magic spells."/>
     <skill id="340" name="Magic" level="2" icon="graphics/skills/magic/basic.png" description="Cast Lvl 2 magic spells."/>
+    <skill id="340" name="Magic" level="3" icon="graphics/skills/magic/basic.png" description="Cast Lvl 3 magic spells."/>
+    <skill id="340" name="Magic" level="4" icon="graphics/skills/magic/basic.png" description="Cast Lvl 4 magic spells."/>
+    <skill id="340" name="Magic" level="5" icon="graphics/skills/magic/basic.png" description="Cast Lvl 5 magic spells."/>
     <skill id="341" name="Life Magic" level="1" icon="graphics/skills/magic/life.png" description="Cast Lvl 1 Life Magic spells."/>
     <skill id="341" name="Life Magic" level="2" icon="graphics/skills/magic/life.png" description="Cast Lvl 2 Life Magic spells."/>
+    <skill id="341" name="Life Magic" level="3" icon="graphics/skills/magic/life.png" description="Cast Lvl 3 Life Magic spells."/>
+    <skill id="341" name="Life Magic" level="4" icon="graphics/skills/magic/life.png" description="Cast Lvl 4 Life Magic spells."/>
+    <skill id="341" name="Life Magic" level="5" icon="graphics/skills/magic/life.png" description="Cast Lvl 5 Life Magic spells."/>
     <skill id="342" name="War Magic" level="1" icon="graphics/skills/magic/war.png" description="Cast Lvl 1 War Magic spells."/>
     <skill id="342" name="War Magic" level="2" icon="graphics/skills/magic/war.png" description="Cast Lvl 2 War Magic spells."/>
+    <skill id="342" name="War Magic" level="3" icon="graphics/skills/magic/war.png" description="Cast Lvl 3 War Magic spells."/>
+    <skill id="342" name="War Magic" level="4" icon="graphics/skills/magic/war.png" description="Cast Lvl 4 War Magic spells."/>
+    <skill id="342" name="War Magic" level="5" icon="graphics/skills/magic/war.png" description="Cast Lvl 5 War Magic spells."/>
     <skill id="343" name="Transmutation Magic" level="1" icon="graphics/skills/magic/transmutation.png" description="Cast Lvl 1 Transmut. Magic spells."/>
     <skill id="343" name="Transmutation Magic" level="2" icon="graphics/skills/magic/transmutation.png" description="Cast Lvl 2 Transmut. Magic spells."/>
+    <skill id="343" name="Transmutation Magic" level="3" icon="graphics/skills/magic/transmutation.png" description="Cast Lvl 3 Transmut. Magic spells."/>
+    <skill id="343" name="Transmutation Magic" level="4" icon="graphics/skills/magic/transmutation.png" description="Cast Lvl 4 Transmut. Magic spells."/>
+    <skill id="343" name="Transmutation Magic" level="5" icon="graphics/skills/magic/transmutation.png" description="Cast Lvl 5 Transmut. Magic spells."/>
     <skill id="344" name="Nature Magic" level="1" icon="graphics/skills/magic/nature.png" description="Cast Lvl 1 Nature Magic spells."/>
     <skill id="344" name="Nature Magic" level="2" icon="graphics/skills/magic/nature.png" description="Cast Lvl 2 Nature Magic spells."/>
+    <skill id="344" name="Nature Magic" level="3" icon="graphics/skills/magic/nature.png" description="Cast Lvl 3 Nature Magic spells."/>
+    <skill id="344" name="Nature Magic" level="4" icon="graphics/skills/magic/nature.png" description="Cast Lvl 4 Nature Magic spells."/>
+    <skill id="344" name="Nature Magic" level="5" icon="graphics/skills/magic/nature.png" description="Cast Lvl 5 Nature Magic spells."/>
     <skill id="345" name="Astral Magic" level="1" icon="graphics/skills/magic/astral.png" description="Cast Lvl 1 Astral Magic spells."/>
     <skill id="345" name="Astral Magic" level="2" icon="graphics/skills/magic/astral.png" description="Cast Lvl 2 Astral Magic spells."/>
+    <skill id="345" name="Astral Magic" level="3" icon="graphics/skills/magic/astral.png" description="Cast Lvl 3 Astral Magic spells."/>
+    <skill id="345" name="Astral Magic" level="4" icon="graphics/skills/magic/astral.png" description="Cast Lvl 4 Astral Magic spells."/>
+    <skill id="345" name="Astral Magic" level="5" icon="graphics/skills/magic/astral.png" description="Cast Lvl 5 Astral Magic spells."/>
     <skill id="346" name="Dark Magic" level="1" icon="graphics/skills/magic/dark.png" description="Cast Lvl 1 Dark Magic spells."/>
     <skill id="346" name="Dark Magic" level="2" icon="graphics/skills/magic/dark.png" description="Cast Lvl 2 Dark Magic spells."/>
+    <skill id="346" name="Dark Magic" level="3" icon="graphics/skills/magic/dark.png" description="Cast Lvl 3 Dark Magic spells."/>
+    <skill id="346" name="Dark Magic" level="4" icon="graphics/skills/magic/dark.png" description="Cast Lvl 4 Dark Magic spells."/>
+    <skill id="346" name="Dark Magic" level="5" icon="graphics/skills/magic/dark.png" description="Cast Lvl 5 Dark Magic spells."/>
   </set>
   <set name="Focus">
     <skill id="339" name="Focusing" icon="graphics/skills/focus/focus.png" description="Luca can activate one Focus Skill."/>
diff --git a/weapons.xml b/weapons.xml
index 5399bf9d..26b67c9e 100644
--- a/weapons.xml
+++ b/weapons.xml
@@ -10,6 +10,11 @@
     <item id="758"/>
     <item id="867"/>
     <item id="1201"/>
+    <item id="1700"/>
+    <item id="1703"/>
+    <item id="1705"/>
+    <item id="1706"/>
+    <item id="1707"/>
   </swords>
   <bows>
     <item id="545"/>
@@ -17,6 +22,8 @@
     <item id="878"/>
     <item id="903"/>
     <item id="1200"/>
+    <item id="1701"/>
+    <item id="1704"/>
   </bows>
   <shields>
     <item id="601"/>