Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Adds Jerry the janitor as an NPC #1542

Merged
merged 2 commits into from

3 participants

@edisonout
Owner

Jerry can be seen cleaning the hallways of Borchet Hall.

@CalebJohn
Owner

lgtm

@didory123
Owner

LGTM

@didory123 didory123 merged commit 9724eb0 into hawkthorne:master
@edisonout edisonout deleted the edisonout:jerrythejanitor branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 3, 2013
  1. @edisonout
Commits on Jun 4, 2013
  1. @edisonout
This page is out of date. Refresh to see the latest.
View
BIN  src/images/npc/jerry-menu.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/npc/jerry.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  src/images/tilesets/greendale-hallways.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
27 src/maps/borchert-hallway.tmx
@@ -22,7 +22,7 @@
</layer>
<layer name="Tile Layer 3" width="39" height="14">
<data encoding="base64" compression="zlib">
- eJxjYBgF5AL/gXYAFADd0YBNnIOGdipQoNcbqj+dDL349HhDaXLNhgEFCvTS2mxK9dPSbGL1RzIyMEQBcTQjfnWaQHktINZmhJitCKSV0PRwAjEXEXZaoPGVgFgZh9pMIK6HslcC8SosahyB7nACYmdGiNmWQNqKgH9A4D+IQFMXAMRHoey1ePSC3NQAxI1Q/kEgPkTAPpDZaUBcR9hpDOJAd0mguc0ciO9C2VORxKeiKmOYgoRB4CYQ3yLCTpA505D404F4BhKNrnYUDE8AAHSBGx8=
+ eJxjYBgF5AL/gXYAFADd0YBNnIOGdipQoNcbqj+dDL349HhDaXLNhgEFCvTS2mxK9dPSbGL1RzIyMEQBcTQjfnWaQHktINZmhJitCKSV0PRwAjEXEXZaoPGVgFgZh9pMIK6HslcC8SosahyB7nACYmdGiNmWQNqKgH9A4D+IQFMXAMRHoey1ePSC3NQAxI1Q/kEgPkTAPpDZaUBcR9hpDOJAd0mguc0ciO9C2VORxKeiKmOYgsa/CcS3cNgTDsQRSOZMQ5KbDsQzkGhkgG7nKBg+AABLrhqm
</data>
</layer>
<objectgroup name="nodes" width="39" height="14">
@@ -44,6 +44,31 @@
<property name="to" value="main"/>
</properties>
</object>
+ <object type="npc" x="528" y="221" width="48" height="48">
+ <properties>
+ <property name="person" value="jerry"/>
+ </properties>
+ </object>
+ <object type="info" x="24" y="216" width="24" height="53">
+ <properties>
+ <property name="info" value="This door is locked."/>
+ </properties>
+ </object>
+ <object type="info" x="720" y="216" width="96" height="53">
+ <properties>
+ <property name="info" value="The pool is currently closed for refurbishment."/>
+ </properties>
+ </object>
+ <object type="info" x="384" y="192" width="48" height="77">
+ <properties>
+ <property name="info" value="That's good no-no juice."/>
+ </properties>
+ </object>
+ <object type="info" x="72" y="216" width="24" height="53">
+ <properties>
+ <property name="info" value="Hello, rich people?"/>
+ </properties>
+ </object>
</objectgroup>
<objectgroup name="block" width="39" height="14">
<object x="0" y="269" width="936" height="48"/>
View
29 src/npcs/jerry.lua
@@ -0,0 +1,29 @@
+local jerry = {}
+
+jerry.sprite = love.graphics.newImage('images/npc/jerry.png')
+jerry.tickImage = love.graphics.newImage('images/menu/selector.png')
+jerry.menuImage = love.graphics.newImage('images/npc/jerry-menu.png')
+jerry.walk = true
+jerry.stare = true
+
+jerry.items = {
+ { ['text']='i am done with you' },
+ { ['text']='You have a gift.' },
+ { ['text']='Listen to me.' },
+ { ['text']='Hello!' },
+}
+
+jerry.responses = {
+ ["Hello!"]={
+ "Damn man! Aint you ever heard of knocking?!",
+ },
+ ["Listen to me."]={
+ "Toilets and sinks...REAL THINGS!",
+ "Things that people always use and always need to get fixed!",
+ },
+ ["You have a gift."]={
+ "You could be a plumber!",
+ },
+}
+
+return jerry
Something went wrong with that request. Please try again.