Merge branch 'jesusalva/cleanup' into 'master'

Christmas Event Cleanup

See merge request themanaworld/evolved/clientdata!45

4 files changed, 110 insertions, 0 deletions

diff --git a/graphics/particles/flame-blue.particle.xml b/graphics/particles/flame-blue.particle.xml
new file mode 100644
index 00000000..35ba3baf
--- /dev/null
+++ b/graphics/particles/flame-blue.particle.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+Small flame with a point-like source designed for the lamps on the cave
+tileset but it should also work to visualize some kind of torch or - when
+launched by a parent emitter - a small fireball.
+-->
+<effect>
+  <particle position-x="17" position-y="0" position-z="32">
+    <emitter>
+      <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.02"/>
+      <animation imageset="graphics/particles/aniblaze.png|W:#1900BF,1567FF,59E6FF" width="8" height="8">
+        <sequence start="0" end="14" delay="30"/>
+        <frame index="14" delay="1000"/>
+      </animation>
+      <property name="lifetime" min="35" max="50"/>
+      <property name="output" min="0" max="2"/>
+      <property name="fade-in" value="0"/>
+      <property name="fade-out" value="10"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/snow-burst.xml b/graphics/particles/snow-burst.xml
new file mode 100644
index 00000000..2932d6a9
--- /dev/null
+++ b/graphics/particles/snow-burst.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!--
+    Snow Burst
+    a ball of snow that leaves a tail on its way
+-->
+<effect>
+  <particle position-x="0" position-y="0" position-z="32" lifetime="128">
+    <emitter>
+      <property name="image" value="graphics/particles/snowflake-7x7.png"/>
+      <property name="lifetime" value="111"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="40"/>
+      <property name="output" min="3" max="4"/>
+      <property name="power" min="1" max="2"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.05"/>
+      <property name="bounce" value="1"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="100"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+    </emitter>
+<!--
+    it looks good with the 9x9 snowflakes but its very unrealistic when a snowflake is 1/4 size of the head
+-->
+<!--
+    <emitter>
+      <property name="image" value="graphics/particles/snowflake-9x9.png"/>
+      <property name="lifetime" value="111"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="40"/>
+      <property name="output" min="0" max="1"/>
+      <property name="power" min="2" max="3"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.05"/>
+      <property name="bounce" value="1"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="200"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+    </emitter>
+-->
+    <emitter>
+      <property name="image" value="graphics/particles/star-small.png"/>
+      <property name="lifetime" value="111"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="40"/>
+      <property name="output" min="3" max="4"/>
+      <property name="power" min="1" max="2"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.01"/>
+      <property name="bounce" value="1"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="200"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+    </emitter>
+    <emitter>
+      <property name="image" value="graphics/particles/snowflake-7x7.png"/>
+      <property name="lifetime" value="111"/>
+      <property name="alpha" value="1"/>
+      <property name="fade-in" value="10"/>
+      <property name="fade-out" value="40"/>
+      <property name="output" min="8" max="10"/>
+      <property name="power" min="1" max="1"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.1"/>
+      <property name="bounce" value="1"/>
+      <property name="momentum" value="0.95"/>
+      <property name="randomness" value="100"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+      <property name="follow-parent" value="1"/>
+    </emitter>
+    <emitter>
+      <property name="image" value="graphics/particles/snowflake-7x7.png"/>
+      <property name="lifetime" value="12"/>
+      <property name="alpha" value="1"/>
+      <property name="fade-in" value="4"/>
+      <property name="fade-out" value="4"/>
+      <property name="output" min="66" max="66"/>
+      <property name="power" min="2" max="2"/>
+      <property name="horizontal-angle" min="-180" max="180"/>
+      <property name="gravity" value="0.1"/>
+      <property name="bounce" value="1"/>
+      <property name="vertical-angle" min="-180" max="180"/>
+      <property name="follow-parent" value="1"/>
+    </emitter>
+  </particle>
+</effect>
diff --git a/graphics/particles/snowflake-7x7.png b/graphics/particles/snowflake-7x7.png
new file mode 100644
index 00000000..839f6c93
--- /dev/null
+++ b/graphics/particles/snowflake-7x7.png
diff --git a/graphics/particles/snowflake-9x9.png b/graphics/particles/snowflake-9x9.png
new file mode 100644
index 00000000..dcb303e4
--- /dev/null
+++ b/graphics/particles/snowflake-9x9.png