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

hourglass when script cannot be ended.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

25
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -42,13 +42,12 @@
(defn walk-to-castle [entities dawn?]
(actions/walk-to entities :ego [0 80])
(defn walk-to-castle [entities]
(actions/walk-to entities :ego [0 80] :skip-type :end)
(actions/walk-straight-to entities :ego [-20 80])
(if dawn?
(actions/transition-background entities :outside-castle [330 80])
(actions/transition-background entities :outside-castle [330 80]))
(actions/walk-straight-to entities :ego [310 80]))
(actions/transition-background entities :outside-castle [330 80])
(actions/walk-straight-to entities :ego [319 80] :stop? false)
(actions/walk-to entities :ego [273 81] :skip-type :end))
(def ego-sheep-loc
[132 140])
@@ -67,7 +66,7 @@
(not (actions/has-item? entities :money))))
(defn walk-to-sheep [entities]
(actions/walk-to entities :ego [154 133])
(actions/walk-to entities :ego [154 133] :skip-type :end)
(actions/walk-straight-to entities :ego [119 134] :update-baseline? false))
(defn leave-sheep [entities]
@@ -118,7 +117,7 @@
:ego "And just in time, too. It's getting light.")
(actions/update-state entities #(assoc % :next-time :sunrise :seen-bloodclot? false))
(walk-to-castle entities true)
(walk-to-castle entities)
(outside-castle/go-through-gate entities)
(actions/update-state entities #(assoc % :next-time :day))
(inside-castle/walk-to-blergh entities)
@@ -557,7 +556,7 @@
:script
(actions/get-script
entities
(actions/walk-to entities :ego [257 90] :face :right)
(actions/walk-to entities :ego [257 90] :face :right :skip-type :end)
(actions/talk entities :ego (str "Anyone home?"))
(actions/play-animation entities :ego :reach)
(if (= :night (get-in @entities [:state :time]))
@@ -580,21 +579,21 @@
:right-dir {:box [220 141 320 204]
:script (actions/get-script
entities
(actions/walk-to entities :ego [244 150])
(actions/walk-to entities :ego [244 150] :skip-type :end)
(actions/transition-background entities :behind-house [122 140])
(actions/walk-to entities :ego [172 122]))
:cursor :right}
:up-dir {:box [105 180 203 240]
:script (actions/get-script
entities
(actions/walk-to entities :ego [137 204])
(actions/walk-to entities :ego [137 204] :skip-type :end)
(actions/transition-background entities :cat-tree [223 -51])
(actions/walk-straight-to entities :ego [200 10]))
:cursor :up}
:left-dir {:box [0 40 20 140]
:left-dir {:box [0 40 40 140]
:script (actions/get-script
entities
(walk-to-castle entities false))
(walk-to-castle entities))
:cursor :left}}
:layers {:day [(assoc (texture "outsidehouse/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outsidehouse/house.png") :x 0 :y 0 :baseline 122)