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

minor tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2015-08-14 23:12:55 -07:00
parent a8da84facf
commit f670f25d82
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
desktop/src-common/advent/screens/rooms/outside_castle.clj
View File

@@ -175,11 +175,16 @@
(actions/transition-background entities :castle-gate [340 40])
(actions/walk-straight-to entities :ego [300 45])
(if (get-in @entities [:state :seen-frankie?])
(do
(actions/do-dialogue entities
:frankie "Well, well, well. What have we here boys?"
:frankie "It's good ol' Dipstick again.")
(actions/play-animation entities :frankie :laugh))
((rand-nth [#(do
(actions/do-dialogue entities
:frankie "Well, well, well. What have we here boys?"
:frankie "It's good ol' Dipstick again.")
(actions/play-animation entities :frankie :laugh))
#(do
(actions/do-dialogue entities
:frankie "Quiet boys."
:frankie "Dipstick's here.")
)]))
(do
(actions/do-dialogue entities :frankie "Well, well, well. What have we here boys?")
(actions/play-animation entities :frankie :glance)
@@ -242,16 +247,16 @@
(actions/update-state entities #(assoc % :seen-frankie? true)))
(defn go-through-gate [entities]
(defn go-through-gate [entities & {:keys [skip-type stop?] :or {skip-type :end stop? true}}]
(if (should-block? entities)
(do
(actions/walk-to entities :ego [82 180] :face :left :skip-type :end)
(actions/walk-to entities :ego [82 180] :face :left :skip-type skip-type)
(block-entrance entities))
(do
(actions/walk-to entities :ego [82 180] :skip-type :end :stop? false)
(actions/walk-to entities :ego [82 180] :skip-type skip-type :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] :skip-type :end))))
(actions/walk-to entities :ego [245 90] :skip-type skip-type :stop? stop?))))
(defn add-note-if-necessary [entities]