This commit is contained in:
Bryce Covert
2015-10-10 17:49:42 -07:00
parent 2c30302e5a
commit 86f5b3484f
11 changed files with 5 additions and 6 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -26,7 +26,6 @@ AUDIO
+ metal clanking + metal clanking
+ jail door sliding open + jail door sliding open
+ jail creak + jail creak
+ jail crash
+ pit go down + pit go down
+ ladder break + ladder break
+ eavesdrop + eavesdrop

Binary file not shown.

View File

@@ -327,11 +327,11 @@
(update-in [:room :entities :ego] #(actions/start-animation screen % :stand)))] (update-in [:room :entities :ego] #(actions/start-animation screen % :stand)))]
((actions/get-script entities ((actions/get-script entities
(actions/stop-walking entities :ego) (actions/stop-walking entities :ego)
(actions/play-sound entities "inside-jail/squeak.ogg" 0.3)
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "*creak*"
:ego "Oops!" :ego "Oops!"
:warden "Hey! What are you doing?" :warden "Hey! What are you doing?"
:warden "Get back in jail.") :warden "Trying to escape, are ye chap?")
(common/go-to-jail entities) (common/go-to-jail entities)
(actions/do-dialogue entities :warden "Now don't let me catch you trying to escape again.") (actions/do-dialogue entities :warden "Now don't let me catch you trying to escape again.")
(actions/play-animation entities :warden :fall-asleep :stop? false) (actions/play-animation entities :warden :fall-asleep :stop? false)
@@ -355,8 +355,8 @@
warden-talk {10 [:blink 0.15]} warden-talk {10 [:blink 0.15]}
warden-fall-asleep {7 [:blink 0.15] warden-fall-asleep {7 [:blink 0.15]
18 [:blink 0.15]} 18 [:blink 0.15]}
warden-sleep {0 [:inhale 1.0] warden-sleep {0 [:inhale 0.1]
2 [:exhale 1.0]}} 10 [:exhale 0.1]}}
:script (actions/get-script entities :script (actions/get-script entities
(cond (cond
(actions/has-item? entities :key) (actions/talk entities :ego "Shh! It's best not to wake him now.") (actions/has-item? entities :key) (actions/talk entities :ego "Shh! It's best not to wake him now.")