This commit is contained in:
2015-05-07 18:18:17 -07:00
parent f6ed261b4c
commit 983a4ac251
6 changed files with 25 additions and 13 deletions

View File

@@ -133,10 +133,10 @@
(actions/walk-to entities :ego [170 71] :face :right)
(actions/walk-straight-to entities :ego [188 71] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-entity entities :axe)
(actions/update-entities entities #(assoc-in % [:room :entities :axe :opacity] 0.0))
(actions/play-animation entities :ego :axe-wood)
(actions/play-animation entities :ego :reach)
(actions/add-entity entities :axe (get-in @entities [:room [:axe (get-in @entities [:state :time])]]))
(actions/update-entities entities #(assoc-in % [:room :entities :axe :opacity] 1.0))
(actions/walk-straight-to entities :ego [170 71]))
:scripts {:alarm-clock (actions/get-script entities
(actions/walk-to entities :ego [170 71] :face :right)
@@ -145,9 +145,11 @@
(actions/remove-item entities :alarm-clock)
(actions/add-entity entities :alarm-clock (get-in @entities [:room :alarm-clock]))
(actions/play-animation entities :ego :axe)
(actions/update-entities entities #(assoc-in % [:room :entities :axe :opacity] 0.0))
(actions/talk entities :ego "It's split right down the middle!")
(actions/play-animation entities :ego :reach)
(actions/remove-entity entities :alarm-clock)
(actions/update-entities entities #(assoc-in % [:room :entities :axe :opacity] 1.0))
(actions/give entities :broken-clock)
(actions/walk-straight-to entities :ego [170 71]))
:sword (actions/get-script entities (actions/talk entities :ego "I can just use the axe."))}}
@@ -203,8 +205,9 @@
:rope (rooms/make-entity :rope (assoc (texture "outside-jail/rope.png")
:x 14 :y 20 :baseline 1 :night-profile :sprite))
:spear (rooms/make-entity :spear (assoc (texture "outside-jail/spear.png")
:x 60 :y 65 :baseline 180
:script (actions/get-script entities (grab-spear entities))))
:night-profile :none
:x 60 :y 65 :baseline 180
:script (actions/get-script entities (grab-spear entities))))
:alarm-clock (rooms/make-entity :alarm-clock (assoc (texture "outside-jail/alarm-clock.png")
:x 217 :y 83 :baseline 160
:script (actions/get-script entities