Merge branch 'github/fork/Ledmitz/magic_sfx_n_particles' into 'master'

Full magic SFX set, dart animation for flar/phlex, custom ingrav part…

See merge request legacy/clientdata!402

48 files changed, 325 insertions, 76 deletions

diff --git a/effects.xml b/effects.xml
index 01e00cf0..461d3617 100644
--- a/effects.xml
+++ b/effects.xml
@@ -39,41 +39,39 @@
   <!-- dark -->
   <effect id="8" particle="graphics/particles/magic.darkred.xml"/>
   <effect id="10" particle="graphics/particles/magic.default.xml"/>
-  <!-- #betsanc (protect) hit -->
-  <effect id="11" particle="graphics/particles/magic.shield.xml"/>
+  <!-- #betsanc (protect) hit | XML animation looks reversed, so end animation has on SFX -->
+  <effect id="11" audio="magic/betsanc-on.ogg" particle="graphics/particles/magic.shield-ends.xml"/>
   <!--  <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" audio="env/flame.ogg" particle="graphics/particles/fire-burst.xml"/>
   <effect id="16" audio="env/flame.ogg" particle="graphics/particles/fire-explosion.xml"/>
   <!-- #ingrav (lightning strike) hit -->
-  <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"/>
-  <effect id="20" particle="graphics/particles/magic.teleport.xml"/>
+  <effect id="17" audio="magic/ingrav1.ogg" particle="graphics/particles/lightning1.xml"/>
+  <effect id="18" audio="magic/ingrav2.ogg" particle="graphics/particles/lightning2.xml"/>
+  <effect id="19" audio="magic/ingrav3.ogg" particle="graphics/particles/lightning3.xml"/>
+  <effect id="20" audio="system/warp.ogg" 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="24" audio="system/warp.ogg" particle="graphics/particles/magic.teleport.xml"/>
   <!-- #kaflosh (rain) hit -->
   <effect id="25" particle="graphics/particles/rain.xml" audio="magic/kaflosh.ogg"/>
   <effect id="26" particle="graphics/particles/hit.particle.xml"/>
   <!-- #frillyar (arrow hail) hit -->
-  <effect id="27" particle="graphics/particles/arrow-hail.xml"/>
+  <effect id="27" audio="magic/frillyar.ogg" particle="graphics/particles/arrow-hail.xml"/>
   <effect id="28" audio="system/crit.ogg" particle="graphics/particles/crit.particle.xml"/>
   <effect id="30" audio="system/boom.ogg" particle="graphics/particles/large-explosion.xml"/>
   <effect id="31" audio="system/crit.ogg" particle="graphics/particles/medium-explosion.xml"/>
   <effect id="32" particle="graphics/particles/medium-smoke.xml"/>
   <!-- Illia quest effects -->
-  <effect id="33" particle="graphics/particles/medium-blindinglight.xml"/>
+  <effect id="33" audio="magic/spawn_burst.ogg" particle="graphics/particles/medium-blindinglight.xml"/>
   <effect id="34" particle="graphics/particles/channelling-raise.particle.xml"/>
   <effect id="35" particle="graphics/particles/channelling-cast.particle.xml"/>
   <effect id="36" particle="graphics/particles/enchanted-door-broken.particle.xml"/>
   <effect id="37" particle="graphics/particles/dark-teleport.particle.xml"/>
-  <effect id="38" particle="graphics/particles/evil-summon.particle.xml"/>
-  <effect id="39" particle="graphics/particles/ground-spawn.particle.xml"/>
+  <effect id="38" audio="magic/astral.ogg" particle="graphics/particles/evil-summon.particle.xml"/>
+  <effect id="39" audio="magic/spawn_burst.ogg" particle="graphics/particles/ground-spawn.particle.xml"/>
   <effect id="40" particle="graphics/particles/blue-magic-cast.particle.xml"/>
   <effect id="41" particle="graphics/particles/magic-blue-teleport.particle.xml"/>
   <effect id="42" particle="graphics/particles/magic-dark-explosion.particle.xml"/>
@@ -92,7 +90,7 @@
   <effect id="55" particle="graphics/particles/snowball-crit.particle.xml"/>
   <effect id="69" particle="graphics/particles/python.xml" audio="env/fart.ogg"/>
   <!-- #betsanc (protect) end -->
-  <effect id="111" particle="graphics/particles/magic.shield-ends.xml"/>
+  <effect id="111" audio="magic/betsanc-off.ogg" particle="graphics/particles/magic.shield.xml"/>
   <!-- <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"/>
@@ -110,111 +108,111 @@
   <effect id="403" audio="monsters/bat/bat-hit1.ogg"/>
   <!-- magic v3 spells -->
   <!-- #discharge -->
-  <effect id="500" particle="graphics/particles/fire-burst.xml"/>
+  <effect id="500" audio="magic/discharge.ogg" particle="graphics/particles/fire-burst.xml"/>
   <!-- #confringo (wand) cast -->
-  <effect id="501" particle="graphics/particles/magic.generic.xml"/>
+  <effect id="501" audio="magic/generic.ogg" particle="graphics/particles/magic.generic.xml"/>
   <!-- #itenplz (aggravate) cast -->
-  <effect id="503" particle="graphics/particles/magic.green.xml"/>
+  <effect id="503" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/>
   <!-- #itenplz (aggravate) hit -->
-  <effect id="504" particle="graphics/particles/magic.default.xml"/>
+  <effect id="504" audio="magic/itenplz-hit.ogg" particle="graphics/particles/magic.default.xml"/>
   <!-- #miteyo (detect magic) cast -->
-  <effect id="505" particle="graphics/particles/magic.generic.xml"/>
+  <effect id="505" audio="magic/generic.ogg" particle="graphics/particles/magic.generic.xml"/>
   <!-- #miteyo (detect magic) hit -->
-  <effect id="506" particle="graphics/particles/magic.default.xml"/>
+  <effect id="506" audio="magic/detect_magic.ogg" particle="graphics/particles/magic.default.xml"/>
   <!-- #abizit (magic experience) cast -->
-  <effect id="507" particle="graphics/particles/magic.default.xml"/>
+  <effect id="507" audio="magic/default_magic.ogg" particle="graphics/particles/magic.default.xml"/>
   <!-- #flar (flare dart) cast -->
-  <effect id="508" particle="graphics/particles/magic.default.xml"/>
+  <effect id="508" audio="magic/war.ogg" particle="graphics/particles/magic.default.xml"/>
   <!-- (grow plant) cast -->
-  <effect id="510" particle="graphics/particles/magic.grow-plant.xml"/>
+  <effect id="510" audio="magic/nature.ogg" particle="graphics/particles/magic.grow-plant.xml"/>
   <!-- (grow plant) spawn -->
-  <effect id="511" particle="graphics/particles/pentagram-burst.xml"/>
+  <effect id="511" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/>
   <!-- #lum (lesser heal) cast -->
   <effect id="512" particle="graphics/particles/magic.white.xml"/>
   <!-- #lum (lesser heal) hit -->
-  <effect id="513" particle="graphics/particles/magic.white.xml"/>
+  <effect id="513" audio="magic/inma.ogg" particle="graphics/particles/magic.white.xml"/>
   <!-- #chiza (magic blade) cast -->
-  <effect id="514" particle="graphics/particles/magic.black.xml"/>
+  <effect id="514" audio="magic/war.ogg" particle="graphics/particles/magic.black.xml"/>
   <!-- #gole (make sulphur) cast -->
-  <effect id="516" particle="graphics/particles/magic.red.xml"/>
+  <effect id="516" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/>
   <!-- #kalmurk (summon maggot) cast -->
-  <effect id="517" particle="graphics/particles/magic.astral-summon.xml"/>
+  <effect id="517" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/>
   <!-- #kalmurk (summon maggot) spawn -->
-  <effect id="518" particle="graphics/particles/pentagram-burst.xml"/>
+  <effect id="518" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/>
   <!-- #parum (transmute wood) cast -->
-  <effect id="519" particle="graphics/particles/magic.red.xml"/>
+  <effect id="519" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/>
   <!-- #frillyar (arrow hail) cast -->
-  <effect id="520" particle="graphics/particles/magic.black.xml"/>
+  <effect id="520" audio="magic/war.ogg" particle="graphics/particles/magic.black.xml"/>
   <!-- #asorm (astral barrier) cast -->
-  <effect id="521" particle="graphics/particles/magic.blue.xml"/>
+  <effect id="521" audio="magic/astral.ogg" particle="graphics/particles/magic.blue.xml"/>
   <!-- #asorm (astral barrier) hit -->
-  <effect id="522" particle="graphics/particles/magic.default.xml"/>
+  <effect id="522" audio="magic/default_magic.ogg" particle="graphics/particles/magic.default.xml"/>
   <!-- #asorm (astral barrier) end -->
-  <effect id="523" particle="graphics/particles/magic.default.xml"/>
+  <effect id="523" audio="magic/default_magic.ogg" particle="graphics/particles/magic.default.xml"/>
   <!-- #inwilt (detect player) cast -->
-  <effect id="524" particle="graphics/particles/magic.generic.xml"/>
+  <effect id="524" audio="magic/generic.ogg" particle="graphics/particles/magic.generic.xml"/>
   <!-- #manpahil (enchant lifestone) cast -->
-  <effect id="525" particle="graphics/particles/magic.generic.xml"/>
+  <effect id="525" audio="magic/generic.ogg" particle="graphics/particles/magic.generic.xml"/>
   <!-- #plugh (flying backpack) cast -->
-  <effect id="526" particle="graphics/particles/magic.green.xml"/>
+  <effect id="526" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/>
   <!-- #plugh (flying backpack) hit -->
-  <effect id="527" particle="graphics/particles/magic.generic.xml"/>
+  <effect id="527" audio="magic/nature.ogg" particle="graphics/particles/magic.generic.xml"/>
   <!-- #plugh (flying backpack) end -->
-  <effect id="528" particle="graphics/particles/magic.generic.xml"/>
+  <effect id="528" audio="magic/nature.ogg" particle="graphics/particles/magic.generic.xml"/>
   <!-- #joyplim (happy curse) cast -->
-  <effect id="529" particle="graphics/particles/magic.green.xml"/>
+  <effect id="529" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/>
   <!-- #anwiltyp (hide) cast -->
-  <effect id="530" particle="graphics/particles/magic.blue.xml"/>
+  <effect id="530" audio="magic/astral.ogg" particle="graphics/particles/magic.blue.xml"/>
   <!-- #anwiltyp (hide) hit -->
-  <effect id="531" particle="graphics/particles/magic.default.xml"/>
+  <effect id="531" audio="magic/default_magic.ogg" particle="graphics/particles/magic.default.xml"/>
   <!-- #anwiltyp (hide) end -->
-  <effect id="532" particle="graphics/particles/magic.generic.xml"/>
+  <effect id="532" audio="magic/default_magic.ogg" particle="graphics/particles/magic.generic.xml"/>
   <!-- #inma (lay on hands) cast -->
   <effect id="533" particle="graphics/particles/magic.white.xml"/>
   <!-- #inma (lay on hands) hit -->
-  <effect id="534" particle="graphics/particles/magic.white.xml"/>
+  <effect id="534" audio="magic/inma.ogg" particle="graphics/particles/magic.white.xml"/>
   <!-- #ingrav (lightning strike) cast -->
-  <effect id="535" particle="graphics/particles/magic.black.xml"/>
+  <effect id="535" audio="magic/war.ogg" particle="graphics/particles/magic.black.xml"/>
   <!-- #upmarmu (magic knuckles) cast -->
-  <effect id="536" particle="graphics/particles/magic.black.xml"/>
+  <effect id="536" audio="magic/war.ogg" particle="graphics/particles/magic.black.xml"/>
   <!-- #kularzufrill (make arrows) cast -->
-  <effect id="537" particle="graphics/particles/magic.red.xml"/>
+  <effect id="537" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/>
   <!-- #zukminbirf (make iron powder) cast -->
-  <effect id="538" particle="graphics/particles/magic.red.xml"/>
+  <effect id="538" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/>
   <!-- (make shirt/short tanktop/tanktop) cast -->
-  <effect id="539" particle="graphics/particles/magic.red.xml"/>
+  <effect id="539" audio="magic/transmute.ogg" particle="graphics/particles/magic.red.xml"/>
   <!-- #betsanc (protect) cast -->
-  <effect id="540" particle="graphics/particles/magic.green.xml"/>
+  <effect id="540" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/>
   <!-- #kaflosh (rain) cast -->
-  <effect id="541" particle="graphics/particles/magic.green.xml"/>
+  <effect id="541" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/>
   <!-- #chipchip (shear) cast -->
-  <effect id="542" particle="graphics/particles/magic.green.xml"/>
+  <effect id="542" audio="magic/nature.ogg" particle="graphics/particles/magic.green.xml"/>
   <!-- #kalakarenk (summon fluffy) cast -->
-  <effect id="543" particle="graphics/particles/magic.astral-summon.xml"/>
+  <effect id="543" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/>
   <!-- #kalakarenk (summon fluffy) spawn -->
-  <effect id="544" particle="graphics/particles/pentagram-burst.xml"/>
+  <effect id="544" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/>
   <!-- #kalboo (summon mouboo) cast -->
-  <effect id="545" particle="graphics/particles/magic.astral-summon.xml"/>
+  <effect id="545" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/>
   <!-- #kalboo (summon mouboo) spawn -->
-  <effect id="546" particle="graphics/particles/pentagram-burst.xml"/>
+  <effect id="546" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/>
   <!-- #kalgina (summon pinky) cast -->
-  <effect id="547" particle="graphics/particles/magic.astral-summon.xml"/>
+  <effect id="547" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/>
   <!-- #kalgina (summon pinky) spawn -->
-  <effect id="548" particle="graphics/particles/pentagram-burst.xml"/>
+  <effect id="548" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/>
   <!-- #halhiss (summon snake) cast -->
-  <effect id="549" particle="graphics/particles/magic.dark-summon.xml"/>
+  <effect id="549" audio="magic/astral.ogg" particle="graphics/particles/magic.dark-summon.xml"/>
   <!-- #halhiss (summon snake) spawn -->
-  <effect id="550" particle="graphics/particles/pentagram-burst.xml"/>
+  <effect id="550" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/>
   <!-- #kalrenk (summon spiky shroom) cast -->
-  <effect id="551" particle="graphics/particles/magic.astral-summon.xml"/>
+  <effect id="551" audio="magic/astral.ogg" particle="graphics/particles/magic.astral-summon.xml"/>
   <!-- #kalrenk (summon spiky shroom) spawn -->
-  <effect id="552" particle="graphics/particles/pentagram-burst.xml"/>
+  <effect id="552" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/>
   <!-- #helorp (summon wicked shroom) cast -->
-  <effect id="553" particle="graphics/particles/magic.dark-summon.xml"/>
+  <effect id="553" audio="magic/astral.ogg" particle="graphics/particles/magic.dark-summon.xml"/>
   <!-- #helorp (summon wicked shroom) spawn -->
-  <effect id="554" particle="graphics/particles/pentagram-burst.xml"/>
+  <effect id="554" audio="magic/spawn_burst.ogg" particle="graphics/particles/pentagram-burst.xml"/>
   <!-- #phlex (toxic dart) cast -->
-  <effect id="555" particle="graphics/particles/magic.darkred.xml"/>
+  <effect id="555" audio="magic/astral.ogg" particle="graphics/particles/magic.darkred.xml"/>
   <!-- Temporary -->
   <effect id="907" particle="graphics/sprites/npcs/halifax.xml"/>
 </being-effects>
diff --git a/graphics/particles/dart.particle.xml b/graphics/particles/dart.particle.xml
new file mode 100644
index 00000000..8b74e69c
--- /dev/null
+++ b/graphics/particles/dart.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/dart.png" width="16" height="16">
+      <sequence start="0" end="7"/>
+    </rotation>
+  </particle>
+</effect>
diff --git a/graphics/particles/dart.png b/graphics/particles/dart.png
new file mode 100644
index 00000000..afa27ca7
--- /dev/null
+++ b/graphics/particles/dart.png
diff --git a/graphics/particles/electricity.yellow.persist.xml b/graphics/particles/electricity.yellow.persist.xml
new file mode 100644
index 00000000..f5534f0b
--- /dev/null
+++ b/graphics/particles/electricity.yellow.persist.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="0" lifetime="250">
+    <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="-1"/>
+      <property name="momentum" value="0.05"/>
+      <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15">
+        <sequence start="0" end="7" delay="20"/>
+      </animation>
+      <property name="fade-out" value="250"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/electricity.yellow.xml b/graphics/particles/electricity.yellow.xml
new file mode 100644
index 00000000..67df5739
--- /dev/null
+++ b/graphics/particles/electricity.yellow.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:#FFFF8F" 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/levelup.particle.xml b/graphics/particles/levelup.particle.xml
index 17e10f82..ccdf9044 100644
--- a/graphics/particles/levelup.particle.xml
+++ b/graphics/particles/levelup.particle.xml
@@ -3,7 +3,7 @@
 Red stars which are supposed to engulf a character
 -->
 <effect>
-  <particle position-x="0" position-y="0" position-z="0" lifetime="128">
+  <particle position-x="0" position-y="0" position-z="0" lifetime="500">
     <emitter>
       <property name="image" value="graphics/particles/star-medium.png|W:#ff0000,ffffff"/>
       <property name="vertical-angle" value="90"/>
diff --git a/graphics/particles/lightning1.xml b/graphics/particles/lightning1.xml
index 0fe869b0..39071735 100644
--- a/graphics/particles/lightning1.xml
+++ b/graphics/particles/lightning1.xml
@@ -8,9 +8,22 @@ An explosion of white particles.
       <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="lifetime" min="5" max="50"/>
       <property name="output" value="1"/>
       <property name="fade-out" value="8"/>
     </emitter>
+    <emitter>
+      <property name="lifetime" value="300"/>
+      <property name="output" min="5" max="30"/>
+      <property name="position-x" min="-32" max="32"/>
+      <property name="position-y" min="-16" max="-32"/>
+      <property name="position-z" value="-120"/>
+      <property name="gravity" value="1"/>
+      <property name="momentum" value="0.1"/>
+      <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15">
+        <sequence start="0" end="7" delay="20"/>
+      </animation>
+      <property name="fade-out" value="0"/>
+    </emitter>
   </particle>
 </effect>
diff --git a/graphics/particles/lightning2.xml b/graphics/particles/lightning2.xml
index 6f5d059d..09d20888 100644
--- a/graphics/particles/lightning2.xml
+++ b/graphics/particles/lightning2.xml
@@ -8,9 +8,22 @@ An explosion of white particles.
       <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="lifetime" min="5" max="50"/>
       <property name="output" value="1"/>
       <property name="fade-out" value="8"/>
     </emitter>
+    <emitter>
+      <property name="lifetime" value="300"/>
+      <property name="output" min="5" max="30"/>
+      <property name="position-x" min="-32" max="32"/>
+      <property name="position-y" min="-16" max="-32"/>
+      <property name="position-z" value="-120"/>
+      <property name="gravity" value="1"/>
+      <property name="momentum" value="0.1"/>
+      <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15">
+        <sequence start="0" end="7" delay="20"/>
+      </animation>
+      <property name="fade-out" value="0"/>
+    </emitter>
   </particle>
 </effect>
diff --git a/graphics/particles/lightning3.xml b/graphics/particles/lightning3.xml
index 3734f1f8..50c478a4 100644
--- a/graphics/particles/lightning3.xml
+++ b/graphics/particles/lightning3.xml
@@ -8,9 +8,22 @@ An explosion of white particles.
       <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="lifetime" min="5" max="50"/>
       <property name="output" value="1"/>
       <property name="fade-out" value="8"/>
     </emitter>
+    <emitter>
+      <property name="lifetime" value="300"/>
+      <property name="output" min="5" max="30"/>
+      <property name="position-x" min="-32" max="32"/>
+      <property name="position-y" min="-16" max="-32"/>
+      <property name="position-z" value="-120"/>
+      <property name="gravity" value="1"/>
+      <property name="momentum" value="0.1"/>
+      <animation imageset="graphics/particles/electricity.particle.png|W:#FFFF8F" width="15" height="15">
+        <sequence start="0" end="7" delay="20"/>
+      </animation>
+      <property name="fade-out" value="0"/>
+    </emitter>
   </particle>
 </effect>
diff --git a/graphics/particles/magic.black.persist.xml b/graphics/particles/magic.black.persist.xml
new file mode 100644
index 00000000..842b33b6
--- /dev/null
+++ b/graphics/particles/magic.black.persist.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="0" lifetime="3000">
+    <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.green.persist.xml b/graphics/particles/magic.green.persist.xml
new file mode 100644
index 00000000..044911a2
--- /dev/null
+++ b/graphics/particles/magic.green.persist.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<effect>
+  <particle position-x="0" position-y="0" position-z="0" lifetime="3000">
+    <emitter>
+      <animation imageset="graphics/particles/sparkle.png|W:#00a000,30ff30" 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/sprites/equipment/weapons/null.png b/graphics/sprites/equipment/weapons/null.png
new file mode 100644
index 00000000..0906ec03
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/null.png
diff --git a/graphics/sprites/equipment/weapons/null.xml b/graphics/sprites/equipment/weapons/null.xml
new file mode 100644
index 00000000..c706c02b
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/null.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<!-- For use with weapons that require no sprite. e.g. items/misc/ (magic) -->
+<sprite variants="135" variant_offset="1">
+  <imageset name="null" src="graphics/sprites/equipment/weapons/null.png|B;R" width="128" height="128"/>
+  <action name="default" imageset="null"/>
+  <action name="stand" imageset="null">
+    <animation direction="down">
+      <frame index="0" offsetY="32"/>
+    </animation>
+    <animation direction="left">
+      <frame index="0" offsetY="32"/>
+    </animation>
+    <animation direction="up">
+      <frame index="0" offsetY="32"/>
+    </animation>
+    <animation direction="right">
+      <frame index="0" offsetY="32"/>
+    </animation>
+  </action>
+  <action name="sit" imageset="null">
+    <animation direction="down">
+      <frame index="0" offsetY="32"/>
+    </animation>
+    <animation direction="left">
+      <frame index="0" offsetY="32"/>
+    </animation>
+    <animation direction="up">
+      <frame index="0" offsetY="32"/>
+    </animation>
+    <animation direction="right">
+      <frame index="0" offsetY="32"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="null">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="1" delay="75"/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="1" end="1" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="1" end="1" delay="75"/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="1" end="1" delay="75"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="null">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="1" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="1" end="1" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="1" end="1" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="1" end="1" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_chop" imageset="null">
+    <animation direction="down">
+      <sequence offsetY="32" start="1" end="1" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence offsetY="32" start="1" end="1" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence offsetY="32" start="1" end="1" delay="140"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence offsetY="32" start="1" end="1" delay="140"/>
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/items/misc/item1700_magicblade.xml b/items/misc/item1700_magicblade.xml
index 6c55157a..7d557464 100644
--- a/items/misc/item1700_magicblade.xml
+++ b/items/misc/item1700_magicblade.xml
@@ -8,5 +8,8 @@
   </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>
+    <sound event="hit">magic/chiza1.ogg</sound>
+    <sound event="hit">magic/chiza2.ogg</sound>
+    <sound event="hit">magic/chiza3.ogg</sound>
   </item>
 </items>
diff --git a/items/misc/item1701_toxicdart.xml b/items/misc/item1701_toxicdart.xml
index 1ba18381..ae581db4 100644
--- a/items/misc/item1701_toxicdart.xml
+++ b/items/misc/item1701_toxicdart.xml
@@ -6,5 +6,9 @@
     <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"/>
+  <item id="1701" name="Toxic Dart" attack-action="attack_bow" attack-range="1" missile-particle="graphics/particles/dart.particle.xml"/>
+    <sprite>equipment/weapons/null.xml</sprite>
+    <sound event="hit">magic/flar1.ogg</sound>
+    <sound event="hit">magic/flar2.ogg</sound>
+    <sound event="hit">magic/flar3.ogg</sound>
 </items>
diff --git a/items/misc/item1703_wand.xml b/items/misc/item1703_wand.xml
index 72009700..4d9eb9dc 100644
--- a/items/misc/item1703_wand.xml
+++ b/items/misc/item1703_wand.xml
@@ -6,8 +6,11 @@
     <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">
+  <item id="1703" name="Wand" attack-action="attack" attack-range="3" missile-particle="graphics/particles/magic.hit.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>
+    <sound event="hit">magic/confringo1.ogg</sound>
+    <sound event="hit">magic/confringo2.ogg</sound>
+    <sound event="hit">magic/confringo3.ogg</sound>
   </item>
 </items>
diff --git a/items/misc/item1704_flaredart.xml b/items/misc/item1704_flaredart.xml
index e60fb9a6..2aa9fd17 100644
--- a/items/misc/item1704_flaredart.xml
+++ b/items/misc/item1704_flaredart.xml
@@ -6,5 +6,10 @@
     <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"/>
+  <item id="1704" name="Flare Dart" attack-action="attack_bow" attack-range="1" missile-particle="graphics/particles/dart.particle.xml">
+    <sprite>equipment/weapons/null.xml</sprite>
+    <sound event="hit">magic/flar1.ogg</sound>
+    <sound event="hit">magic/flar2.ogg</sound>
+    <sound event="hit">magic/flar3.ogg</sound>
+  </item>
 </items>
diff --git a/items/misc/item1705_wand_staff.xml b/items/misc/item1705_wand_staff.xml
index 3c85661a..33e0c94b 100644
--- a/items/misc/item1705_wand_staff.xml
+++ b/items/misc/item1705_wand_staff.xml
@@ -6,8 +6,11 @@
     <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">
+  <item id="1705" name="Wand" attack-action="attack" attack-range="3" missile-particle="graphics/particles/magic.hit.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>
+    <sound event="hit">magic/confringo1.ogg</sound>
+    <sound event="hit">magic/confringo2.ogg</sound>
+    <sound event="hit">magic/confringo3.ogg</sound>
   </item>
 </items>
diff --git a/items/misc/item1706_magicknuckles.xml b/items/misc/item1706_magicknuckles.xml
index df019e4e..1cf8db99 100644
--- a/items/misc/item1706_magicknuckles.xml
+++ b/items/misc/item1706_magicknuckles.xml
@@ -6,8 +6,10 @@
     <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 id="1706" name="Magic Knuckles" attack-action="attack" attack-range="1">
+    <!-- <sprite gender="unisex">equipment/hands/bromenalgloves.xml</sprite> -->
+    <!-- <sprite gender="female">equipment/hands/bromenalgloves-female.xml</sprite> -->
+    <sprite>equipment/weapons/null.xml</sprite>
+    <sound event="hit">punch.ogg</sound>
   </item>
 </items>
diff --git a/items/misc/item1707_shear.xml b/items/misc/item1707_shear.xml
index bb48b004..f797369b 100644
--- a/items/misc/item1707_shear.xml
+++ b/items/misc/item1707_shear.xml
@@ -8,5 +8,6 @@
   </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>
+    <sound event="hit">monsters/scorpion/scorpion-hit1.ogg</sound>
   </item>
 </items>
diff --git a/license.md b/license.md
index d0f2fdf7..1e453f0c 100644
--- a/license.md
+++ b/license.md
@@ -594,6 +594,7 @@ File | Artists | Licenses
 `graphics/particles/bubble_12px.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/bubble_32px.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/casket-trap_96x96.png` | Skipy | GPLv2
+`graphics/particles/dart.png` | Ledmitz | GPLv2, CC BY-SA 3.0
 `graphics/particles/fog-medium-a.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/fog-medium-b.png` | Crush | GPLv2, CC BY-SA 3.0
 `graphics/particles/fog-medium-c.png` | Crush | GPLv2, CC BY-SA 3.0
@@ -676,6 +677,7 @@ File | Artists | Licenses
 `graphics/sprites/equipment/weapons/axe-stab.png` | :grey_question:, Wombat, Wushin, Varuna | GPLv2
 `graphics/sprites/equipment/weapons/bow-banshee.png` | V0id | GPLv2
 `graphics/sprites/equipment/weapons/bow-slingshot.png` | Chef Chelios, wushin | GPLv2
+`graphics/sprites/equipment/weapons/null.png` | Ledmitz | CC0
 `graphics/sprites/equipment/weapons/polearm-blunt.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/polearm-chop.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/polearm-spear.png` | :grey_question:, Wombat, Wushin | GPLv2
@@ -1155,7 +1157,34 @@ File | Artists | Licenses
 `sfx/env/env-waterfall1.ogg` | Dariuna | GPLv2
 `sfx/env/fart.ogg` | unknown | CC0
 `sfx/env/flame.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/astral.ogg' | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/betsanc-on.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/betsanc-off.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/chiza1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/chiza2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/chiza3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/confringo1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/confringo2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/confringo3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/default_magic.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/detect_magic.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/discharge.ogg` | Ledmitz (Plunger pop -12.wav / Quistard / CC BY 3.0) | GPLv2, CC BY-SA 3.0
+`sfx/magic/flar1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/flar2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/flar3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/frillyar.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
+`sfx/magic/generic.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / CC BY 3.0) | GPLv2, CC BY-SA 3.0
+`sfx/magic/ingrav1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/ingrav2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/ingrav3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/inma.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/itenplz-hit.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/magic/kaflosh.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/nature.ogg` | Ledmitz (nord_analog_howling_wind_storm.wav / medialint / Sampling Plus 1.0) | GPLv2, CC BY-SA 3.0
+`sfx/magic/spawn_burst.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/transmute.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/war.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/magic/warp.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
 `sfx/monsters/bat/bat-dying1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/bat/bat-hit1.ogg` | Cosmostrator | GPLv2
 `sfx/monsters/bee/bee-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
diff --git a/sfx/magic/astral.ogg b/sfx/magic/astral.ogg
new file mode 100644
index 00000000..2f9c8a00
--- /dev/null
+++ b/sfx/magic/astral.ogg
diff --git a/sfx/magic/betsanc-off.ogg b/sfx/magic/betsanc-off.ogg
new file mode 100644
index 00000000..d8511d05
--- /dev/null
+++ b/sfx/magic/betsanc-off.ogg
diff --git a/sfx/magic/betsanc-on.ogg b/sfx/magic/betsanc-on.ogg
new file mode 100644
index 00000000..63c12b33
--- /dev/null
+++ b/sfx/magic/betsanc-on.ogg
diff --git a/sfx/magic/chiza1.ogg b/sfx/magic/chiza1.ogg
new file mode 100644
index 00000000..e8a7a254
--- /dev/null
+++ b/sfx/magic/chiza1.ogg
diff --git a/sfx/magic/chiza2.ogg b/sfx/magic/chiza2.ogg
new file mode 100644
index 00000000..6cef4b67
--- /dev/null
+++ b/sfx/magic/chiza2.ogg
diff --git a/sfx/magic/chiza3.ogg b/sfx/magic/chiza3.ogg
new file mode 100644
index 00000000..0db8a02d
--- /dev/null
+++ b/sfx/magic/chiza3.ogg
diff --git a/sfx/magic/confringo1.ogg b/sfx/magic/confringo1.ogg
new file mode 100644
index 00000000..ec918dff
--- /dev/null
+++ b/sfx/magic/confringo1.ogg
diff --git a/sfx/magic/confringo2.ogg b/sfx/magic/confringo2.ogg
new file mode 100644
index 00000000..4053fb19
--- /dev/null
+++ b/sfx/magic/confringo2.ogg
diff --git a/sfx/magic/confringo3.ogg b/sfx/magic/confringo3.ogg
new file mode 100644
index 00000000..270e649d
--- /dev/null
+++ b/sfx/magic/confringo3.ogg
diff --git a/sfx/magic/default_magic.ogg b/sfx/magic/default_magic.ogg
new file mode 100644
index 00000000..96e0d01a
--- /dev/null
+++ b/sfx/magic/default_magic.ogg
diff --git a/sfx/magic/detect_magic.ogg b/sfx/magic/detect_magic.ogg
new file mode 100644
index 00000000..2fbbb7ca
--- /dev/null
+++ b/sfx/magic/detect_magic.ogg
diff --git a/sfx/magic/discharge.ogg b/sfx/magic/discharge.ogg
new file mode 100644
index 00000000..266008de
--- /dev/null
+++ b/sfx/magic/discharge.ogg
diff --git a/sfx/magic/flar1.ogg b/sfx/magic/flar1.ogg
new file mode 100644
index 00000000..1d01ff02
--- /dev/null
+++ b/sfx/magic/flar1.ogg
diff --git a/sfx/magic/flar2.ogg b/sfx/magic/flar2.ogg
new file mode 100644
index 00000000..341ed30d
--- /dev/null
+++ b/sfx/magic/flar2.ogg
diff --git a/sfx/magic/flar3.ogg b/sfx/magic/flar3.ogg
new file mode 100644
index 00000000..f936681a
--- /dev/null
+++ b/sfx/magic/flar3.ogg
diff --git a/sfx/magic/frillyar.ogg b/sfx/magic/frillyar.ogg
new file mode 100644
index 00000000..353e5e39
--- /dev/null
+++ b/sfx/magic/frillyar.ogg
diff --git a/sfx/magic/generic.ogg b/sfx/magic/generic.ogg
new file mode 100644
index 00000000..c2eb6b09
--- /dev/null
+++ b/sfx/magic/generic.ogg
diff --git a/sfx/magic/ingrav1.ogg b/sfx/magic/ingrav1.ogg
new file mode 100644
index 00000000..7c4d31a0
--- /dev/null
+++ b/sfx/magic/ingrav1.ogg
diff --git a/sfx/magic/ingrav2.ogg b/sfx/magic/ingrav2.ogg
new file mode 100644
index 00000000..3b2da47f
--- /dev/null
+++ b/sfx/magic/ingrav2.ogg
diff --git a/sfx/magic/ingrav3.ogg b/sfx/magic/ingrav3.ogg
new file mode 100644
index 00000000..9b1d317b
--- /dev/null
+++ b/sfx/magic/ingrav3.ogg
diff --git a/sfx/magic/inma.ogg b/sfx/magic/inma.ogg
new file mode 100644
index 00000000..41e5772f
--- /dev/null
+++ b/sfx/magic/inma.ogg
diff --git a/sfx/magic/itenplz-hit.ogg b/sfx/magic/itenplz-hit.ogg
new file mode 100644
index 00000000..dac1bfd8
--- /dev/null
+++ b/sfx/magic/itenplz-hit.ogg
diff --git a/sfx/magic/nature.ogg b/sfx/magic/nature.ogg
new file mode 100644
index 00000000..5b48ab73
--- /dev/null
+++ b/sfx/magic/nature.ogg
diff --git a/sfx/magic/spawn_burst.ogg b/sfx/magic/spawn_burst.ogg
new file mode 100644
index 00000000..74390fe1
--- /dev/null
+++ b/sfx/magic/spawn_burst.ogg
diff --git a/sfx/magic/transmute.ogg b/sfx/magic/transmute.ogg
new file mode 100644
index 00000000..27234be2
--- /dev/null
+++ b/sfx/magic/transmute.ogg
diff --git a/sfx/magic/war.ogg b/sfx/magic/war.ogg
new file mode 100644
index 00000000..43f4c683
--- /dev/null
+++ b/sfx/magic/war.ogg
diff --git a/sfx/magic/warp.ogg b/sfx/magic/warp.ogg
new file mode 100644
index 00000000..e94e9371
--- /dev/null
+++ b/sfx/magic/warp.ogg