You can get the split second.

This commit is contained in:
2014-12-31 13:51:51 -08:00
parent 71d14bd527
commit 10d13f9396
5 changed files with 64 additions and 7 deletions

View File

@@ -152,13 +152,19 @@
(defn add-monocle-if-necessary [entities]
(if (and (not (actions/has-obtained? entities :monocle))
(get-in entities [:state :talked-to-owl?]))
(update-in entities [:room :entities] #(assoc % :monocle (doto (get-in entities [:room :monocle]) println)))
(update-in entities [:room :entities] #(assoc % :monocle (get-in entities [:room :monocle])))
entities))
(defn add-watch-if-necessary [entities]
(if (not (actions/has-obtained? entities :watch))
(update-in entities [:room :entities] #(assoc % :watch (get-in entities [:room :watch])))
entities))
(defn make-night [entities]
(-> entities
(update-in [:room :entities] #(dissoc % :game-player))
add-monocle-if-necessary))
add-monocle-if-necessary
add-watch-if-necessary))
(defn make [screen]
(let [game-player-talk-sheet (texture! (texture "inside-castle/game-player-talk.png") :split 40 44)
@@ -343,6 +349,21 @@
(actions/remove-entity entities :monocle)
(actions/give entities :monocle)
(actions/talk entities :ego "It looks like a monocle."))}))
:watch (rooms/make-entity :watch (assoc (texture "inside-castle/watch.png")
:x 282 :y 62 :baseline 140
:script (actions/get-script entities
(actions/talk entities :ego "There's something on that chair.")
(actions/walk-to entities :ego [265 90] :face :right)
(actions/walk-straight-to entities :ego [303 80])
(actions/walk-straight-to entities :ego [302 48])
(actions/play-animation entities :ego :squat)
(actions/remove-entity entities :watch)
(actions/give entities :watch)
(actions/do-dialogue entities :ego "It's a watch."
:ego "Brian O'Brainy must have left it behind.")
(actions/walk-straight-to entities :ego [303 80])
(actions/walk-straight-to entities :ego [265 90]))))
:collision "inside-castle/collision.png"
:scale-fn (utils/scaler-fn-from-image "inside-castle/scale.png" 0.25 1.00)
:apply-state (fn [entities]