Bad collisions

1 files changed, 12 insertions, 4 deletions

diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index f19f870e..db3a4eac 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="119">
+<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="250" height="175" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="120">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -1824,9 +1824,9 @@
 2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,2715,0,2713,0,0,0,0,0,0,0,0,2716,2716,0,0,0,0,2716,2716,0,0,0,0,0,2716,2716,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,0,0,0,0,0,0,2715,2715,2715,2714,2714,2715,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,0,2713,2716,2713,2713,2716,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,0,0,0,0,0,0,0,2713,0,2714,2715,2715,2715,2714,2713,2713,0,0,0,0,2713,2713,2713,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2714,2714,2714,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
 2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,2715,0,2713,2714,2714,2714,2714,0,0,0,2713,0,0,2713,0,0,2713,0,0,2713,2713,0,2713,2713,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,0,0,0,2713,0,0,2715,2715,2715,2715,2715,0,0,0,0,2713,0,0,0,0,2713,2716,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2714,2715,2715,2715,2714,0,2713,0,0,0,0,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2714,2714,2714,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
 2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,2715,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,2716,2716,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,0,0,0,0,0,2716,2716,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2714,2715,2715,2715,2714,0,0,0,0,0,0,2713,2713,0,0,0,2713,0,0,2713,2713,2713,2713,2713,2713,2713,2713,0,0,2714,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
-2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2716,0,2713,2713,2713,2713,2713,2713,2713,2713,0,2716,2713,2713,2716,2713,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2714,2715,2715,2715,2714,0,0,0,2713,0,0,2713,2713,0,0,2713,2713,0,0,2713,0,0,0,0,2713,0,0,0,0,0,2713,0,0,0,0,0,2713,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
+2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2716,0,2713,2713,2713,2713,2713,2713,2713,2713,0,2716,2713,2713,2716,2713,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2714,2715,2715,2715,2714,0,0,0,2713,0,0,2713,2713,0,0,2713,2713,0,0,2713,0,0,0,0,2713,0,0,0,0,0,2713,0,0,0,0,0,2713,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
 2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,2716,2713,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2714,2715,2715,2715,2715,2714,0,0,0,0,0,2713,2713,2713,0,0,0,0,0,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
-2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,2713,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,0,0,2713,2713,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2716,2713,2713,0,0,0,0,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,2714,2715,2715,2715,2715,2714,0,0,0,0,0,0,2713,2713,0,0,0,0,2713,2713,2713,2713,2713,0,0,2713,0,0,0,0,0,0,0,0,2713,2713,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
+2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,2713,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,0,0,2713,2713,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2716,2713,2713,0,0,0,0,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,2714,2715,2715,2715,2715,2714,0,0,0,0,0,0,2713,2713,0,0,0,0,2713,2713,2713,2713,2713,0,0,2713,0,0,0,0,0,0,0,0,2713,2713,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
 2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,2715,2715,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2716,2713,2713,2716,0,0,0,0,0,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,2714,2715,2715,2715,2715,2715,2714,0,0,0,0,0,0,2713,2713,2713,0,0,0,2713,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
 2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,0,0,0,2714,2713,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,0,0,2713,0,0,0,0,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2715,2714,2714,2715,0,0,0,2713,0,0,0,0,2713,2713,2713,0,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,0,2716,2716,0,2713,0,0,0,0,0,0,0,0,0,2713,0,2716,2716,0,2713,0,0,0,0,2714,2715,2715,2715,2715,2715,2714,2713,2713,0,0,2713,2713,2713,2713,2713,2713,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
 2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,0,0,0,2714,2714,2713,2713,0,0,0,0,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2714,2714,2714,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,0,2713,2713,0,0,0,0,0,0,0,0,0,0,2714,2714,2715,2715,2715,2715,2715,2715,2714,2713,0,0,0,2713,2713,2713,2713,2713,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2715,2715,2715,2715,2715,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,2713,
@@ -2096,7 +2096,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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 id="11" name="Object">
+ <objectgroup id="11" name="Object" visible="0">
   <object id="1" name="To Library" type="warp" x="1632" y="2560" width="32" height="32">
    <properties>
     <property name="dest_map" value="001-2-4"/>
@@ -2574,5 +2574,13 @@
    </properties>
   </object>
   <object id="117" name="^ART" type="anchor" x="2848" y="2752" width="32" height="32"/>
+  <object id="119" name="To Frigate" type="warp" x="6528" y="2720" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-21"/>
+    <property name="dest_x" value="20"/>
+    <property name="dest_y" value="28"/>
+    <property name="npc_id" value="SCRIPT"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>