Fixes

Fix door placement, jerry , bursar text, add open the door sfx and tweak lights
hawkthorne · Oct 21, 2015 · 9e30407 · 9e30407
1 parent e91beab
commit 9e30407
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 99 deletions.
diff --git a/src/audio/sfx/open_the_door.ogg b/src/audio/sfx/open_the_door.ogg
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-light.png b/src/images/sprites/greendale/speakeasy-light.png
diff --git a/src/maps/admin-hallway.tmx b/src/maps/admin-hallway.tmx
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" 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">
@@ -34,78 +34,78 @@
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="96" y="216" width="24" height="60">
+  <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="600" y="216" width="48" height="50"/>
-  <object type="firealarm" x="504" 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="384" 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="528" y="216" width="48" height="48">
+  <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 type="info" x="244" y="195" width="66" height="42">
+  <object id="16" type="info" x="244" y="195" width="66" height="42">
    <properties>
-    <property name="info" value="Do 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."/>
+    <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 name="bursar" type="door" x="336" y="216" width="24" height="60">
+  <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"/>

diff --git a/src/maps/greendale-computer-wing-3.tmx b/src/maps/greendale-computer-wing-3.tmx
@@ -1,16 +1,16 @@
 <?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="24" height="14" tilewidth="24" tileheight="24" nextobjectid="4">
  <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">
@@ -34,13 +34,13 @@
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="552" y="192" width="24" height="72">
+  <object id="1" name="main" type="door" x="552" y="192" width="24" height="72">
    <properties>
     <property name="level" value="greendale-computer-wing"/>
     <property name="to" value="wing3"/>
    </properties>
   </object>
-  <object type="hiddendoortrigger" x="114" y="204" width="36" height="24">
+  <object id="2" type="hiddendoortrigger" x="114" y="204" width="36" height="24">
    <properties>
     <property name="height" value="24"/>
     <property name="message" value="Do you want to select a song?"/>
@@ -49,16 +49,16 @@
     <property name="width" value="36"/>
    </properties>
   </object>
-  <object name="jukebox" type="door" x="114" y="194" width="36" height="72">
+  <object id="3" name="jukebox" type="door" x="114" y="194" width="36" height="72">
    <properties>
     <property name="aniframes2" value="1-10,1"/>
-    <property name="anispeed2" value=".35"/>
+    <property name="anispeed2" value=".9"/>
     <property name="hideable" value="true"/>
     <property name="level" value="greendale-secret-lab"/>
-    <property name="movetime" value="2.7"/>
+    <property name="movetime" value="7"/>
     <property name="offset_hidden_x" value="0"/>
     <property name="offset_shown_x" value="-50"/>
-    <property name="show_sfx" value="throne_door"/>
+    <property name="show_sfx" value="open_the_door"/>
     <property name="sound" value="false"/>
     <property name="sprite" value="jukebox"/>
     <property name="sprite_height" value="46"/>