Various Bug and level fixes

hawkthorne · Jun 18, 2016 · d121041 · d121041
1 parent 16ea2e8
commit d121041
Show file tree

Hide file tree

Showing 13 changed files with 147 additions and 117 deletions.
diff --git a/src/images/tilesets/greendale-lounge.png b/src/images/tilesets/greendale-lounge.png
diff --git a/src/items/improvements/hologram.lua b/src/items/improvements/hologram.lua
@@ -3,7 +3,7 @@ return{
   description = "Pierce's Hologram",
   type = "improvement",
   subtype = "improvement",
-  info = "Before he passed Pierce donated money to install a hologram near the Library.  Unfortunatly the Dean spent the money purchasing Honda products.",
+  info = "Before he passed Pierce donated a hologram near the Library.  It's currently broken and the Dean spent all our extra money on Honda products.",
   MAX_ITEMS = 1,
   quantity = 1,
   directory = 'improvements/'

diff --git a/src/maps/borchert-pool.tmx b/src/maps/borchert-pool.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="42" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="42" height="14" tilewidth="24" tileheight="24" nextobjectid="8">
  <properties>
   <property name="autosave" value="false"/>
   <property name="blue" value="249"/>
@@ -8,10 +8,10 @@
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
- <tileset firstgid="1" name="pool" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="pool" tilewidth="24" tileheight="24" tilecount="120">
   <image source="../images/tilesets/pool.png" width="240" height="288"/>
  </tileset>
- <tileset firstgid="121" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="121" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
  <layer name="city_little_clouds" width="42" height="14">
@@ -61,37 +61,37 @@
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="120" y="216" width="96" height="48">
+  <object id="1" name="main" type="door" x="120" y="216" width="96" height="48">
    <properties>
     <property name="level" value="borchert-hallway"/>
     <property name="to" value="pool"/>
    </properties>
   </object>
-  <object type="liquid" x="528" y="264" width="480" height="72">
+  <object id="2" type="liquid" x="528" y="264" width="480" height="72">
    <properties>
     <property name="drag" value="true"/>
     <property name="opacity" value="0.7"/>
     <property name="speed" value="0.2"/>
     <property name="sprite" value="images/liquid/water2.png"/>
    </properties>
   </object>
-  <object type="info" x="288" y="210" width="108" height="24">
+  <object id="3" type="info" x="288" y="210" width="108" height="24">
    <properties>
     <property name="info" value="State-of-the-art judge's table, which has its own built-in sound system,| so take that Yale."/>
    </properties>
   </object>
-  <object type="bouncer" x="541" y="180" width="60" height="30">
+  <object id="4" type="bouncer" x="540" y="168" width="60" height="30">
    <properties>
     <property name="dbval" value="1420"/>
    </properties>
   </object>
-  <object type="climbable" x="486" y="216" width="12" height="48"/>
-  <object type="info" x="48" y="216" width="24" height="48">
+  <object id="5" type="climbable" x="486" y="216" width="12" height="48"/>
+  <object id="6" type="info" x="48" y="216" width="24" height="48">
    <properties>
     <property name="info" value="You can faintly hear the sound of water running and someone singing."/>
    </properties>
   </object>
-  <object type="info" x="0" y="216" width="24" height="48">
+  <object id="7" type="info" x="0" y="216" width="24" height="48">
    <properties>
     <property name="info" value="You can faintly hear the sound of water running and someone singing."/>
    </properties>

diff --git a/src/maps/greendale-computer-wing-2.tmx b/src/maps/greendale-computer-wing-2.tmx
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="24" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="5">
  <properties>
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
   <property name="red" value="104"/>
   <property name="soundtrack" value="computer-wing"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
- <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24" tilecount="230">
   <image source="../images/tilesets/greendale-computer-wing.png" width="240" height="552"/>
  </tileset>
- <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
- <layer name="background" width="24" height="14">
+ <layer name="background" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJxzZ2BgcKchZqExFgDiAChNbQw0t2HU/FHzKTU/CojzaICB5jZUAOkUIOajAQaa20Ars+mFaVm2gTAAhx0vVw==
+   eJxzZ2BgcKcBZqERFgDiAChNLQw0r2HU3FFz0c2NAuI8KmKgeQ0VQDoFiPmoiIHmNVDbTFpjWpQ5IAwA7bYsIw==
   </data>
  </layer>
- <layer name="foreground" width="24" height="14">
+ <layer name="foreground" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFgwWIQmkxBoYGcs2QoI5T6A4SILhhDZBei0PNViDeBsTbgXgHEOsA8TEgPo6kJhC3+Q5AfACf+SBwAIgPIvEvAPFFJD4vlD4ExIeB+AgQH8VijhwSOxqIY/DYiQzEofQZID4LxOeA+DwWdRpI7GvAcEsj0nxigRGVzSMFNABxIxA34ZAvB2IfIPall4PwAADRRxpi
+   eJxjYBgF9AKiUFqMgaGBVL0S1HUKzUACBDesAdJrcajZCsTbgHg7EO8AYh0gPgbEx5HUBGKa6wDEB/CZCwIHgPggEv8CEF9E4vNC6UNAfBiIjwDxUSR5OSR2NBDH4LELGYhD6TNAfBaIzwHxeSR5DST2NWD4pBFpLiFgRCVzSAENQNwIxE045MuB2AeIfenlICQAACFDGmI=
   </data>
  </layer>
- <layer name="fade" width="24" height="14">
+ <layer name="fade" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJy7xMDAcGkUj+JRPIpHMckYANr7E7A=
+   eJy7xMDAcGkUj+JRPIqHAQYAFh78qQ==
   </data>
  </layer>
- <layer name="collision" width="24" height="14">
+ <layer name="collision" width="22" height="14" visible="0">
   <data encoding="base64" compression="zlib">
-   eJx7zsDA8JyGmAGJphUYNX/UfFqZz8gIwehADCgmjkUcl/nEqkUGUlC7JbHoRXYTLcOHlmUDreOVHgAA5HQ02w==
+   eJx7zsDA8JwGmAGJpjYYNXfUXGLNZWSEYHQgBhQTxyKObi4hNdiAFNROSSS9yG6gRTjQIg/TKr5oCQCeszE/
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="288" y="192" width="24" height="72">
+  <object id="1" name="main" type="door" x="288" y="192" width="24" height="72">
    <properties>
     <property name="level" value="greendale-computer-wing"/>
     <property name="to" value="wing2"/>
    </properties>
   </object>
-  <object type="info" x="372" y="204" width="42" height="36">
+  <object id="2" type="info" x="372" y="204" width="42" height="36">
    <properties>
     <property name="info" value="They're just a bunch of basketball cards with white people on them."/>
    </properties>

diff --git a/src/maps/greendale-computer-wing-3.tmx b/src/maps/greendale-computer-wing-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="24" height="14" tilewidth="24" tileheight="24" nextobjectid="4">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="4">
  <properties>
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
@@ -13,34 +13,34 @@
  <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
- <layer name="background" width="24" height="14">
+ <layer name="background" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJxzZ2BgcKchZqExFgDiAChNbQw0t2HU/FHzKTU/CojzkHAFGp9cDDS3AWRWChDz0QADzW2gldn0wrQs20AYAJkVL2E=
+   eJxzZ2BgcKcBZqERFgDiAChNLQw0r2HU3FFz0c2NAuI8JFyBxicVA81rAJmRAsR8VMRA8xqobSatMS3KHBAGAP4eLC0=
   </data>
  </layer>
- <layer name="foreground" width="24" height="14">
+ <layer name="foreground" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJztzkduwkAYhmFfAsQZyCVDyTIgJHrvPQFCaAEh2EFYAqFlQwnn4I3EYmTZkk28yIJPeuTx+J/PI0n3/IdYDOgwX58mA7puyQprbLDFDt+w4kHlTAVVvGjo3+OAI074wRkeYcYLn/DeQhsddGV9fjjgxJOwPxTWYUQQRQxxJGQ9I4wV7pvEM1xwC/sTYZ1FDnkUUERJ+N7DB/oYyPrLCCCIkML/f/OKGupo4A1NlVl53pFCGhmNZ5QyxSdmOs48wga7htk5FljiS+/l/pgLXmMz8A==
+   eJztzslOAkEQxvF5CQ3PAC8JCEcgJoDIvsiOyKpsIXgTOMomcEGQ5+B/GJLKhNFMIJz8kl+6u7qq04ryn2vEdMbsrbreXOIjBjLHAl9YYoU1zLDozBRRwvMv727wjS12+MEe96LHC584N/GKN7TUmh93cMApevtiH0QIYUQQRUzznwHexTkOF9zwiPqH2D8hjQyyyCEv7tvooIueWivgAQE8KqdTxgsqqKKGuk7vMQ0kkETqj15thhhhbHDOChvsOvefmGCKmcG3z8kB4bQz8A==
   </data>
  </layer>
- <layer name="fade" width="24" height="14">
+ <layer name="fade" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJy7xMDAcGkUj+JRPIpHMckYANr7E7A=
+   eJy7xMDAcGkUj+JRPIqHAQYAFh78qQ==
   </data>
  </layer>
- <layer name="collision" width="24" height="14">
+ <layer name="collision" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJx7zsDA8JyGmAGJphUYNX/U/KFuvhgjBIOAOCNCXArIlmCEiEkyYtf7HE0PNQEtywZahzs9AAAxuDUb
+   eJx7zsDA8JwGmAGJpjYYNXfU3MFirhgjBIOAOCNCXArIlmCEiEkyoup5jqaWGoAWeZhW4UpLAADkMDF/
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object id="1" name="main" type="door" x="552" y="192" width="24" height="72">
+  <object id="1" name="main" type="door" x="504" y="192" width="24" height="72">
    <properties>
     <property name="level" value="greendale-computer-wing"/>
     <property name="to" value="wing3"/>
    </properties>
   </object>
-  <object id="2" type="hiddendoortrigger" x="114" y="204" width="36" height="24">
+  <object id="2" type="hiddendoortrigger" x="114" y="204" width="36" height="60">
    <properties>
     <property name="height" value="24"/>
     <property name="message" value="Do you want to select a song?"/>

diff --git a/src/maps/greendale-computer-wing.tmx b/src/maps/greendale-computer-wing.tmx
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="32" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="32" height="14" tilewidth="24" tileheight="24" nextobjectid="8">
  <properties>
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
   <property name="red" value="104"/>
   <property name="soundtrack" value="computer-wing"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
- <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24" tilecount="230">
   <image source="../images/tilesets/greendale-computer-wing.png" width="240" height="552"/>
  </tileset>
- <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
  <layer name="background" width="32" height="14">
@@ -33,39 +33,34 @@
    eJy7xMDAcGkUj+JRPIpH8SgeYRgAcYdvkA==
   </data>
  </layer>
- <layer name="collision" width="32" height="14">
+ <layer name="collision" width="32" height="14" visible="0">
   <data encoding="base64" compression="zlib">
    eJx7zsDA8HwA8SgYBaNgeAExRgYGcUby9Q4kYATaLwXEkoyo7pGC+kmMESHGSIRbkf2DrP4fA6T8+zNAmIFxtPwFAQDG9z5G
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="6" y="216" width="48" height="60"/>
-  <object type="info" x="72" y="216" width="24" height="48">
-   <properties>
-    <property name="info" value="Hello, rich people?"/>
-   </properties>
-  </object>
-  <object type="climbable" x="24" y="60" width="12" height="198"/>
-  <object type="door" x="0" y="30" width="48" height="30">
+  <object id="1" name="main" type="door" x="6" y="216" width="48" height="60"/>
+  <object id="3" type="climbable" x="24" y="60" width="12" height="198"/>
+  <object id="4" type="door" x="0" y="30" width="48" height="30">
    <properties>
     <property name="instant" value="true"/>
     <property name="level" value="greendale-lounge"/>
     <property name="sound" value="false"/>
     <property name="to" value="vendingmachine"/>
    </properties>
   </object>
-  <object type="info" x="624" y="216" width="24" height="60">
+  <object id="5" type="info" x="624" y="216" width="24" height="60">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object name="wing3" type="door" x="408" y="216" width="24" height="60">
+  <object id="6" name="wing3" type="door" x="408" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-computer-wing-3"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object name="wing2" type="door" x="216" y="216" width="24" height="60">
+  <object id="7" name="wing2" type="door" x="216" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-computer-wing-2"/>
     <property name="to" value="main"/>

diff --git a/src/maps/greendale-exterior.tmx b/src/maps/greendale-exterior.tmx
@@ -43,12 +43,12 @@
  </layer>
  <layer name="leaves" width="240" height="18">
   <data encoding="base64" compression="zlib">
-   eJztmTlOw0AYhScdCIrABUgR6B3WUIBTWFQU3CANF4ALzEWQ0kFDD4LCDYtEJGhZJDgKbxRbOMbxNhMvyfukp9ie7fc/eWNnIgQhhBBCCCFEF0cI2xJioIRjt+x4CCHpUN6NuOYWHwmpIgtY02PKWsVFQsI4MXPDZ/HsotbstHNL/1YXK7ncLSKOuuKMJMuOIwvB962wh+FH15AGBd/WXBLnX5T16/bdLJrFmuWnqN9K9G8xqOeH8mlY9O1s4kRfk6bHqZt/EW8/LuZhgbGQatCEVqDVDG0eoEfoCXqeRlBifM1W3kV8EnHKZsjH29AOtAvtZRwjyb/hsXTJk2syu9xAt97xGXSeo482tA5tZGjzDn1An9BXjjHzgPgk4pRqL2pTiB9fqix478GyJCX5t23Yv3lyPU9cTzjO0k6HS+jKUF9BOt7+aWdK+6jdHG3yrhdBsua9a9hPpt+f0+RE5Xrf5KBkjBdoqSHEcuN/mb+H4u+vWN78+9fvoPu/urZV8u+ri5T1jqfQZ1T9U03/HXvt/ednL6JOT6R/Buv69yRdHTd4Hl6DtxLaD1PmLOu8mMJ/B9Ihah7z8g2twbutCP+GsUeS/vkr9BZTXibBteRQo59JnonDFubyoPZwTPTj9TXQaa+TR3skeYTPg4p8RyYxjPg/gBBCCCGEEEIImXd+AW5rfb8=
+   eJztmbtOwzAYhd0NBEPhBehQ2FuuZYB0iJg68AZdeAF4gTxKN1jYQTBk4SJRCVYuEjwKx2oi0pDmYrtu0p5POmoSx/afPzl24gpBCCGEEEII0cUVwmkJMZDCtj/reAgh+ZDeTTjm24+ElJEljOkpZQ17kZA4bsq94Vw8v8gxO++9pX/LSyu73LcRR1VxR/JmHUcRou9bcQ/Dj74hDSxf1kKS5l+U9av2bNpmuWL5sfWtRP/aQc4f0qdx0bfziZt8zDPdT9X8i3j7aTEPLcZCykEdWoPWC9R5gB6hJ+h5GkGJ8TFbehfxeYjTq8d8vAvtQfvQQcE+svwb70sXlVyT+eUGug22z6ELhTaa0Ca0VaDOO/QBfUJfCn2qgPg8xOnJtahtIX5CybLotUfLspTl36Zh/6rkepG4nrBdpJ4Ol9CVobaitIP10/aU1lE7CnVUx4soRfPeMewn0+/PeXIic31oslMyxgu0UhNitfa/LFxDCddXWsH9D4/fQfd/5zqtinxf9Sz1c6bpv15QP5w/uwnndEX+OVjXv6f5zvGj+/ExeCej/rDkazzhO5AOSfdRlW9oA95tJPg3jjOSF+6/Qm8p5bMkOpYca7QzyTNpOMJcHuQajol2grYGOvV18uiM5J3g96gkz8gkhgn/BxBCCCGEEEIIIYvOLxBRe0s=
   </data>
  </layer>
  <layer name="lampposts" width="240" height="18">
   <data encoding="base64" compression="zlib">
-   eJztmr1OwzAUhd0NxFJ4AobCBlIb/spA0yGCpUPfoAsvAC+QF6nUDRZ2EAzZqQTiZ4aRh2DgusTEWI7jOiFtyvmkIyLbuffW8XFaC8YAAAAAAAAAeQkY85uMjbjoOpp1PQAAO7h3NW1R+ZWAeWSJ9nRD33p5lQCVwPBs8C5eXPiebfts4d/5pZndH5VRR1UJvhXOuo5pkL9vqR4mP0YFaVTyx/qXmPxLfYOqrc2yWa7Y/JT1Wwn+LQf+/uA+VQXfLiaBvi0sOk/V/Ev1Dkw1j0usBcwHddIqaW3WhSjIezb3LtUXUp1hXfHxLmmPtE86mDJHln/VXHmZ17kGs+GadBNfn5HOHWI0SBukzSnueSI9k15Irw45XaD6Qqoz5GdRHmPvQrxP/uxyX5ay/Nso2L8uc71orBj6rlKus3C5T1fHBenScqxNn6AVn5+2Cj5HFbnbRQa1zMlJm+u0OWkX7CfX789p9Zn2UHmuD3PkcMElVt78HyntXs64Joake0O/OEPh5yuepv2WdJe0Tf7XhF+baj5xrNWGYUa/yN0rMKZp/Cn5z+b5pc1JL/aveH92NWO6zP4d7Opf8Rn6FmP78doQ96h78E5GjrHlnqU+Fzmuyxrzfl//zNlWjbHtWtLG6xvHdcZ/J3ymxD3WtOmeoytvljFFHb40vw+kR2mMH/fralbj/DVNaa12cuRO84wJnyXzZJPTNIaf4ViEsMLVv6K+jnGU/h6Bz5K1caTxaN51IfvPJZbtPWONAAAAAAAAAACA/8AXY6+PNA==
+   eJztmrtOwzAUht0NxFJ4AobCBlIbbmWg6VDB0qFv0IUXgBfIiyB1g4UdBEN2KoG4zDDyEAwcl5gYy3FcJ7i3/5N+NfLt/HF8nNYqYwAAAAAAAICidBgL64wNuOg6nrQfAIAdPHc1ZbF/J2AaWaI93VC37s8JUOkYng3exfML37Ntny3yd3qp59fHPnzMKp0fRZP2MQ7y9y01hykf45I08HxbC4kpf6muP2tr0zfLMzY/vn4rIX/9wN8fPE9VIW/nk46+LCo7zqzlL/ntmzwPPXoB00GVtEpam7QRBXnP5rlL/iLyGVWVPN4l7ZH2SQdjxsjLXzVWUaZ1rsFkuCHdJtdnpHOHMWqkDdLmGH2eSS+kV9KbQ0wXyF9EPiN+FhUw9iHE6+R7l+vylJe/tZLz12Wu540VQ911xnUeLv10Pi5JV5ZtbeoEjeT8tFHyOaqI3SxzUMuYnKy5zpqTZsn55Pr9OcufaQ+V5/qwQAwXXMYqGv8zozwoOK6JC9KDoV6cofDzlUBTfke6T8tG/zXh1ybPJ45ey0DE7nqKd0r5Z/P8suakm+SveH+2NW3azP4d7Jq/4h56Fm17ydoQfdQ9eCcnxtBxz5LHdVljwd/r3znbqjC2XUnLuL9h4jP5HPGVMe6xpkz3HF15txxT+Ail+X0kPUltwqRe51kd57+pS2u1VSB2Vs6YCFk6TzYxTW34GY7FEFa45q/w1zK20vcRhCxdG0eaHC26LuT8cxnLts9QIwAAAAAAAAAAYBH4BgWVjMA=
   </data>
  </layer>
  <layer name="collision" width="240" height="18">
@@ -232,7 +232,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="movement">
+ <objectgroup name="movement" visible="0">
   <object id="35" name="airline" x="3763" y="85">
    <polyline points="1998,-3 -3768,0"/>
   </object>

diff --git a/src/maps/greendale-lounge-bathroom.tmx b/src/maps/greendale-lounge-bathroom.tmx
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="10" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="10" height="14" tilewidth="24" tileheight="24" nextobjectid="4">
  <properties>
   <property name="soundtrack" value="greendale-alt"/>
  </properties>
- <tileset firstgid="1" name="bathroom" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="bathroom" tilewidth="24" tileheight="24" tilecount="100">
   <image source="../images/tilesets/bathroom.png" width="240" height="240"/>
  </tileset>
- <tileset firstgid="101" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="101" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
  <layer name="Background" width="10" height="14">
@@ -21,7 +21,7 @@
  </layer>
  <layer name="Wall Features 2" width="10" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYKAv4GNgaMAnz8PAkMANpGGYnkCCTvYoI7H5scgLQ2kuIFaBstWBWBRNnSyU5kQSk6LYdfgBAHuCAiM=
+   eJxjYKAv4GNgaMAnz8PAkMANpAlhMQLmkAMkqG0gDqCMxObHIi8MpbmAWAXKVgdiUTR1slCaE0lMimLX4QcAuu0C+w==
   </data>
  </layer>
  <layer name="fade" width="10" height="14">
@@ -35,21 +35,21 @@
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="144" y="240" width="24" height="60">
+  <object id="1" name="main" type="door" x="144" y="240" width="24" height="60">
    <properties>
     <property name="level" value="greendale-lounge"/>
     <property name="to" value="bathroom"/>
    </properties>
   </object>
-  <object name="rope" type="spawn" x="48" y="264" width="24" height="24">
+  <object id="2" name="rope" type="spawn" x="48" y="264" width="24" height="24">
    <properties>
     <property name="nodeType" value="key"/>
     <property name="sound" value="false"/>
     <property name="spawnType" value="keypress"/>
     <property name="sprite" value="wastebin"/>
    </properties>
   </object>
-  <object type="info" x="168" y="240" width="24" height="24">
+  <object id="3" type="info" x="168" y="240" width="24" height="60">
    <properties>
     <property name="info" value="The lightswitch is broken!  Good thing you have that flashlight!"/>
    </properties>