can mix potion.

This commit is contained in:
2014-12-28 16:06:14 -08:00
parent 5ffc811dc0
commit 8c3c605bc3
6 changed files with 45 additions and 7 deletions

View File

@@ -158,6 +158,18 @@
(actions/play-animation entities :owl :puke))}]})))
(actions/update-state entities #(assoc % :talked-to-owl? true)))
(defn give-monocle [entities]
(actions/walk-to entities :ego [141 54] :face :right)
(actions/talk entities :ego "Is this your monocle?")
(actions/play-animation entities :owl :puke)
(actions/remove-entity entities :monocle)
(actions/do-dialogue entities
:owl "It is!"
:owl "Thank you!"
:owl "And now, I will help you on your quest."
:owl "This is for you.")
(actions/give entities :feather))
(defn make [screen]
(let [cat-stand-sheet (texture! (texture "cat-tree/cat-stand.png") :split 22 10)
cat-stand (animation 0.15 (for [i (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])]
@@ -281,7 +293,10 @@
:talk-color (color 0.5 0.5 1.0 1.0)
:anim owl-stand
:anim-start 0
:script (actions/get-script entities (talk-to-owl entities))))
:script (actions/get-script entities (talk-to-owl entities))
:scripts #(condp = %
:monocle (actions/get-script entities (give-monocle entities))
nil)))
:collision "cat-tree/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.20)
:apply-state (fn [entities]

View File

@@ -334,7 +334,15 @@
:anim-start 0
:script (actions/get-script entities
(actions/walk-to entities :ego [213 87] :face :left)
(actions/talk entities :ego "There's something up there on the roof!"))))
(actions/talk entities :ego "There's something up there on the roof!"))
:scripts {:spear (actions/get-script entities
(actions/walk-to entities :ego [213 87] :face :left)
(actions/talk entities :ego "Maybe I can reach it with this.")
(actions/play-animation entities :ego :spear)
(actions/talk entities :ego "Got it!")
(actions/remove-entity entities :monocle)
(actions/give entities :monocle)
(actions/talk entities :ego "It looks like a monocle."))}))
:collision "inside-castle/collision.png"
:scale-fn (utils/scaler-fn-from-image "inside-castle/scale.png" 0.25 1.00)
:apply-state (fn [entities]