Rainbow hit and crit

4 files changed, 191 insertions, 5 deletions

diff --git a/effects.xml b/effects.xml
index bdc85f3a..a847b5f4 100644
--- a/effects.xml
+++ b/effects.xml
@@ -57,7 +57,7 @@
   <effect id="23" audio="env/zap.ogg" particle="graphics/particles/zap.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="25" audio="magic/kaflosh.ogg" particle="graphics/particles/rain.xml"/>
   <effect id="26" particle="graphics/particles/hit.particle.xml"/>
   <!-- #frillyar (arrow hail) hit -->
   <effect id="27" audio="magic/frillyar.ogg" particle="graphics/particles/arrow-hail.xml"/>
@@ -95,9 +95,11 @@
   <effect id="59" particle="graphics/particles/channelling-cast-red.particle.xml"/>
   <effect id="60" particle="graphics/particles/channelling-cast-blue.particle.xml"/>
   <effect id="61" particle="graphics/particles/red-magic-cast.particle.xml"/>
-  <effect id="69" particle="graphics/particles/python.xml" audio="env/fart.ogg"/>
-  <effect id="70" particle="graphics/particles/monster-rotter-hit.xml" audio="monsters/slime/slime-hurt1.ogg"/>
-  <effect id="71" particle="graphics/particles/monster-rotter-crit.xml" audio="monsters/rotter/crit1.ogg"/>
+  <effect id="69" audio="env/fart.ogg" particle="graphics/particles/python.xml"/>
+  <effect id="70" audio="monsters/slime/slime-hurt1.ogg" particle="graphics/particles/monster-rotter-hit.xml"/>
+  <effect id="71" audio="monsters/rotter/crit1.ogg" particle="graphics/particles/monster-rotter-crit.xml"/>
+  <effect id="72" particle="graphics/particles/rainbow-hit.xml"/>
+  <effect id="73" audio="system/boom.ogg" particle="graphics/particles/rainbow-crit.xml"/>
   <!-- #betsanc (protect) end -->
   <effect id="111" audio="magic/betsanc-off.ogg" particle="graphics/particles/magic.shield.xml"/>
   <!-- <effect id="112" particle="graphics/particles/magic.haste-ends.xml"/>-->
diff --git a/graphics/particles/crit.particle.xml b/graphics/particles/crit.particle.xml
index 7f534477..aee7111e 100644
--- a/graphics/particles/crit.particle.xml
+++ b/graphics/particles/crit.particle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-An explosion of white particles.
+An explosion of stars
 -->
 <effect>
   <particle position-x="0" position-y="0" position-z="16" lifetime="1">
diff --git a/graphics/particles/rainbow-crit.xml b/graphics/particles/rainbow-crit.xml
new file mode 100644
index 00000000..1258ed15
--- /dev/null
+++ b/graphics/particles/rainbow-crit.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0"?>
+<!--
+An explosion of rainbow colors.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="16" lifetime="1">
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="70" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="4"/>
+      <property name="bounce" value="0.75"/>
+      <property name="gravity" value="0.2"/>
+      <property name="image" value="graphics/particles/orb-large.png|W:#ff0000"/>
+      <property name="lifetime" min="120" max="180"/>
+      <property name="fade-out" value="120"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="70" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="4"/>
+      <property name="bounce" value="0.75"/>
+      <property name="gravity" value="0.2"/>
+      <property name="image" value="graphics/particles/orb-large.png|W:#ff8800"/>
+      <property name="lifetime" min="120" max="180"/>
+      <property name="fade-out" value="120"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="70" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="4"/>
+      <property name="bounce" value="0.75"/>
+      <property name="gravity" value="0.2"/>
+      <property name="image" value="graphics/particles/orb-large.png|W:#ffff00"/>
+      <property name="lifetime" min="120" max="180"/>
+      <property name="fade-out" value="120"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="45" max="90"/>
+      <property name="vertical-angle" min="70" max="90"/>
+      <property name="power" min="0" max="4"/>
+      <property name="bounce" value="0.75"/>
+      <property name="gravity" value="0.2"/>
+      <property name="image" value="graphics/particles/orb-large.png|W:#00ff00"/>
+      <property name="lifetime" min="120" max="180"/>
+      <property name="fade-out" value="120"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="70" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="4"/>
+      <property name="bounce" value="0.75"/>
+      <property name="gravity" value="0.2"/>
+      <property name="image" value="graphics/particles/orb-large.png|W:#0000ff"/>
+      <property name="lifetime" min="120" max="180"/>
+      <property name="fade-out" value="120"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="70" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="4"/>
+      <property name="bounce" value="0.75"/>
+      <property name="gravity" value="0.2"/>
+      <property name="image" value="graphics/particles/orb-large.png|W:#ffff00"/>
+      <property name="lifetime" min="120" max="180"/>
+      <property name="fade-out" value="120"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="70" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="4"/>
+      <property name="bounce" value="0.75"/>
+      <property name="gravity" value="0.2"/>
+      <property name="image" value="graphics/particles/orb-large.png|W:#880088"/>
+      <property name="lifetime" min="120" max="180"/>
+      <property name="fade-out" value="120"/>
+      <property name="output" value="3"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/rainbow-hit.xml b/graphics/particles/rainbow-hit.xml
new file mode 100644
index 00000000..03ace72a
--- /dev/null
+++ b/graphics/particles/rainbow-hit.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!--
+A splash of rainbow colors.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="16" lifetime="1">
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="45" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="6"/>
+      <property name="gravity" value="0.3"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ff0000"/>
+      <property name="lifetime" min="0" max="80"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="45" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="6"/>
+      <property name="gravity" value="0.3"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ff8800"/>
+      <property name="lifetime" min="0" max="80"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="45" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="6"/>
+      <property name="gravity" value="0.3"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ffff00"/>
+      <property name="lifetime" min="0" max="80"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="45" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="6"/>
+      <property name="gravity" value="0.3"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#00ff00"/>
+      <property name="lifetime" min="0" max="80"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="45" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="6"/>
+      <property name="gravity" value="0.3"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#0000ff"/>
+      <property name="lifetime" min="0" max="80"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="45" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="6"/>
+      <property name="gravity" value="0.3"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#ffff00"/>
+      <property name="lifetime" min="0" max="80"/>
+      <property name="output" value="3"/>
+    </emitter>
+    <emitter>
+      <property name="position-x" min="-8" max="8"/>
+      <property name="position-y" min="-8" max="8"/>
+      <property name="vertical-angle" min="45" max="90"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="power" min="0" max="6"/>
+      <property name="gravity" value="0.3"/>
+      <property name="image" value="graphics/particles/orb-small.png|W:#880088"/>
+      <property name="lifetime" min="0" max="80"/>
+      <property name="output" value="3"/>
+    </emitter>
+  </particle>
+</effect>