hawkthorne · 8bitgentleman · Jun 13, 2016 · Sep 4, 2015 · Sep 5, 2015 · Sep 5, 2015
diff --git a/src/audio/music/computer-wing.ogg b/src/audio/music/computer-wing.ogg
diff --git a/src/audio/music/greendales-the-way-it-goes.ogg b/src/audio/music/greendales-the-way-it-goes.ogg
diff --git a/src/audio/sfx/open_the_door.ogg b/src/audio/sfx/open_the_door.ogg
diff --git a/src/images/enemies/billy.png b/src/images/enemies/billy.png
diff --git a/src/images/hiddendoor/closedsign-iso.png b/src/images/hiddendoor/closedsign-iso.png
diff --git a/src/images/hiddendoor/closedsign.png b/src/images/hiddendoor/closedsign.png
diff --git a/src/images/hiddendoor/jukebox-iso.png b/src/images/hiddendoor/jukebox-iso.png
diff --git a/src/images/hiddendoor/jukebox.png b/src/images/hiddendoor/jukebox.png
diff --git a/src/images/hiddendoor/jukeboxtrigger.png b/src/images/hiddendoor/jukeboxtrigger.png
diff --git a/src/images/hiddendoor/sandwich-curtain.png b/src/images/hiddendoor/sandwich-curtain.png
diff --git a/src/images/hiddendoor/vendingmachine.png b/src/images/hiddendoor/vendingmachine.png
diff --git a/src/images/hiddendoor/vendingmachinetrigger.png b/src/images/hiddendoor/vendingmachinetrigger.png
diff --git a/src/images/improvements/airplane.png b/src/images/improvements/airplane.png
diff --git a/src/images/improvements/hologram-drugs.png b/src/images/improvements/hologram-drugs.png
diff --git a/src/images/improvements/hologram-laser.png b/src/images/improvements/hologram-laser.png
diff --git a/src/images/improvements/hologram.png b/src/images/improvements/hologram.png
diff --git a/src/images/improvements/mascot.png b/src/images/improvements/mascot.png
diff --git a/src/images/improvements/shirleySandwich.png b/src/images/improvements/shirleySandwich.png
diff --git a/src/images/keys/flashlight.png b/src/images/keys/flashlight.png
diff --git a/src/images/keys/rope.png b/src/images/keys/rope.png
diff --git a/src/images/npc/borchert.png b/src/images/npc/borchert.png
diff --git a/src/images/npc/borchert_menu.png b/src/images/npc/borchert_menu.png
diff --git a/src/images/npc/bursar.png b/src/images/npc/bursar.png
diff --git a/src/images/npc/bursar_menu.png b/src/images/npc/bursar_menu.png
diff --git a/src/images/npc/carrotGuy.png b/src/images/npc/carrotGuy.png
diff --git a/src/images/npc/hologram.png b/src/images/npc/hologram.png
diff --git a/src/images/npc/hologram_menu.png b/src/images/npc/hologram_menu.png
diff --git a/src/images/npc/officercackowski.png b/src/images/npc/officercackowski.png
diff --git a/src/images/npc/officercackowski_menu.png b/src/images/npc/officercackowski_menu.png
diff --git a/src/images/npc/raquel.png b/src/images/npc/raquel.png
diff --git a/src/images/npc/raquel_menu.png b/src/images/npc/raquel_menu.png
diff --git a/src/images/npc/todd-sandwich.png b/src/images/npc/todd-sandwich.png
diff --git a/src/images/npc/todd-sandwich_menu.png b/src/images/npc/todd-sandwich_menu.png
diff --git a/src/images/shopping/improvements.png b/src/images/shopping/improvements.png
diff --git a/src/images/sprites/greendale/airplane2.png b/src/images/sprites/greendale/airplane2.png
diff --git a/src/images/sprites/greendale/bar.png b/src/images/sprites/greendale/bar.png
diff --git a/src/images/sprites/greendale/bass.png b/src/images/sprites/greendale/bass.png
diff --git a/src/images/sprites/greendale/lounge-booth.png b/src/images/sprites/greendale/lounge-booth.png
diff --git a/src/images/sprites/greendale/lounge-cart.png b/src/images/sprites/greendale/lounge-cart.png
diff --git a/src/images/sprites/greendale/lounge-chair-right.png b/src/images/sprites/greendale/lounge-chair-right.png
diff --git a/src/images/sprites/greendale/lounge-chair.png b/src/images/sprites/greendale/lounge-chair.png
diff --git a/src/images/sprites/greendale/lounge-couch.png b/src/images/sprites/greendale/lounge-couch.png
diff --git a/src/images/sprites/greendale/lounge-table.png b/src/images/sprites/greendale/lounge-table.png
diff --git a/src/images/sprites/greendale/officer.png b/src/images/sprites/greendale/officer.png
diff --git a/src/images/sprites/greendale/piano.png b/src/images/sprites/greendale/piano.png
diff --git a/src/images/sprites/greendale/profCornwallis.png b/src/images/sprites/greendale/profCornwallis.png
diff --git a/src/images/sprites/greendale/singer.png b/src/images/sprites/greendale/singer.png
diff --git a/src/images/sprites/greendale/soda-sign.png b/src/images/sprites/greendale/soda-sign.png
diff --git a/src/images/sprites/greendale/speakeasy-light.png b/src/images/sprites/greendale/speakeasy-light.png
diff --git a/src/images/sprites/greendale/speakeasy-microphone.png b/src/images/sprites/greendale/speakeasy-microphone.png
diff --git a/src/images/sprites/greendale/speakeasy-sign.png b/src/images/sprites/greendale/speakeasy-sign.png
diff --git a/src/images/sprites/greendale/speakeasy-table-1.png b/src/images/sprites/greendale/speakeasy-table-1.png
diff --git a/src/images/sprites/greendale/speakeasy-table-2.png b/src/images/sprites/greendale/speakeasy-table-2.png
diff --git a/src/images/sprites/greendale/speakeasy-table-3.png b/src/images/sprites/greendale/speakeasy-table-3.png
diff --git a/src/images/sprites/greendale/speakeasy-table-4.png b/src/images/sprites/greendale/speakeasy-table-4.png
diff --git a/src/images/sprites/greendale/speakeasy-table-5.png b/src/images/sprites/greendale/speakeasy-table-5.png
diff --git a/src/images/sprites/greendale/vendingmachine.png b/src/images/sprites/greendale/vendingmachine.png
diff --git a/src/images/tilesets/bathroom.png b/src/images/tilesets/bathroom.png
diff --git a/src/images/tilesets/greendale-bursar.png b/src/images/tilesets/greendale-bursar.png
diff --git a/src/images/tilesets/greendale-computer-wing.png b/src/images/tilesets/greendale-computer-wing.png
diff --git a/src/images/tilesets/greendale-exterior.png b/src/images/tilesets/greendale-exterior.png
diff --git a/src/images/tilesets/greendale-hallways.png b/src/images/tilesets/greendale-hallways.png
diff --git a/src/images/tilesets/greendale-lounge.png b/src/images/tilesets/greendale-lounge.png
diff --git a/src/images/tilesets/greendale-secret-lab.png b/src/images/tilesets/greendale-secret-lab.png
diff --git a/src/images/tilesets/greendale-speakeasy.png b/src/images/tilesets/greendale-speakeasy.png
diff --git a/src/images/tilesets/pool.png b/src/images/tilesets/pool.png
diff --git a/src/images/tilesets/sophiedance.png b/src/images/tilesets/sophiedance.png
diff --git a/src/items/improvements/airplane.lua b/src/items/improvements/airplane.lua
@@ -0,0 +1,10 @@
+return{
+    name = "airplane",
+    description = "New Airplane",
+    type = "improvement",
+    subtype = "improvement",
+  	info = 'City College has started an aerial ad campaign.  With a little money Greendale could start one as well!',
+    MAX_ITEMS = 1,
+    quantity = 1,
+    directory = 'improvements/'
+}
diff --git a/src/items/improvements/hologram.lua b/src/items/improvements/hologram.lua
@@ -0,0 +1,10 @@
+return{
+  name = "hologram",
+  description = "Pierce's Hologram",
+  type = "improvement",
+  subtype = "improvement",
+  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/items/improvements/init.lua b/src/items/improvements/init.lua
diff --git a/src/items/improvements/mascot.lua b/src/items/improvements/mascot.lua
@@ -0,0 +1,10 @@
+return{
+  name = "mascot",
+  description = "City College's Mascot",
+  type = "improvement",
+  subtype = "improvement",
+  info = "Pay someone to kidnap the mascot of Greendale's rival school, City College.",
+  MAX_ITEMS = 1,
+  quantity = 1,
+  directory = 'improvements/'
+}
diff --git a/src/items/improvements/shirleySandwich.lua b/src/items/improvements/shirleySandwich.lua
@@ -0,0 +1,10 @@
+return{
+  name = "shirleySandwich",
+  description = "Shirley's Sandwich Shop",
+  type = "improvement",
+  subtype = "improvement",
+  info = "Shirley's Sandwiches still needs some funding before it can open.",
+  MAX_ITEMS = 1,
+  quantity = 1,
+  directory = 'improvements/'
+}
diff --git a/src/items/item.lua b/src/items/item.lua
@@ -44,6 +44,7 @@ function Item.new(node, count)
   end
 
   if not love.filesystem.exists(imagePath) then
+    assert(love.filesystem.exists(imagePath), "There is no image at the path ("..imagePath..").  Items require an image.")
     return nil
   end
 

diff --git a/src/items/keys/flashlight.lua b/src/items/keys/flashlight.lua
@@ -0,0 +1,7 @@
+return{
+  name = "flashlight",
+  description = "Flashlight",
+  type = "key",
+  info = "a flashlight",
+  MAX_ITEMS = 1,
+}
diff --git a/src/items/keys/rope.lua b/src/items/keys/rope.lua
@@ -0,0 +1,7 @@
+return{
+  name = "rope",
+  description = "Rope",
+  type = "key",
+  info = "a coil of rope",
+  MAX_ITEMS = 1,
+}
diff --git a/src/maps/admin-hallway.tmx b/src/maps/admin-hallway.tmx
@@ -1,109 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="48" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="48" height="14" tilewidth="24" tileheight="24" nextobjectid="18">
  <properties>
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
   <property name="red" value="104"/>
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Admin Hallway"/>
  </properties>
- <tileset firstgid="1" name="greendale-hallways" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="greendale-hallways" tilewidth="24" tileheight="24" tilecount="600">
   <image source="../images/tilesets/greendale-hallways.png" width="576" height="600"/>
  </tileset>
- <tileset firstgid="601" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="601" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
  <layer name="Tile Layer 1" width="48" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjZGBwYBzCmImBgWGI4wNDGTOMQJA+SM0aBaSDjcBCZBPjwNjdC7S3j0K7TwL1nyLDDGYohgFJIJbCwsYHlgLtXTZAYYfL/dIMhN0vQ4T5QDUNxKhDB7JEqoO5nx2KDYHYCIiNkdjsOLAJHjkkNQ3EqEPHpljE7mIRYx7FgwIzDnEMAH5IPoY=
+   eJxjZGBwYBzCmImBgWGI4wNDGTOMQJA+SM0aBaSDjcBCZBPjwNnfC7S7jwL7TwL1niJDPzMUw4AkEEthYRMCS4F2LxuA8MPlfmkG4twvQ1i+gZAabECWSHUw97NDsSEQGwGxMRKbHQ82ISzfQEgNNmyKRewuFjHmUTwoMOMQxwBzfD6G
   </data>
  </layer>
  <layer name="Tile Layer 2" width="48" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo4B8UM3A4FCDBxOSJ1cttXAyEOPzHyF5ctVSCyRTKE+uWmqBUfdjqn3LyMDwjpFMBwFBJ1BvFwH9nkBcy8BwgFj3+wDTdgoQA2kFQmpBwAaIbQk7FStYCHT7IgLuT8JiJwhk4HAT0N0MKRC6AVneF4lPbvrJgmIYSCNCD8z9wDKPoQaHmhokeWTMgEUMXS0DHnXoGOZ+mL4pUIzPvllAPJsIf46CUYAPAAAHeUoj
+   eJxjYBgFo4B8UM3A4FCDBxOSp1Q9pTgZiPH5j5A8peopBckUylOqnlIw6n7s6t8yMjC8YyTDQUDQCdTXRUCvJxDXMjAcINb9PsB0nQLEQFpBC8jXBmIdPOptgNiWeCejgIVAty8i4P4kNPtgIAOHe4DuZkiB0A3oZvkiiZGTfrKgGAbSiNADcz+wvGOowaGmBkkeHTPgEEc3D5sadAxzP0zfFCjGZ9csIJ5NhD9HwSjABwAc30qk
   </data>
  </layer>
  <layer name="Tile Layer 3" width="48" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFAw38B9oBZACgmxtgbA4qmqswAHqR9XkjsdOJ1I+sR4EEfbjc4Y1PERQg26GASxEFbqCnXkrspKZZuPRGMjIwRAFxNCN5droA9bkCsRsQuwOxBw5zCJnFA8S8QMwHxPxkuAMdeEFpCyQxRRxqVYBYFYjVsMh9BOJPWMxCBtyouAGKUQC63r9A/A+IG4F4HRCvB7kPGHZK0PCrRSqDsIE0KF3HAFbY0MCA0LAWiH2B2A+IOYHmceGIE7wWAEELDnGQ+aJAM8WA+CiQfQyIjwOxJZBvhWbXVBxmwMSn4ZBPheCGyUB6MlTMHIcZDFA1yBif3TAAM+8eEN9HUj8diGcQ0DsKRgEhAABRcCXk
+   eJxjYBgFAw38B9oBZACgmxtgbA4qm60wgPq8kdjpROr3RuMrkKAXmzvQzcMGkM1XwKWITECuefTWR23zcOmLZGRgiALiaEby7HMB6nMFYjcgdgdiDxzmEDKPB4h5gZgPiPnJcAc68ILSFkhiijjUqgCxKhCrQfm6aPIfgfgTFvNggBsVN0AxCkDX9xeI/wFxIxCvA+L1IPcBw04JGn61SGUQNpAGpesYwAobGhhQNawFYl8g9gNiTqCZXDjiBZ8lLTjEQWaLAs0TA+KjQPYxID4OxJZAvhWaPVNxmAETn4bH/lQIbpgMpCdDxcxxmDMZDeOzGwZgZt0D4vtI6qcD8QwCekfBKCAEAPEsJhE=
   </data>
  </layer>
  <layer name="collision" width="48" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYBjaIJJpaONRMApGwSgYBUMXFDNB8ECBLqDdnTjs72BCVdcBxbjUEzIPHeQxDW08CgYWAAA5xyve
+   eJxjYBjaIJJpaONRMApGwSgYBfhBBxMEUxsUM0EwLc2g1HxiQBfQjk4C9nQxIcIRn1pizIKBPKahjUfBwAIAizwtxw==
   </data>
  </layer>
- <objectgroup name="nodes" width="48" height="14">
-  <object name="main" type="door" x="96" y="216" width="24" height="60">
+ <objectgroup name="nodes">
+  <object id="1" name="main" type="door" x="96" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-exterior"/>
     <property name="to" value="admin1"/>
    </properties>
   </object>
-  <object name="humanbeing" type="npc" x="576" y="216" width="48" height="50"/>
-  <object type="firealarm" x="480" y="216" width="24" height="48"/>
-  <object type="firealarm" x="840" y="216" width="24" height="48"/>
-  <object type="firealarm" x="24" y="216" width="24" height="48"/>
-  <object type="info" x="360" y="216" width="48" height="48">
+  <object id="2" name="humanbeing" type="npc" x="600" y="216" width="48" height="50"/>
+  <object id="3" type="firealarm" x="504" y="216" width="24" height="48"/>
+  <object id="4" type="firealarm" x="840" y="216" width="24" height="48"/>
+  <object id="5" type="firealarm" x="24" y="216" width="24" height="48"/>
+  <object id="6" type="info" x="384" y="216" width="48" height="48">
    <properties>
     <property name="info" value="The only trophy reads: | Most Valued Customer ... | Henderson Trophy Cases"/>
    </properties>
   </object>
-  <object type="info" x="1104" y="216" width="48" height="48">
+  <object id="7" type="info" x="1104" y="216" width="48" height="48">
    <properties>
     <property name="info" value="Stairway closed due to black mold"/>
    </properties>
   </object>
-  <object type="info" x="216" y="216" width="24" height="48">
+  <object id="8" type="info" x="216" y="216" width="24" height="48">
    <properties>
     <property name="info" value="$0.25 per sip. 2 drink minimum."/>
    </properties>
   </object>
-  <object type="info" x="169" y="216" width="16" height="48">
+  <object id="9" type="info" x="169" y="216" width="16" height="48">
    <properties>
     <property name="info" value="The extinguisher reads ... | WARNING CONTENTS HIGHLY FLAMMABLE"/>
    </properties>
   </object>
-  <object type="info" x="1011" y="218" width="41" height="44">
+  <object id="10" type="info" x="1011" y="218" width="41" height="44">
    <properties>
     <property name="info" value="Wait a minute... This is just hot soda."/>
    </properties>
   </object>
-  <object type="info" x="984" y="216" width="23" height="44">
+  <object id="11" type="info" x="984" y="216" width="23" height="44">
    <properties>
     <property name="info" value="This ATM only dispenses ... | Greendale Dollars."/>
    </properties>
   </object>
-  <object name="raveSwitch" type="door" x="768" y="216" width="24" height="60">
+  <object id="12" name="raveSwitch" type="door" x="768" y="216" width="24" height="60">
    <properties>
     <property name="button" value="INTERACT"/>
     <property name="level" value="rave-hallway"/>
     <property name="sound" value="alarmswitch"/>
     <property name="to" value="raveSwitch"/>
    </properties>
   </object>
-  <object type="info" x="313" y="218" width="22" height="44">
-   <properties>
-    <property name="info" value="This door is locked."/>
-   </properties>
-  </object>
-  <object type="info" x="529" y="215" width="44" height="47">
+  <object id="13" type="info" x="528" y="216" width="48" height="48">
    <properties>
     <property name="info" value="These doors are locked."/>
    </properties>
   </object>
-  <object type="info" x="866" y="217" width="22" height="47">
+  <object id="14" type="info" x="866" y="217" width="22" height="47">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object name="office_key" type="spawn" x="936" y="240" width="24" height="24">
+  <object id="15" name="office_key" type="spawn" x="936" y="240" 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 id="16" type="info" x="244" y="195" width="66" height="42">
+   <properties>
+    <property name="info" value="Due to a mix up in the records room all student records have been lost.  As you know, our student records are stored on a Microsoft Paint file, which the Dean was assured was future-proof. | Meanwhile, our extended warranty is not being honored by the restaurant that used to be Circuit City and we are asking every student to re-register for their classes."/>
+   </properties>
+  </object>
+  <object id="17" name="bursar" type="door" x="336" y="216" width="24" height="60">
+   <properties>
+    <property name="level" value="greendale-bursar"/>
+    <property name="to" value="main"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/src/maps/borchert-hallway.tmx b/src/maps/borchert-hallway.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="39" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="39" height="14" tilewidth="24" tileheight="24">
  <properties>
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
@@ -25,15 +25,15 @@
  </layer>
  <layer name="Tile Layer 3" width="39" height="14">
   <data encoding="base64" compression="zlib">
-   eJztkU1OAkEQhXsGNcgFZIm4Qg8guBOXLHSnA+pS41IQlop3EOEKmnAITDiEJO5BhSvI10mZtB3mJ2PQhPCSb7p7purV64xSS8XV4X8HEJGjOet9co4zM7/oLUn/ZYzeoJ6SrH7eOUepbdhxgmdkYuSKKu09ZP4I3uEDPmEfinDwB9k8KEMFTuEMzr+9XaUccCEBK25036jZPO5YhsqMu15DFWpwA3VoiPcm9VmrZx1Slscqmdck95j6CeStmixs+eS7gjvZP8FzyH20d4EZeyH/TutLP6y6I+jLvhvQqzM14V7OPXgJmae9L+A2PJraIFfayrYLb7JvGe9bP8vUg3V+hYHPnGM4MXwejW9t6BirKXvmUoujKWB8Jhc=
+   eJztkUtOAkEURasbJeAGdIg4QhbgZ6YOGehM/kMJQ/wNBfcA7kETFyEJi8DEuYCyBT2VPJKm0t3VaaImpl9yuj55795baaWSilunfx1Aihw9v/vMD3rmVpgtyXwrxmzYTEnWIO2Co9QuFJ1wj1yMXFFLa7/jP4EpzOADjuAYTn4hWwWqUIM6NKC50HaVcsCFFKy50XWjZqvwxirUfN7agUu4gmu4gVvR3qY/b8xkYcPQWCdzWnJ/0j+HfaMnDzsB+drQlf0jPFneo7UP8Di0/DtdX/pj9J3BSPbPIbM6Uw/u5fwCQ4uf1r6AO3s0tUmuLSPbHrzJfuC5Hyy3qb5xHsNrgM85lD06DxGy+Xkm9X/qG8VZI7k=
   </data>
  </layer>
  <layer name="collision" width="39" height="14">
   <data encoding="base64" compression="zlib">
    eJyLZGJgiBykeBSMglEwCkYBYVDMhB3TC3TR0a48psGLRwF5AAAC+SI4
   </data>
  </layer>
- <objectgroup name="nodes" width="39" height="14">
+ <objectgroup name="nodes">
   <object name="main" type="door" x="144" y="216" width="48" height="60">
    <properties>
     <property name="level" value="greendale-exterior"/>
@@ -60,11 +60,6 @@
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object type="info" x="720" y="216" width="96" height="48">
-   <properties>
-    <property name="info" value="The pool is currently closed for refurbishment."/>
-   </properties>
-  </object>
   <object type="info" x="384" y="192" width="48" height="72">
    <properties>
     <property name="info" value="That's good no-no juice."/>
@@ -75,5 +70,37 @@
     <property name="info" value="Hello, rich people?"/>
    </properties>
   </object>
+  <object name="pool" type="door" x="720" y="240" width="48" height="36">
+   <properties>
+    <property name="hideable" value="true"/>
+    <property name="info" value="The pool is currently closed for refurbishment."/>
+    <property name="level" value="borchert-pool"/>
+    <property name="movetime" value="2.7"/>
+    <property name="offset_hidden_x" value="0"/>
+    <property name="offset_shown_x" value="-50"/>
+    <property name="sound" value="false"/>
+    <property name="sprite" value="closedsign"/>
+    <property name="sprite_height" value="24"/>
+    <property name="sprite_width" value="48"/>
+    <property name="to" value="main"/>
+    <property name="trigger" value="borchertpool"/>
+   </properties>
+  </object>
+  <object name="pool2" type="door" x="768" y="240" width="48" height="36">
+   <properties>
+    <property name="hideable" value="true"/>
+    <property name="info" value="The pool is currently closed for refurbishment."/>
+    <property name="level" value="borchert-pool"/>
+    <property name="movetime" value="2.7"/>
+    <property name="offset_hidden_x" value="0"/>
+    <property name="offset_shown_x" value="50"/>
+    <property name="sound" value="false"/>
+    <property name="sprite" value="closedsign"/>
+    <property name="sprite_height" value="24"/>
+    <property name="sprite_width" value="48"/>
+    <property name="to" value="main"/>
+    <property name="trigger" value="borchertpool"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/src/maps/borchert-pool.tmx b/src/maps/borchert-pool.tmx
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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"/>
+  <property name="green" value="154"/>
+  <property name="red" value="125"/>
+  <property name="soundtrack" value="greendale-alt"/>
+  <property name="title" value="Borchert Hallway"/>
+ </properties>
+ <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" tilecount="546">
+  <image source="../images/tilesets/collisions.png" width="632" height="512"/>
+ </tileset>
+ <layer name="city_little_clouds" width="42" height="14">
+  <properties>
+   <property name="parallax" value="0.25"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJztkcEKACEIRPvZpW7q/1+2g4dh2JWCqA4+GNB0VKiUe3g2eVb6V3Lill07Z/bc9Cej1K5G+Yjnj/aRV/BE3qhmLulSj9Ul8C4goxr2G8QK8w1yoR7eLSQN7k+SJDnFC1emGSY=
+  </data>
+ </layer>
+ <layer name="hedge_big_clouds" width="42" height="14">
+  <properties>
+   <property name="parallax" value="0.4"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJxjYKAtKILgBnL1p0Ew2fqpCSj1C7UAMWFCi3CjhpmDJQxHKsgcIngUjIJRMAoGGwAAEscalw==
+  </data>
+ </layer>
+ <layer name="background" width="42" height="14">
+  <data encoding="base64" compression="zlib">
+   eJztlEsKgDAMRAP+ll6jC0ErPZDrrj1Aj+5AdVMqVJoBBQuPIYvAoyFxIuIIWJHNg10pGY6X54rUgumJfxAtmJ6YmWjB9LQxVSDP/RN7pOmZ++MlEtLaIBvQgg70YACmsL+mzt2AORLS2pxOOUr6a+onniPyjjd5ltzjieTJeIy9/D11OQDj86HI
+  </data>
+ </layer>
+ <layer name="Water" width="42" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2DkAfWBdsAoGAVowB2IPYDYE4gTB9gto4D+QJsGmBYgYIi4M4oG7gQAX1YMSg==
+  </data>
+ </layer>
+ <layer name="pool edge" width="42" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjIJRQA2gxMCwQAKI0Wli9HoBsTcQ+wCxLxD7AbE/ldwlCKUFoDTQTQzSDAwN0ki0JJJ6VyTsBMSOQDUwuRAgDgXiMCAOB+IIII6kkjvVoLQq1D4lKFsViVaGqpEDYj0sWA6qNw6I44E4Aao+CYiTqeTOIBrgYCq5DRmY0ADHjmB3AgC4VSJI
+  </data>
+ </layer>
+ <layer name="fade" width="42" height="14" opacity="0.75">
+  <data encoding="base64" compression="zlib">
+   eJzTZmBg0KYBpjaghRtH3TnqzlF3Dk53joJRMApGwWADAI/+Gd8=
+  </data>
+ </layer>
+ <layer name="Chairs" width="42" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjBTgSiM8CogD5kBsAcSWQGwFxNYD6xycwBGInaDYZYDdMgpGwWABAIUPCBU=
+  </data>
+ </layer>
+ <layer name="collision" width="42" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUjBSwgkaY2mAyjfAoIA6gh9tqPHIDBQYynitphIcCGEru7KMyBgA4UDrL
+  </data>
+ </layer>
+ <objectgroup name="nodes">
+  <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 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 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 id="4" type="bouncer" x="540" y="168" width="60" height="30">
+   <properties>
+    <property name="dbval" value="1420"/>
+   </properties>
+  </object>
+  <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 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>
+  </object>
+ </objectgroup>
+</map>