Fire

1 files changed, 27 insertions, 25 deletions

diff --git a/maps/008-2-0.tmx b/maps/008-2-0.tmx
index 17d5ee7e..810203c2 100644
--- a/maps/008-2-0.tmx
+++ b/maps/008-2-0.tmx
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.3" orientation="orthogonal" renderorder="right-down" width="59" height="53" tilewidth="32" tileheight="32" infinite="0" nextobjectid="14">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="59" height="53" tilewidth="32" tileheight="32" nextobjectid="14">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-0.png"/>
   <property name="name" value="Chez Celestia"/>
  </properties>
- <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="10" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="10" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256">
   <image source="../graphics/tilesets/hurns-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="266" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="266" name="artis-indoor" tilewidth="32" tileheight="32" tilecount="256">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="522" name="artis-indoor-fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="522" name="artis-indoor-fringe" tilewidth="32" tileheight="32" tilecount="256">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="778" name="ship-indoor-fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="778" name="ship-indoor-fringe" tilewidth="32" tileheight="32" tilecount="256">
   <image source="../graphics/tilesets/ship-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1034" name="artis-indoor-x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+ <tileset firstgid="1034" name="artis-indoor-x1x3" tilewidth="32" tileheight="96" tilecount="48">
   <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="1082" name="artis-indoor-x1x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <tileset firstgid="1082" name="artis-indoor-x1x2" tilewidth="32" tileheight="64" tilecount="16">
   <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
- <tileset firstgid="1098" name="hurns-ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <tileset firstgid="1098" name="hurns-ground" tilewidth="32" tileheight="32" tilecount="256">
   <image source="../graphics/tilesets/hurns-ground.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="1354" name="hurns-indoor-x1x3" tilewidth="32" tileheight="96" tilecount="16" columns="16">
+ <tileset firstgid="1354" name="hurns-indoor-x1x3" tilewidth="32" tileheight="96" tilecount="16">
   <image source="../graphics/tilesets/hurns-indoor-x1x3.png" width="512" height="96"/>
  </tileset>
- <tileset firstgid="1370" name="artis-indoor-x1x4" tilewidth="32" tileheight="32" tilecount="64" columns="16">
+ <tileset firstgid="1370" name="artis-indoor-x1x4" tilewidth="32" tileheight="32" tilecount="64">
   <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="1434" name="hurns-teacup-vapor" tilewidth="32" tileheight="32" tilecount="8" columns="4">
+ <tileset firstgid="1434" name="hurns-teacup-vapor" tilewidth="32" tileheight="32" tilecount="8">
   <image source="../graphics/tilesets/hurns-teacup-vapor.png" width="128" height="64"/>
   <tile id="0">
    <animation>
@@ -55,25 +55,27 @@
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="1442" name="fire" tilewidth="64" tileheight="64" tilecount="5" columns="5">
-  <image source="../graphics/tilesets/fire.png" width="320" height="64"/>
+ <tileset firstgid="1442" name="fire" tilewidth="64" tileheight="64" tilecount="7">
+  <image source="../graphics/tilesets/fire.png" width="448" height="64"/>
   <tile id="0">
    <animation>
-    <frame tileid="0" duration="150"/>
-    <frame tileid="1" duration="150"/>
-    <frame tileid="2" duration="150"/>
-    <frame tileid="3" duration="150"/>
-    <frame tileid="4" duration="150"/>
+    <frame tileid="0" duration="100"/>
+    <frame tileid="1" duration="100"/>
+    <frame tileid="2" duration="100"/>
+    <frame tileid="3" duration="100"/>
+    <frame tileid="4" duration="100"/>
+    <frame tileid="5" duration="100"/>
+    <frame tileid="6" duration="100"/>
    </animation>
   </tile>
  </tileset>
- <tileset firstgid="1447" name="hurns-indoor-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="8">
+ <tileset firstgid="1449" name="hurns-indoor-accessory" tilewidth="32" tileheight="32" tilecount="128">
   <image source="../graphics/tilesets/hurns-indoor-accessory.png" width="256" height="512"/>
  </tileset>
- <tileset firstgid="1575" name="sunlight-x1x5" tilewidth="32" tileheight="160" tilecount="4" columns="4">
+ <tileset firstgid="1577" name="sunlight-x1x5" tilewidth="32" tileheight="160" tilecount="4">
   <image source="../graphics/tilesets/sunlight-x1x5.png" width="128" height="160"/>
  </tileset>
- <tileset firstgid="1579" name="candle-x1x2" tilewidth="32" tileheight="64" tilecount="12" columns="3">
+ <tileset firstgid="1581" name="candle-x1x2" tilewidth="32" tileheight="64" tilecount="12">
   <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
   <tile id="6">
    <animation>
@@ -281,7 +283,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1442,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,958,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,958,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,1575,1576,1577,1575,1576,1577,1578,0,786,787,787,788,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,1577,1578,1579,1577,1578,1579,1580,0,786,787,787,788,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,802,803,803,804,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,587,587,587,587,0,0,0,0,818,819,819,820,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,
@@ -394,8 +396,8 @@
 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,925,1005,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,1585,1461,1453,1585,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,1452,0,1452,0,1452,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,1587,1463,1455,1587,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,1454,0,1454,0,1454,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,0,0,0,