1 files changed, 61 insertions, 61 deletions
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index ddb7be33..907ed7b5 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="71" tilewidth="32" tileheight="32" nextobjectid="29">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="71" height="71" tilewidth="32" tileheight="32" nextobjectid="42">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -728,63 +728,6 @@
 1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038
 </data>
  </layer>
- <objectgroup name="Object" opacity="0.87">
-  <object id="1" name="To Artis" type="warp" x="1088" y="1472" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="57"/>
-    <property name="dest_y" value="42"/>
-   </properties>
-  </object>
-  <object id="4" name="To Left Chamber" type="ani_warp" x="928" y="992" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="001-2-37"/>
-    <property name="dest_x" value="36"/>
-    <property name="dest_y" value="28"/>
-    <property name="npc_id" value="NPC_ARTIS_IN_DOOR"/>
-    <property name="trigger_x" value="1"/>
-    <property name="trigger_y" value="2"/>
-   </properties>
-  </object>
-  <object id="5" name="To Right Chamber" type="ani_warp" x="1248" y="992" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="001-2-38"/>
-    <property name="dest_x" value="24"/>
-    <property name="dest_y" value="28"/>
-    <property name="npc_id" value="NPC_ARTIS_IN_DOOR"/>
-    <property name="trigger_x" value="1"/>
-    <property name="trigger_y" value="2"/>
-   </properties>
-  </object>
-  <object id="7" name="To Right Chamber" type="warp" x="1440" y="896" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1"/>
-    <property name="dest_y" value="1"/>
-   </properties>
-  </object>
-  <object id="8" name="To Right Chamber" type="warp" x="736" y="896" width="32" height="32">
-   <properties>
-    <property name="dest_map" value="001-1"/>
-    <property name="dest_x" value="1"/>
-    <property name="dest_y" value="1"/>
-   </properties>
-  </object>
-  <object id="25" name="To Left PvP Arena" type="warp" x="768" y="1280" width="96" height="32">
-   <properties>
-    <property name="dest_map" value="001-2-40"/>
-    <property name="dest_x" value="27"/>
-    <property name="dest_y" value="46"/>
-   </properties>
-  </object>
-  <object id="26" name="To Right PvP Arena" type="warp" x="1344" y="1280" width="96" height="32">
-   <properties>
-    <property name="dest_map" value="001-2-40"/>
-    <property name="dest_x" value="45"/>
-    <property name="dest_y" value="46"/>
-   </properties>
-  </object>
- </objectgroup>
  <layer name="Heights" width="71" 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,0,0,0,0,0,0,0,0,0,0,0,
@@ -815,12 +758,12 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1125,1125,1125,0,1125,1125,1125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1125,0,0,0,0,0,0,0,1125,1125,1125,0,1125,1125,1125,0,0,0,0,0,0,0,1125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1125,1125,1125,1125,1125,0,1125,1125,1125,1125,1125,1125,1125,1125,1125,0,1125,1125,1125,1125,1125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1124,1124,1124,1125,1125,0,1125,1125,1125,1125,1125,1125,1125,1125,1125,0,1125,1125,1124,1124,1124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1124,1124,1124,0,0,1123,0,0,0,0,0,0,0,0,0,1123,0,1124,1124,1124,1124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1124,1124,1124,0,1123,1123,1123,0,0,0,0,0,0,0,1123,1123,1123,1124,1124,1124,1124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1123,1123,1123,0,1123,1123,1123,0,0,0,0,0,0,0,1123,1123,1123,1124,1123,1123,1123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1123,1123,1123,0,1123,1123,1123,0,0,0,0,0,0,0,1123,1123,1123,0,1123,1123,1123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1123,1123,1123,1123,1123,1123,1123,0,0,0,0,0,0,0,1123,1123,1123,1123,1123,1123,1123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -860,4 +803,61 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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="35" name="To Left Chamber" type="ani_warp" x="928" y="1024" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-34"/>
+    <property name="dest_x" value="29"/>
+    <property name="dest_y" value="32"/>
+    <property name="npc_id" value="NPC_ARTIS_IN_DOOR"/>
+    <property name="trigger_x" value="1"/>
+    <property name="trigger_y" value="2"/>
+   </properties>
+  </object>
+  <object id="36" name="To Right Chamber" type="ani_warp" x="1248" y="1024" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-32"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="32"/>
+    <property name="npc_id" value="NPC_ARTIS_IN_DOOR"/>
+    <property name="trigger_x" value="1"/>
+    <property name="trigger_y" value="2"/>
+   </properties>
+  </object>
+  <object id="37" name="To Right Dormroom" type="warp" x="1440" y="896" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-38"/>
+    <property name="dest_x" value="24"/>
+    <property name="dest_y" value="28"/>
+   </properties>
+  </object>
+  <object id="38" name="To Left Dormroom" type="warp" x="736" y="896" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-37"/>
+    <property name="dest_x" value="36"/>
+    <property name="dest_y" value="28"/>
+   </properties>
+  </object>
+  <object id="39" name="To Left PvP Arena" type="warp" x="768" y="1280" width="96" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-40"/>
+    <property name="dest_x" value="27"/>
+    <property name="dest_y" value="46"/>
+   </properties>
+  </object>
+  <object id="40" name="To Right PvP Arena" type="warp" x="1344" y="1280" width="96" height="32">
+   <properties>
+    <property name="dest_map" value="001-2-40"/>
+    <property name="dest_x" value="45"/>
+    <property name="dest_y" value="46"/>
+   </properties>
+  </object>
+  <object id="41" name="To Artis" type="warp" x="1088" y="1472" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="001-1"/>
+    <property name="dest_x" value="57"/>
+    <property name="dest_y" value="42"/>
+   </properties>
+  </object>
+ </objectgroup>
 </map>