hourglass when script cannot be ended.

This commit is contained in:
Bryce Covert
2015-08-13 22:16:31 -07:00
parent ac3b8665ef
commit ffa264eb7b
14 changed files with 109 additions and 68 deletions

View File

@@ -241,13 +241,13 @@
(defn go-through-gate [entities]
(if (should-block? entities)
(do
(actions/walk-to entities :ego [82 180] :face :left)
(actions/walk-to entities :ego [82 180] :face :left :skip-type :end)
(block-entrance entities))
(do
(actions/walk-to entities :ego [82 180])
(actions/walk-to entities :ego [82 180] :skip-type :end :stop? false)
(actions/walk-straight-to entities :ego [61 182])
(actions/transition-background entities :inside-castle [295 145])
(actions/walk-to entities :ego [245 90]))))
(actions/walk-to entities :ego [245 90] :skip-type :end))))
(defn add-note-if-necessary [entities]
@@ -280,12 +280,12 @@
flies-stand (utils/make-anim "outside-castle/flies.png" [15 15] 0.075 (flatten (repeat 2 [0 1 2 1])))]
(rooms/make :music {:day :town-2 :night :night :sunrise :night}
:interactions
{:right-dir {:box [300 40 320 140]
{:right-dir {:box [280 40 320 140]
:script (actions/get-script
entities
(actions/walk-to entities :ego [310 80])
(actions/walk-to entities :ego [310 80] :stop? false :skip-type :end)
(actions/walk-straight-to entities :ego [340 80])
(actions/transition-background entities :outside-house [0 80])
(actions/transition-background entities :outside-house [-10 80])
(actions/walk-straight-to entities :ego [30 80]))
:cursor :right}
:door {:box [66 180 85 195]