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

Merge branch 'master' of https://bitbucket.org/brycecovertoperations/advent

Browse Source
This commit is contained in:
Remington Covert
2015-04-29 19:20:14 -07:00
parent d6ac6a6628 39cd09a496
commit 066cfbd733
21 changed files with 101 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,10 +223,13 @@
(actions/update-state entities #(assoc % :seen-frankie? true)))
(defn go-through-gate [entities]
(actions/walk-to entities :ego [82 180])
(if (should-block? entities)
(block-entrance entities)
(do
(actions/walk-to entities :ego [82 180] :face :left)
(block-entrance entities))
(do
(actions/walk-to entities :ego [82 180])
(actions/walk-straight-to entities :ego [61 182])
(actions/transition-background entities :inside-castle [295 145])
(actions/walk-to entities :ego [245 90]))))
@@ -291,9 +294,12 @@
(actions/play-animation entities :ego :squat)
(actions/talk entities :ego "No one will notice one missing.")
(actions/give entities :carrot))))}}
:layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)]
:night [(assoc (texture "outside-castle/background-dark.png") :x 0 :y 0 :baseline 0)]
:sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)]}
:layers {:day [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]
:night [(assoc (texture "outside-castle/background-dark.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/walk-behind-dark.png") :x 0 :y 0 :baseline 240)]
:sunrise [(assoc (texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 240)]}
:entities {:peddler (actions/start-animation screen
(assoc (texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil
:anim-sound-frames {peddler-stand {23 [:scratch 1.0]}