Merge branch 'fix-many-maps' into 'master'

Fix a bunch of warp placement

See merge request !17

1 files changed, 96 insertions, 10 deletions

diff --git a/maps/001-2-35.tmx b/maps/001-2-35.tmx
index 77bda931..6aa1b808 100644
--- a/maps/001-2-35.tmx
+++ b/maps/001-2-35.tmx
@@ -35,7 +35,93 @@
  <tileset firstgid="961" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="970" source="../graphics/tilesets/candle-x1x2.tsx"/>
+ <tileset firstgid="970" name="Candle x1x2" tilewidth="32" tileheight="64" tilecount="12" columns="3">
+  <image source="../graphics/tilesets/candle-x1x2.png" width="96" height="256"/>
+  <tile id="0">
+   <properties>
+    <property name="animation-delay0" value="13"/>
+    <property name="animation-delay1" value="12"/>
+    <property name="animation-delay2" value="13"/>
+    <property name="animation-delay3" value="12"/>
+    <property name="animation-delay4" value="11"/>
+    <property name="animation-frame0" value="0"/>
+    <property name="animation-frame1" value="1"/>
+    <property name="animation-frame2" value="2"/>
+    <property name="animation-frame3" value="1"/>
+    <property name="animation-frame4" value="2"/>
+   </properties>
+   <animation>
+    <frame tileid="0" duration="130"/>
+    <frame tileid="1" duration="120"/>
+    <frame tileid="2" duration="130"/>
+    <frame tileid="1" duration="120"/>
+    <frame tileid="2" duration="110"/>
+   </animation>
+  </tile>
+  <tile id="3">
+   <properties>
+    <property name="animation-delay0" value="13"/>
+    <property name="animation-delay1" value="12"/>
+    <property name="animation-delay2" value="13"/>
+    <property name="animation-delay3" value="12"/>
+    <property name="animation-delay4" value="11"/>
+    <property name="animation-frame0" value="3"/>
+    <property name="animation-frame1" value="4"/>
+    <property name="animation-frame2" value="5"/>
+    <property name="animation-frame3" value="4"/>
+    <property name="animation-frame4" value="5"/>
+   </properties>
+   <animation>
+    <frame tileid="3" duration="130"/>
+    <frame tileid="4" duration="120"/>
+    <frame tileid="5" duration="130"/>
+    <frame tileid="4" duration="120"/>
+    <frame tileid="5" duration="110"/>
+   </animation>
+  </tile>
+  <tile id="6">
+   <properties>
+    <property name="animation-delay0" value="13"/>
+    <property name="animation-delay1" value="12"/>
+    <property name="animation-delay2" value="13"/>
+    <property name="animation-delay3" value="12"/>
+    <property name="animation-delay4" value="11"/>
+    <property name="animation-frame0" value="6"/>
+    <property name="animation-frame1" value="7"/>
+    <property name="animation-frame2" value="8"/>
+    <property name="animation-frame3" value="7"/>
+    <property name="animation-frame4" value="8"/>
+   </properties>
+   <animation>
+    <frame tileid="6" duration="130"/>
+    <frame tileid="7" duration="120"/>
+    <frame tileid="8" duration="130"/>
+    <frame tileid="7" duration="120"/>
+    <frame tileid="8" duration="110"/>
+   </animation>
+  </tile>
+  <tile id="9">
+   <properties>
+    <property name="animation-delay0" value="13"/>
+    <property name="animation-delay1" value="12"/>
+    <property name="animation-delay2" value="13"/>
+    <property name="animation-delay3" value="12"/>
+    <property name="animation-delay4" value="11"/>
+    <property name="animation-frame0" value="9"/>
+    <property name="animation-frame1" value="10"/>
+    <property name="animation-frame2" value="11"/>
+    <property name="animation-frame3" value="10"/>
+    <property name="animation-frame4" value="11"/>
+   </properties>
+   <animation>
+    <frame tileid="9" duration="130"/>
+    <frame tileid="10" duration="120"/>
+    <frame tileid="11" duration="130"/>
+    <frame tileid="10" duration="120"/>
+    <frame tileid="11" duration="110"/>
+   </animation>
+  </tile>
+ </tileset>
  <tileset firstgid="982" name="Shadow" tilewidth="32" tileheight="32" tilecount="64" columns="8">
   <image source="../graphics/tilesets/shadow.png" width="256" height="256"/>
  </tileset>
@@ -492,15 +578,6 @@
 962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962
 </data>
  </layer>
- <objectgroup name="Object" opacity="0.87">
-  <object id="1" name="ToWaitingRoom" type="warp" x="736" y="928" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="001-2-32"/>
-    <property name="dest_x" value="32"/>
-    <property name="dest_y" value="29"/>
-   </properties>
-  </object>
- </objectgroup>
  <layer name="Heights" width="60" height="71">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -576,4 +653,13 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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>
+ <objectgroup name="Object" opacity="0.87">
+  <object id="1" name="ToWaitingRoom" type="warp" x="736" y="928" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-32"/>
+    <property name="dest_x" value="32"/>
+    <property name="dest_y" value="29"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>