Merge pull request #20 from wushin/warps-pixels-to-tiles

All warps moved from old to new style

1 files changed, 39 insertions, 39 deletions

diff --git a/maps/006-3.tmx b/maps/006-3.tmx
index fbac8ea1..395ae178 100644
--- a/maps/006-3.tmx
+++ b/maps/006-3.tmx
@@ -625,7 +625,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
 </data>
  </layer>
- <layer name="Collision" width="150" height="150" visible="0">
+ <layer name="Collision" width="150" height="150">
   <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,
@@ -795,134 +795,134 @@
   <object name="To Desert Mountains" type="warp" x="1280" y="832" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="1280"/>
-    <property name="dest_y" value="896"/>
+    <property name="dest_tile_x" value="40"/>
+    <property name="dest_tile_y" value="28"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="1760" y="864" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="1760"/>
-    <property name="dest_y" value="928"/>
+    <property name="dest_tile_x" value="55"/>
+    <property name="dest_tile_y" value="29"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="1984" y="960" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="1984"/>
-    <property name="dest_y" value="1024"/>
+    <property name="dest_tile_x" value="62"/>
+    <property name="dest_tile_y" value="32"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="2752" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="2752"/>
-    <property name="dest_y" value="832"/>
+    <property name="dest_tile_x" value="86"/>
+    <property name="dest_tile_y" value="26"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="2912" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="2912"/>
-    <property name="dest_y" value="832"/>
+    <property name="dest_tile_x" value="91"/>
+    <property name="dest_tile_y" value="26"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="3904" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="3904"/>
-    <property name="dest_y" value="832"/>
+    <property name="dest_tile_x" value="122"/>
+    <property name="dest_tile_y" value="26"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="3648" y="1568" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="3648"/>
-    <property name="dest_y" value="1632"/>
+    <property name="dest_tile_x" value="114"/>
+    <property name="dest_tile_y" value="51"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="3328" y="1408" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="3328"/>
-    <property name="dest_y" value="1472"/>
+    <property name="dest_tile_x" value="104"/>
+    <property name="dest_tile_y" value="46"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="2464" y="1408" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="2464"/>
-    <property name="dest_y" value="1472"/>
+    <property name="dest_tile_x" value="77"/>
+    <property name="dest_tile_y" value="46"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="1920" y="2176" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="1920"/>
-    <property name="dest_y" value="1920"/>
+    <property name="dest_tile_x" value="60"/>
+    <property name="dest_tile_y" value="60"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="2944" y="2016" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="2944"/>
-    <property name="dest_y" value="2080"/>
+    <property name="dest_tile_x" value="92"/>
+    <property name="dest_tile_y" value="65"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="3584" y="2368" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="3584"/>
-    <property name="dest_y" value="2432"/>
+    <property name="dest_tile_x" value="112"/>
+    <property name="dest_tile_y" value="76"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="3520" y="1792" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="3520"/>
-    <property name="dest_y" value="1856"/>
+    <property name="dest_tile_x" value="110"/>
+    <property name="dest_tile_y" value="58"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="4000" y="1888" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="4000"/>
-    <property name="dest_y" value="1952"/>
+    <property name="dest_tile_x" value="125"/>
+    <property name="dest_tile_y" value="61"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="2368" y="2880" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="2368"/>
-    <property name="dest_y" value="2944"/>
+    <property name="dest_tile_x" value="74"/>
+    <property name="dest_tile_y" value="92"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="1632" y="2880" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="1632"/>
-    <property name="dest_y" value="2944"/>
+    <property name="dest_tile_x" value="51"/>
+    <property name="dest_tile_y" value="92"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="1216" y="3872" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="1216"/>
-    <property name="dest_y" value="3936"/>
+    <property name="dest_tile_x" value="38"/>
+    <property name="dest_tile_y" value="123"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="2528" y="3840" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="2528"/>
-    <property name="dest_y" value="3904"/>
+    <property name="dest_tile_x" value="79"/>
+    <property name="dest_tile_y" value="122"/>
    </properties>
   </object>
   <object name="To Desert Mountains" type="warp" x="3872" y="3520" width="32" height="32">
    <properties>
     <property name="dest_map" value="006-1"/>
-    <property name="dest_x" value="3872"/>
-    <property name="dest_y" value="3584"/>
+    <property name="dest_tile_x" value="121"/>
+    <property name="dest_tile_y" value="112"/>
    </properties>
   </object>
   <object name="MountainSnake" type="spawn" x="2880" y="672" width="1184" height="288">