Adding new room to 021-2.

1 files changed, 18 insertions, 8 deletions

diff --git a/maps/021-2.tmx b/maps/021-2.tmx
index 53ab86ca..86086a85 100644
--- a/maps/021-2.tmx
+++ b/maps/021-2.tmx
@@ -7,38 +7,41 @@
  <tileset firstgid="1" name="Inn" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/inn.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="257" name="Inn x2" tilewidth="32" tileheight="64">
+ <tileset firstgid="257" name="inn2" tilewidth="32" tileheight="32">
+  <image source="../graphics/tiles/inn2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="513" name="Inn x2" tilewidth="32" tileheight="64">
   <image source="../graphics/tiles/inn_x2.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="289" name="Inn x3" tilewidth="32" tileheight="96">
+ <tileset firstgid="545" name="Inn x3" tilewidth="32" tileheight="96">
   <image source="../graphics/tiles/inn_x3.png" width="512" height="192"/>
  </tileset>
- <tileset firstgid="321" name="Collision" tilewidth="32" tileheight="32">
+ <tileset firstgid="577" name="Collision" tilewidth="32" tileheight="32">
   <image source="../graphics/tiles/collision.png" width="64" height="32"/>
  </tileset>
  <layer name="Ground" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   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
+   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
   </data>
  </layer>
  <layer name="Lower" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3dy04TURgHcBpvERD23hI26sa1V7agEDeuFMJCjEQhLsT4BPoGunOpOx+BZ/Cy9v4O6t4PbcNwAu2U6XSm7e+X/DOnp9Mz36JDmdNmztgYAAAAAAAAAAAAg2w8MhGZrLoQKNFM4/92vs0+52OfC43dfScjpyKn93l+PB5PRD5E+2PkU68KhiHxLfI98iPys9pSAAAqc7RRvD1XTmlQmXuR1cj95rZIe63PtUPZnkQ2e5jU8cYenQXdavPcoTje4ciRAxz3XGP3tg7SWqYi013svxBZ7HFN1NtKpp19P6TvjZkO7/PW/HRrTrqfjjWP1zp2Olee/f+12/qyr12KLBeqlEGz0nmXf9p9zoyK9chG1UXQV3nPj8dtntu+7no2tnMNlV5TtfKguS3Tr5LHZ7Sk58fVyLXI9aR/NvJ+bO/v8ru97hpUzr3eODFA46afC9nfvKR8l08vnBmgcWdLGBNSvyN/mu2yzo+LJY0L/VTW+eFvPcOgrPMDAAAAAAAAAAAAAAAAAAAAAABG0euajAF19K4mY0AdbTW36X2ku7mv9FbnXWCgpGsSpfdPzD5O1za6FLkcuVJeeVAr6X2k3VcadqT3kU4fW2cFiimydiyMkuy6ZsBu2XXNYNiNRyaSTFZaEdTH58iXJF8rrQj6a6YH19VlrYMLVZkr+Prs3G/6PeN8wbGhCquZrOXYP+/1h3UMGQabmTzNsX/e6w+fH7A/v0sBAAAAAAAAAAAAAAAAAAAAAIByPI+8qLoIKOBsZCGy2GzfiNzs0J/Xy8irXhYLFViKLDfbdyJ3O/S3tFuf83bkTeRtTyuF/luPbDTbDyOPOvQDAAAUMRWZrroIGBCt+dxtrXneg/TDMMozz5unH4ZRnnnePP0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABV+wsXLUCJAHECAA==
+   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
   </data>
  </layer>
  <layer name="Fringe" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3d2U3DQBAAUFtcIamC/EAboQIqQKIgSqMAvimBXz5YJCw5a+wYH1kf70mWc0pjaSajzUqeLAMAAAAAAAAAAABYr7fUAQAAAMDMvKQOABjUV+oAJuIiz7LLcFzlqSNhSj7CcSsnAOig3D+u8+Pzj5uW/eV5uJBGdx+u6SG6rm14vsubP8O6vf6en5JGcX5xbTCex9QB/NPS1h9/5bpewFA28ogRHVIHADOU1/wu171+DvF6vO0ZutI/6t2pL4J9zzzo+30AAAAAAAAAAAAAAAAAAAAAAACAtaublbG0e6RDH0U9tJ0tAxyLa0ePgSrzNuC0lHMOYCrKMzTM04Cq94b3zMoDoKz4fypej1ufQ1XT2sO+CWvTZX/DnghUFf1DfbAW5Vzf1DwGAAAAAAAAAAAAAAAAAAAAAAAAAADmwXxOOM39d1m6bcjxXYs836sFVqZtbQBA7DN1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAS34OcWqEAcQIA
+   H4sIAAAAAAAAA+3dy03DQBAAUGN+IamCXKANqIAKkCiI0iiAMyVw5cAiYcmxsWP8ydre9yTL+UpjaSajzUqeLAMAAAAAAAAAAABI11vsAAAAAGBhXmIHAIzqK3YAM3GeZ9lFOC7z2JEwJx/huJETAPRQ7h9X+eH5x3XH/vI8XkiTuwvXdF+5rm14vsvbP0PaXn/PT1GjOL1qbTCdx9gB/NPa1h9/5bpewFg28ogJPcQOABborOF3uen1U6iux7ueoS/9o9mt+iLYD8yDod8HAAAAAAAAAAAAAAAAAAAAAAAASF3TrIy13SMdhijqoetsGeBQtXb0GKgzbwOOiznnAOaiPEPDPA2oe295z6w8AMqK/6eq63Hrc6hrW3vYNyE1ffY37IlAXdE/1AepKOf6puExAAAAAAAAAAAAAAAAAAAAAAAAAACwDOZzwnHuv8vabUOO7zrk+V4tkJiutQEAVZ+xAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACi+Aak/i8rAHECAA==
   </data>
  </layer>
  <layer name="Over" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3dSwqAIBAA0O5/wY5SywhaRDRlHwv1PZhFIuJCZXTRdB0AAAAAAAAAAAAAAAAALRk28WQcqI39ATH7A/Lr/54AAADATfN9f1xi/X6w/X4roCR769d6BgD2fJEb5MjPz+4AtCXKf6M+qe3R2KUodd58Y31+PmkHAAAAAAAAAAAAAAAAAAAAAACA3Pw7HAAAOKL+EAAAAAAAANQvta5xVJP2SgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtG5cAoB6pNT9UPMDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAo2QQ0jrgHAHECAA==
+   H4sIAAAAAAAAA+3dwQqEIBAA0P7/B/uUOsZChwintW0tJt+DOSghHjRGD84wAAAAAAAAAAAAAAAAANCTaRdXxoG3sT8gZn9Ae+PTEwAAAPjR57w/r7G9P9i3/xWQSWn9Ws8AQMkduUGL/PzbGYC+RPlv9E1tfzR2FlnnzT22/88r/QAAAAAAAAAAAAAAAAAAAAAAANCat8MBAIAjGesPRW+tAwAAAAAAAGW1dY2jmrRnAgAAAAAAAAAAAAAAAAAAAAAAAAAAAACgd/MaALxHTd0PNT8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIDMFqxyZCEAcQIA
   </data>
  </layer>
  <layer name="Collision" width="200" height="200">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3cS27DIBAA0PZqvf+huoqELMBQPmPcN9JTHIwJA4O8y8/319cPAAAAAAAAAAAAAAAAAAAATLYqdueQ5nLNK3qNW+ef25frdc+e5fpG53qaVfGk+UevccT6n7QGT/aG/Uh/M/28zuOJtXJds561rbWV9jc639Osiqj66qmdJ5i51nd9npb7CUrrOGvPduYwu+525FUa/67tKfN/u9z6rYjT5786D55pV33tmPuOiN4v9srtf6kuetp31VU6h9bPkYjeL/bK7f+qiM51NLfouRNfLzPrSH3xVqW67m0HAAAAAAAAAAAAAAAAAAAAAACAnNL/utXuX59v/d84OEWphkvnxTngP8nVdsv3Wr/onGCW0ciNUfqN6Fyh16wojZW2R+cKvf5Su3dnonaG4CSzavc6jvPBG8w+H94fvEmpjmu1fde3ZQw4QUut5+7n+n7aSmPD6Wpno+e5XHt0bjDq7v3R8lyuPTov+IvWSPunz5XGyLVH5wq9eqKnf65vdK4AAAAAAAAAAAAAAAAAAAAAAADEG4naOLl70blCr7RuW69nnCc4wUit1747H7zBaPSMEZ0r9ErrduZZcD54o5URnRv0uqvl0Wvng5N96nZVROcHI+7qetY1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAlF9UvavJAHECAA==
+   H4sIAAAAAAAAA+3c24rDIBAA0GU/rf//Ufu0IEETrZeJcgYOTY2xjo70LZ/fn58PAAAAAAAAAAAAAAAAAAAADDYrVueQ5nLNK3qNa+ef25frdcue5fpG57qbWfGm+UevccT677QGb3bCfqS/mX5e5/HGWrmuWcva3rWV9jc6393Miqj6aqmdNxi51k993pb7DkrrOGrPVuYwuu5W5FUa/6ntLfM/XW79ZsTu85+dB++0qr5WzH1FRO8Xa+X2v1QXLe2r6iqdQ+1nT0TvF2vl9n9WROfam1v03Imvl5F1pL44VamuW9sBAAAAAAAAAAAAAAAAAAAAAIBxvOeHk5Te63Z3//p87XvjRs7ZO7eYqVTDpfMScQ5qc7jOG3rlarvm+12/qLlHnU/O1Ru5MUq/sWru0WvKOUZFaay0fdXco9eUc3xTU09nQt1yilG1ex3H+eAEo8+H/w9OUqrju9p+6lszBuygptZz93N9/9tKY8Pu7s5Gy3O59ujcoNfT/0fNc7n26LzgG7WR9k+fK42Ra4/OFVq1REv/XN/oXAEAAAAAAAAAAAAAAAAAAAAAAIjXE3fj5O5F5wqt0rqtvR5xnmAHPbV+99354AS90TJGdK7QKq3bkWfB+eBEMyM6N2j1VMu9184HO/uv21kRnR/0eKrrUdcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABR/gCmq0bsAHECAA==
   </data>
  </layer>
  <objectgroup name="Objects" width="0" height="0">
@@ -119,5 +122,12 @@
     <property name="dest_y" value="3072"/>
    </properties>
   </object>
+  <object name="To Main Room" type="warp" x="2240" y="1856" width="32" height="32">
+   <properties>
+    <property name="dest_map" value="021-2"/>
+    <property name="dest_x" value="1344"/>
+    <property name="dest_y" value="1728"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>