Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	monsters.xml

5 files changed, 70 insertions, 0 deletions

diff --git a/graphics/particles/anibubble_8px.png b/graphics/particles/anibubble_8px.png
new file mode 100644
index 00000000..49151502
--- /dev/null
+++ b/graphics/particles/anibubble_8px.png
diff --git a/graphics/particles/anibubble_8px_green.png b/graphics/particles/anibubble_8px_green.png
new file mode 100644
index 00000000..46bafbb2
--- /dev/null
+++ b/graphics/particles/anibubble_8px_green.png
diff --git a/graphics/particles/monster-angry-fire-goblin.particle.xml b/graphics/particles/monster-angry-fire-goblin.particle.xml
new file mode 100644
index 00000000..a02d7c5d
--- /dev/null
+++ b/graphics/particles/monster-angry-fire-goblin.particle.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+A fire effect intended for use with the fire goblin mob 
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="0">
+    <emitter>
+      <property name="position-x" min="-11" max="13"/>
+      <property name="position-y" min="-22" max="-26"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="vertical-angle" min="0" max="90"/>
+      <property name="power" min="0.1" max="0.3"/>
+      <property name="gravity" value="-0.03"/>
+      <animation imageset="graphics/particles/aniblaze.png" width="8" height="8">
+        <sequence start="0" end="14" delay="20"/>
+        <frame index="14" delay="1000"/>
+      </animation>
+      <property name="lifetime" min="25" max="35"/>
+      <property name="output" min="0" max="7"/>
+      <property name="fade-in" value="0"/>
+      <property name="fade-out" value="5"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/monster-angry-green-slime.particle.xml b/graphics/particles/monster-angry-green-slime.particle.xml
new file mode 100644
index 00000000..ed1d0f8c
--- /dev/null
+++ b/graphics/particles/monster-angry-green-slime.particle.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+A bubble effect intended for use with the igreen slime mob.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="0">
+    <emitter>
+      <property name="position-x" min="-7" max="7"/>
+      <property name="position-y" min="-14" max="-22"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="vertical-angle" min="0" max="90"/>
+      <property name="power" min="0.1" max="0.3"/>
+      <property name="gravity" value="-0.03"/>
+      <animation imageset="graphics/particles/anibubble_8px_green.png" width="8" height="8">
+        <sequence start="0" end="14" delay="1000"/>
+      </animation>
+      <property name="lifetime" min="15" max="25"/>
+      <property name="output" min="0" max="7"/>
+      <property name="fade-in" value="0"/>
+      <property name="fade-out" value="5"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/monster-angry-sea-slime.particle.xml b/graphics/particles/monster-angry-sea-slime.particle.xml
new file mode 100644
index 00000000..b5ae198e
--- /dev/null
+++ b/graphics/particles/monster-angry-sea-slime.particle.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+A bubble effect intended for use with the sea slime mob.
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="0">
+    <emitter>
+      <property name="position-x" min="-11" max="13"/>
+      <property name="position-y" min="-14" max="-22"/>
+      <property name="horizontal-angle" min="0" max="360"/>
+      <property name="vertical-angle" min="0" max="90"/>
+      <property name="power" min="0.1" max="0.3"/>
+      <property name="gravity" value="-0.03"/>
+      <animation imageset="graphics/particles/anibubble_8px.png" width="8" height="8">
+        <sequence start="0" end="14" delay="1000"/>
+      </animation>
+      <property name="lifetime" min="15" max="25"/>
+      <property name="output" min="0" max="7"/>
+      <property name="fade-in" value="0"/>
+      <property name="fade-out" value="5"/>
+    </emitter>
+  </particle>
+</effect>