notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue with godfather talking from a distance.

Browse Source
This commit is contained in:
Bryce Covert
2016-02-15 07:04:15 -08:00
parent f5fa609e8a
commit 48d4038055
24 changed files with 94 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -365,7 +365,9 @@
(actions/talk entities :ego "I guess I'm doomed to be a gravedigger.")
(actions/play-animation entities :ego :sigh)
(actions/play-animation entities :ego :reach-start :stop? false)
(describe-shovel entities)
(if (get-in @entities [:room :entities :fairy-godfather :distracted?])
(Thread/sleep 1000)
(describe-shovel entities))
(actions/play-animation entities :ego :reach-stop :stop? true)
(actions/do-dialogue entities
:ego "I can't bring myself to do it."
@@ -376,7 +378,10 @@
(actions/talk entities :ego "I guess I'm doomed to be a janitor.")
(actions/play-animation entities :ego :sigh)
(actions/play-animation entities :ego :reach-start :stop? false)
(describe-broom entities)
(if (get-in @entities [:room :entities :fairy-godfather :distracted?])
(Thread/sleep 1000)
(describe-broom entities))
(actions/play-animation entities :ego :reach-stop :stop? true)
(actions/do-dialogue entities
:ego "I can't bring myself to do it."
@@ -524,11 +529,17 @@
(actions/do-dialogue entities :ego "He wouldn't be able to hear me from there.")
(talk-to-fairy entities)))
:scripts {:shovel (actions/get-script entities
(describe-shovel entities)
(actions/play-animation entities :ego :sigh))
(if (get-in @entities [:room :entities :fairy-godfather :distracted?])
(actions/do-dialogue entities :ego "He wouldn't be able to hear me from there.")
(do
(describe-shovel entities)
(actions/play-animation entities :ego :sigh))))
:broom (actions/get-script entities
(describe-broom entities)
(actions/play-animation entities :ego :sigh))})}
(if (get-in @entities [:room :entities :fairy-godfather :distracted?])
(actions/do-dialogue entities :ego "He wouldn't be able to hear me from there.")
(do
(describe-broom entities)
(actions/play-animation entities :ego :sigh))))})}
:collision "dream/collision.png"
:scale-fn (utils/scaler-fn-from-image "dream/scale.png" 0.1 1.3)