Various changes to support the warehouse and merchant building warps.

1 files changed, 9 insertions, 9 deletions

diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index c6ee41fd..3d112331 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="81" tilewidth="32" tileheight="32" backgroundcolor="#5a5a5a">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="70" height="81" tilewidth="32" tileheight="32" backgroundcolor="#5a5a5a" nextobjectid="6">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
@@ -51,17 +51,17 @@
  </tileset>
  <layer name="Ground" width="70" height="81">
   <data encoding="base64" compression="zlib">
-   eJztmU1uwjAQRg1i1x+pqFJ3lXoETkC7RKWX6AlyMe7QQ1CyZ0FuANva7Yw0DLZBqpGjybd4itMkUubps1M8jXOuAQAAAAAAAAAAAAAAAADAxdx47jPcqnv0ub63dj2lnLx6HjzjiXMzfxwR4Twc53QP/12fz9Q1C27uPB+eF8+TqpXPl3TPSJ3/uvR0ngk9E64996CuUl52ng0decywhzXhx1/sckpeHoUzC14a5UT62NPxW7HwvHsOgo6OC0Ne2EPMTxivFdJF5479HHpQzzXysnOnfnRedEbkuOtBPSW9xDiXF+3GWl5S8yiVl84dzyF9rF3PNfMivcSeya0xtespnZfUdzr3rMV1RedFe8nlZQiE+rfKyVa4qf1+tWAPLXlo3XF2ar9fzby0yguPhzyPNhkvQ85L8PI5Ss+j1aT+O9ZgF/Ei3cDL6ZwaspfUPMJ3GutujNR3+pLfAZbh+jGPTr3w//3sgn8XyLyc66dY6pPIvOg9O7m+cD/lzf3tb6+opzKmcegHhP6AlT5JoxzE9qUacsK9kuCGeyhT8hL6AaE/YK0fkNvj5T6J7JWkWPagnmt42UfcsBe9n5midj0lvcT26ngcywXvSzDyWu16SqHXFD2PYploI1jNS2qfN5aXTjk5OJt50XNHcum6Yi0vsd7rubzkqF1PKWK9Ebm+8H1Dy8t/sJgTAAAAAAAAAAAAAAAAAAAAAKzwA+1MPIQ=
+   eJztmU1uwjAQRg1i1x+pqFJ3lXoETtB2iQqX6AlyMW5DyZ4FuQHZ1m5nJDMZOyyCHE2+xZNt4kiZp7FDPJVzrgIAAAAAAAAAAAAAAAAAwNXceR4z3Is5ciznlo5nKCcfnifPfOHcyrczIoxD+05z+Hc5XolrFtw8eLaeN8+LiJXHG5ozE+M/l57Gs6B7wrXXEcQ1lJeT50At9xn2sCd4HFwuyctz5MyCl0o4iX2cqf0RrD1fYi6zNuSFY9L8hP5e0BIN0QpKx3OLfDm5rh+ZL7EX2W9GEM+QXjT68kW6sZYvqXWUypfGXa4h2ZaO55b5EnvR7sntMaXjGTpfUu/p3L0W9xWZL9JLLl+mQIj/KJwcIzeln68U7KEmD7W7zJ3Sz1cyX2rhhftTXkeHjJcp50vw8j1Lr6PdovwzluCkeIndwEt3TU3ZS2od4T2NfVcj9Z6+5jvAMhw/1lHXC//vZxf8XRDnS189xVKdJM4XeWYX7y9cT/l0/+fbO6qpzKkf6gGhPmClTlIJB9q5VEVOuFYS3HANZUleQj0g1Aes1QNyZ7xcF9m6/rOazQjiuYWXs+KGvWi1FFk7sLRPp2pqWj8+n6ld95vBkhcZd25d8W+1grX/O3JtaOeZ0k8jnLTRtdLxDJkv2trJ7a/a+8tavqT2z5yLlBtL+0vKgYyzz5M1L0M4hQ8AAAAAAAAAAAAAAAAAAAAAxscvbz894Q==
   </data>
  </layer>
  <layer name="Ground2" width="70" height="81">
   <data encoding="base64" compression="zlib">
-   eJzt2cFKw0AQBuBJixQ8eCmCZytePCioeNKTeC8WoVQPxScQn0Df0PQJpO0DmOrdHXYGtmuaRkybuvt/sOwGUkh+tjNNQwQAAAAAAAAAAAAAAFCdlszHCdFVYo95dm0n/qfCtyd5nMi931G5HJorvap6dQuGf446b9i5bcZOgPvowVkfyP31ZD4089g7ZygzZ7RvRoc/R/OZhebM5LDlDDb2zumbMVjw+f4Kr23des534FrWu4kdN8nPXF7WdmX16pp7vy2oD7Hm8mQyef5F3YwlF6he5ozQvJmRmjFacByrd5k/yWbyJcd+vY3NB9n9wTNnMZPjWZ0XtQF4v2h90D2SEfYL55LKWrNICbkMzW+Xi8TWFs6C620mc6cZbz5D+U3H9ZYz4Po7kvVR5LlcmjElm8GEbM3l9WnkuTD0o3naj3SPEKEfMfSjfNyHMsrvRzHT5wCtt1M5jn2/cL3V+pJ3nKflrEN+H/AX7bovYAP471BCfh/w2ih3nvuuRP+j0aE1+r7KC9sAvSX/e/uZ8DPDTNZcj/TZITRF7wT8vsT9izPgPCbOOrT+xXuFnwUeS+bCGXAv5zx0z2iPD03Ru5K8faC9XEeImSwT2vejClnJXgUAAAAAAAAAAAAAAAAA8F98AyVChL4=
+   eJzt2cFKw0AQBuBJixQ8eCmCZytePCioeNKTeC8WoaiH4hOIT6BvaPsE0vYBTPXu/mQGtjHWFNum7v4fDLuBFJKf7WzTiBARERERERERERERES1OQ8fDROQiyY4x+jaT/KfCt6N5HOm930i5HOpLvapqtWdU/hxzWsvGpqutANfRvTff0/vr6LjvxmHunJ6OyGjXVQufk+nMQnPictjwCoa5c7qubl2lBdVd3aUuXcf7Dly6+bZXV8n3XJ5XenXVabt7v57RH2LN5dFl8jRH34wlF1o8v+eG5tVV39Xgh+NYven4IVkmn3qc77exeZdsfWBEFhM9nlR5UWsA68X6g62RVLhekEtf55ZFX5hLz/12OUuy3oIs0G9THVv1ePPp6W869FtkgP470PlB5LmcuxpLlsFIsp6L+XHkuQD3o2m2H9kaEeF+BNyPimEfSqV4P4qZPQdYvx3rcezrBf3W+kvRcZGGNw/5fcBfNKu+gDWQf4cS8vuAl1q58/x3JfYfjZX16LtFXtga6Mz4fxf3ms8EzwwTnaMf2bNDaH57J+DD/oUMkMfIm4e2f2Gt4FngoWQuyAB7OfKwNWN7fGjmfVdie7lViJnQ/NKSexURERERERERERERERER0X/xBblChXs=
   </data>
  </layer>
  <layer name="Fringe" width="70" height="81">
   <data encoding="base64" compression="zlib">
-   eJzt2T1PAjEYwPEWXJkcjYqLQtTBQeMLDmp0921RNz8BmPA93Nyd/DiGT2AiH+AElNGnubtwHNwdJMpL+/8lT0K5Hmkfem1zVQoAAAAAAAAAAODvnMfKF0PqbOlJtGS23E67ATPsOafUgkRBIi+xHhkf5vt6Lvne3ZRr8+hH+tMN+lSMPScv8v3DCL+xIfVKluXlO9afkuSmIlGQ2Bsyn1QT7mtJuW1ZboyDvFKHEkcSlfxg2TXbevD5AZKcpMwJpxbOF6NyeQ5Jw3jJ1ph2A2bIu0RT+Tn5CMqfihyFz1FL+XnxItdcfo4uZe9yJXGte+MFviXJyaPujZe28sePsebwOrUZyUtc2eG8FFLysuNwXsqSkzPNehRVlXzUJJ4061Hcje7fv8AfHx3Vv38J1yPXx0vIy64ClTxe4mcqNkp7z+Al5MWFM5VSrj/KGXOKOS+5k7iXeA3q1oLzFZssS39WJFYlihKLCf2rB/WSrod1XDHs/Mjs+8x63giiOdEWTc7bmP+zWcPD9zbhZxsdy75uf4yzErO/8YIween8T7MwR8Jz1S+H5tIstp41AwAAAAAAAAAAAMAv1S9PvQ==
+   eJzt2b9OAjEcwPH2cGVyNCouClEHB41/cFCju/8WdfMJwIT3cHN38nEMT2AiD3AC6uivuWu4O7gDEhG8fj/JL7neFdL+6LUNVQoAAAAAAAAAAOD3nCbKZwPqbOi/aMlsuZ52A2bQnKfUo9crF+W6ILGq43UaXv9nre2MZ//Rl/TnO+xTKfGePMn9uxG+Y03qlXOWl89Ef8qSm6pEUWJnwHxSS/lcW8qdnOXG2CsotS9xIFEt9Jdds6n73x8gzVHGnHCcw/liVC7PIVkYL8M1p92AGfIq0VJBTt7C8rsiR/Y9aqsgL37kmcvv0bnsXS4kLnVvvCCwIDm5173x0lHB+DFWHF6n1iN5Sao4nJdiRl62HM5LRXJyolmPomqSj7rEg2Y9SrrS8f0LgvHRVfH9i12PXB8vlj+8ClT6eEmeqeRR1v8MfkpeXDhTKXvxqAyZU8x5yY3ErcRzWLfuBffzZFH6sySxLFGSmE/pXyOsl/bc1nGZ2feZ9bwZRmu6zZmYlzF/Z7OG2/9t7HUeHcq+bneMsxKzv/HDMHnpTqZZ+EfsueqH43NpVF7PmgEAAAAAAAAAAADgB3J/T2E=
   </data>
  </layer>
  <layer name="Over" width="70" height="81">
@@ -75,11 +75,11 @@
   </data>
  </layer>
  <objectgroup name="Objects">
-  <object name="To Artis North" x="1312" y="992" width="32" height="32"/>
-  <object name="To Storage" x="1312" y="800" width="32" height="32"/>
-  <object name="To Artis Middle" x="1064" y="1214" width="32" height="32"/>
-  <object name="To Merchant Room" x="1312" y="1760" width="32" height="32"/>
-  <object name="To Artis South" x="1312" y="1504" width="32" height="32"/>
+  <object id="1" name="To Artis North" x="1312" y="992" width="32" height="32"/>
+  <object id="2" name="To Storage" x="1312" y="800" width="32" height="32"/>
+  <object id="3" name="To Artis Middle" x="1056" y="1248" width="32" height="32"/>
+  <object id="4" name="To Merchant Room" x="1312" y="1792" width="32" height="32"/>
+  <object id="5" name="To Artis South" x="1312" y="1536" width="32" height="32"/>
  </objectgroup>
  <layer name="Heights" width="70" height="81">
   <data encoding="base64" compression="zlib">