add small flame effect

2 files changed, 38 insertions, 5 deletions

diff --git a/graphics/particles/flame.particle.xml b/graphics/particles/flame.particle.xml
new file mode 100644
index 00000000..78eb8a7c
--- /dev/null
+++ b/graphics/particles/flame.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:#BF0019,FF6715,FFE659" 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/maps/007-1.tmx b/maps/007-1.tmx
index d3bd0c4c..65731a32 100644
--- a/maps/007-1.tmx
+++ b/maps/007-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextobjectid="100">
+<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextobjectid="102">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -197,7 +197,7 @@
 686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,671,670,670,670,670,669,686,686,686,671,670,670,670,670,670,733,715,718,699,702,702,25,25,25,25,686,686,686,684,700,718,716,732,784,670,670,670,670,670,670,670,670,670,670,670,670,670,731,715,718,699,702,702,702,683,686,684,700,718,716,734,734,734,734,734,734,734,734,734,734,715,718,699,702,702,700,716,732,670,670,670,670,670,685,686,686,686,686,686,686,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,392,392,392,392,392,392,392,392,392,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,25,25,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,
 686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,671,670,670,670,784,670,731,734,715,718,718,699,25,25,686,684,702,702,700,716,734,732,670,670,670,402,670,670,670,670,670,670,670,701,702,703,670,670,731,734,715,718,718,718,699,702,700,716,734,732,670,670,670,670,670,670,670,670,670,402,731,734,715,718,718,716,732,670,670,670,670,670,670,685,686,686,686,686,686,686,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,392,392,392,392,392,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,25,25,25,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,
 686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,671,670,670,670,670,670,670,731,734,734,715,718,718,684,700,718,718,716,732,670,670,670,670,670,670,670,670,670,670,670,784,670,717,718,719,670,670,670,670,731,734,734,734,715,718,716,732,670,670,670,670,670,670,402,670,670,670,670,670,670,670,731,734,734,732,402,670,670,670,784,670,669,686,686,686,686,686,686,686,686,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,25,25,25,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,
-686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,671,670,670,670,670,670,670,670,731,701,755,718,716,734,734,732,670,670,670,670,670,670,670,670,670,670,670,670,670,670,733,734,735,670,670,670,670,670,670,670,670,731,734,732,670,670,670,670,670,686,687,670,670,789,670,670,670,670,670,670,670,670,670,670,670,670,670,670,669,686,686,686,686,686,686,686,686,686,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,25,25,25,25,25,25,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,
+686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,671,670,670,670,670,670,670,670,731,701,718,718,716,734,734,732,670,670,670,670,670,670,670,670,670,670,670,670,670,670,733,734,735,670,670,670,670,670,670,670,670,731,734,732,670,670,670,670,670,686,687,670,670,789,670,670,670,670,670,670,670,670,670,670,670,670,670,670,669,686,686,686,686,686,686,686,686,686,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,25,25,25,25,25,25,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,
 686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,671,670,670,670,670,670,670,670,733,734,732,670,670,670,670,402,670,670,670,670,669,686,686,686,671,670,670,670,670,670,670,670,670,670,402,670,670,670,670,670,670,670,670,670,670,701,702,702,703,670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,669,686,686,686,686,686,686,686,686,686,686,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,25,25,25,25,25,25,25,25,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,
 686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,671,670,670,670,670,670,670,670,670,402,670,670,670,670,670,670,669,686,686,686,686,686,686,686,686,671,670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,717,718,718,719,670,670,670,670,670,670,670,670,670,670,670,670,670,670,669,686,686,686,686,686,686,686,686,686,686,686,686,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,
 686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,25,686,686,686,686,671,670,670,670,670,670,670,670,670,670,669,686,686,686,686,686,686,686,686,686,686,686,686,686,671,670,670,670,670,670,670,670,670,670,784,670,670,670,670,670,733,734,734,735,670,670,670,670,670,670,670,670,686,687,670,670,670,670,685,686,686,686,686,686,686,686,686,686,686,686,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,
@@ -1653,7 +1653,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="200" height="200">
+ <layer name="Collision" width="200" height="200" visible="0">
   <data encoding="csv">
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -2120,7 +2120,7 @@
   <object id="94" name="red scorpion" type="spawn" x="480" y="4064" width="2400" height="1888">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="80"/>
+    <property name="max_beings" value="10"/>
     <property name="monster_id" value="1072"/>
     <property name="spawn" value="35000"/>
    </properties>
@@ -2128,7 +2128,7 @@
   <object id="96" name="Cave Maggot" type="spawn" x="2944" y="352" width="2816" height="5824">
    <properties>
     <property name="death" value="300000"/>
-    <property name="max_beings" value="40"/>
+    <property name="max_beings" value="35"/>
     <property name="monster_id" value="1027"/>
     <property name="spawn" value="35000"/>
    </properties>
@@ -2149,5 +2149,14 @@
     <property name="spawn" value="35000"/>
    </properties>
   </object>
+  <object id="100" name="graphics/particles/flame.particle.xml" type="particle_effect" x="2304" y="1248" width="32" height="32"/>
+  <object id="101" name="cave maggot" type="Spawn" x="864" y="3808" width="480" height="448">
+   <properties>
+    <property name="death" value="300000"/>
+    <property name="max_beings" value="4"/>
+    <property name="monster_id" value="1027"/>
+    <property name="spawn" value="35000"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>