Bursar npc and shopping start

Speakeasy, hologram and improvement start Add the speakeasy, hologram, door fix, giant hand, fix for moving platforms with multi sprites and start improvements Bursar shopping state Add todd and goat
hawkthorne · Oct 6, 2015 · 93c5d57 · 93c5d57
1 parent 0e05544
commit 93c5d57
Show file tree

Hide file tree

Showing 56 changed files with 734 additions and 132 deletions.
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/images/enemies/billy.png b/src/images/enemies/billy.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/shirleySandwich.png b/src/images/improvements/shirleySandwich.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/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/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/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/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/tilesets/greendale-bursar.png b/src/images/tilesets/greendale-bursar.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-speakeasy.png b/src/images/tilesets/greendale-speakeasy.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 money to install a hologram near the Library.  Unfortunatly the Dean spent the money purchasing 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/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/maps/admin-hallway.tmx b/src/maps/admin-hallway.tmx
@@ -30,7 +30,7 @@
  </layer>
  <layer name="collision" width="48" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYBjaIJJpaONRMApGwSgYBQMDipkgeKDNoBR0Ae3vJOAGkJoOKManlhizYCCPaWjjUTCwAAD8ZCw+
+   eJxjYBjaIJJpaONRMApGwSgYBfhBBxMEUxsUM0EwLc2g1HxiQBfQjk4C9nQxIcIRn1pizIKBPKahjUfBwAIAizwtxw==
   </data>
  </layer>
  <objectgroup name="nodes">
@@ -82,11 +82,6 @@
     <property name="to" value="raveSwitch"/>
    </properties>
   </object>
-  <object type="info" x="336" y="216" width="24" height="48">
-   <properties>
-    <property name="info" value="This door is locked."/>
-   </properties>
-  </object>
   <object type="info" x="528" y="216" width="48" height="48">
    <properties>
     <property name="info" value="These doors are locked."/>
@@ -105,5 +100,16 @@
     <property name="sprite" value="wastebin"/>
    </properties>
   </object>
+  <object 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."/>
+   </properties>
+  </object>
+  <object 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/castle-hawkthorne-throne.tmx b/src/maps/castle-hawkthorne-throne.tmx
@@ -9,10 +9,10 @@
   <property name="red" value="0"/>
   <property name="soundtrack" value="castle"/>
  </properties>
- <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24" tilecount="800">
   <image source="../images/tilesets/castle-hawkthorne.png" width="384" height="1200"/>
  </tileset>
- <tileset firstgid="801" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="801" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
  <layer name="sky" width="96" height="37">

diff --git a/src/maps/greendale-bursar.tmx b/src/maps/greendale-bursar.tmx
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24">
+ <properties>
+  <property name="soundtrack" value="greendale-alt"/>
+ </properties>
+ <tileset firstgid="1" name="greendale-bursar" tilewidth="24" tileheight="24">
+  <image source="../images/tilesets/greendale-bursar.png" width="240" height="192"/>
+ </tileset>
+ <tileset firstgid="81" name="collisions" tilewidth="24" tileheight="24">
+  <image source="../images/tilesets/collisions.png" width="632" height="512"/>
+ </tileset>
+ <layer name="Background" width="22" height="14">
+  <data encoding="base64" compression="zlib">
+   eJwTY2BgEKMBVhhiWHQUj2IsmInK5mlBMQ8SmxpYfohhWpQ5IAwAWrQeqg==
+  </data>
+ </layer>
+ <layer name="Wall Features 1" width="22" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AU0AuYQDEymxp4FEAAACiLBEU=
+  </data>
+ </layer>
+ <layer name="Wall Features 2" width="22" height="14">
+  <data encoding="base64" compression="zlib">
+   eJztzksLglAQhmHBtBK6mEHaDVwZuLKFQjcUtFWkP8mf3gvNIgRRaSd+8HBmDnOGoyhDhtTngituf+5RK32KDM8Wb0fQoGOMCaYwMJOZl5xv5Chqdnk4ST3HAkuYWMHCGpuGP4WIfvoAZ6ltONhihz0OOMKt7Lnj8VVSlzF1Ivdd4nec72s+YKoIZQ==
+  </data>
+ </layer>
+ <layer name="Tile Layer 6" width="22" height="14">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2BwAwsgtkQTA/IbgOINlJjrBMTOaGJAfoMTheaSCjyB2IueFg5jAABK1ASA
+  </data>
+ </layer>
+ <layer name="foreground" width="22" height="14">
+  <properties>
+   <property name="foreground" value="true"/>
+  </properties>
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2AUDAVgCsRqDAwNqkCsAsTKQEwNc+2B2ABolj4Q6wGxLpXMHQgAAE2zBcE=
+  </data>
+ </layer>
+ <layer name="collision" width="22" height="14" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJwLZGBgCKQBHgWjYBQQBg1AnA3FDWjipIA0GuGhBgD2nhIR
+  </data>
+ </layer>
+ <objectgroup name="nodes">
+  <object name="main" type="door" x="48" y="216" width="24" height="60">
+   <properties>
+    <property name="level" value="admin-hallway"/>
+    <property name="to" value="bursar"/>
+   </properties>
+  </object>
+  <object type="info" x="200" y="216" width="30" height="30">
+   <properties>
+    <property name="info" value="All they have are old issues of Dean Magazine"/>
+   </properties>
+  </object>
+  <object name="bursar" type="npc" x="408" y="204" width="72" height="36"/>
+  <object type="info" x="288" y="192" width="48" height="36">
+   <properties>
+    <property name="info" value="Official Greendale Campus Map"/>
+   </properties>
+  </object>
+ </objectgroup>
+</map>
diff --git a/src/maps/greendale-computer-wing-2.tmx b/src/maps/greendale-computer-wing-2.tmx
@@ -4,7 +4,7 @@
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
   <property name="red" value="104"/>
-  <property name="soundtrack" value="greendale-alt"/>
+  <property name="soundtrack" value="computer-wing"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
  <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24">
@@ -37,7 +37,6 @@
   <object name="main" type="door" x="288" y="192" width="24" height="72">
    <properties>
     <property name="level" value="greendale-computer-wing"/>
-    <property name="sound" value="false"/>
     <property name="to" value="wing2"/>
    </properties>
   </object>

diff --git a/src/maps/greendale-computer-wing-3.tmx b/src/maps/greendale-computer-wing-3.tmx
@@ -4,7 +4,7 @@
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
   <property name="red" value="104"/>
-  <property name="soundtrack" value="greendale-alt"/>
+  <property name="soundtrack" value="computer-wing"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
  <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24">
@@ -37,7 +37,6 @@
   <object name="main" type="door" x="552" y="192" width="24" height="72">
    <properties>
     <property name="level" value="greendale-computer-wing"/>
-    <property name="sound" value="false"/>
     <property name="to" value="wing3"/>
    </properties>
   </object>

diff --git a/src/maps/greendale-computer-wing.tmx b/src/maps/greendale-computer-wing.tmx
@@ -4,7 +4,7 @@
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
   <property name="red" value="104"/>
-  <property name="soundtrack" value="greendale-alt"/>
+  <property name="soundtrack" value="computer-wing"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
  <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24">
@@ -45,7 +45,7 @@
     <property name="info" value="Hello, rich people?"/>
    </properties>
   </object>
-  <object type="climbable" x="24" y="30" width="12" height="228"/>
+  <object type="climbable" x="24" y="60" width="12" height="198"/>
   <object type="door" x="0" y="30" width="48" height="30">
    <properties>
     <property name="instant" value="true"/>
@@ -62,14 +62,12 @@
   <object name="wing3" type="door" x="408" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-computer-wing-3"/>
-    <property name="sound" value="false"/>
     <property name="to" value="main"/>
    </properties>
   </object>
   <object name="wing2" type="door" x="216" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-computer-wing-2"/>
-    <property name="sound" value="false"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@