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

12 files changed, 205 insertions, 4 deletions

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>