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

water splashes.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-27 21:25:04 -07:00
parent 9f34bfc949
commit 813715069a
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,11 +322,16 @@
(actions/give entities :carrot))))}}
:flies-sound {:sound (utils/load-sound "outside-castle/flies2.ogg")
:id nil}
:layers [(assoc (utils/get-texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "outside-castle/blanket.png") :x 60 :y (- 240 173) :baseline 1)
(assoc (utils/get-texture "outside-castle/brush-bl.png") :origin-x 25 :origin-y 20 :scale-x 1.0 :scale-y 1.0 :x 25 :y 0 :baseline 240 :parallax 1.2)
(assoc (utils/get-texture "outside-castle/brush-br.png") :origin-x 88 :origin-y 20 :scale-x 1.0 :scale-y 1.0 :x 315 :y 0 :baseline 240 :parallax 1.2)
(assoc (utils/get-texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]
:layers {:day [(assoc (utils/get-texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "outside-castle/blanket.png") :x 60 :y (- 240 173) :baseline 1)
(assoc (utils/get-texture "outside-castle/brush-bl.png") :origin-x 25 :origin-y 20 :scale-x 1.0 :scale-y 1.0 :x 25 :y 0 :baseline 240 :parallax 1.2)
(assoc (utils/get-texture "outside-castle/brush-br.png") :origin-x 88 :origin-y 20 :scale-x 1.0 :scale-y 1.0 :x 315 :y 0 :baseline 240 :parallax 1.2)
(assoc (utils/get-texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]
:night [(assoc (utils/get-texture "outside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "outside-castle/brush-bl.png") :origin-x 25 :origin-y 20 :scale-x 1.0 :scale-y 1.0 :x 25 :y 0 :baseline 240 :parallax 1.2)
(assoc (utils/get-texture "outside-castle/brush-br.png") :origin-x 88 :origin-y 20 :scale-x 1.0 :scale-y 1.0 :x 315 :y 0 :baseline 240 :parallax 1.2)
(assoc (utils/get-texture "outside-castle/walk-behind.png") :x 0 :y 0 :baseline 69)]}
:entities {:peddler (actions/start-animation screen
(assoc (utils/get-texture "outside-castle/peddler.png") :x 110 :y 90 :baseline 150 :anim nil
:anim-sound-frames {peddler-stand {8 [:blink 0.3 0.8]

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

@@ -96,6 +96,7 @@
(actions/walk-to entities :ego [141 90] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :money)
(actions/play-sound entities "outsidehouse/drop.ogg" 0.2)
(actions/camera-shake entities 2)
(Thread/sleep 500)
(actions/talk entities :ego "I guess that's what you could call 'money in the pot'."))
@@ -107,6 +108,7 @@
(dawn-fade entities)
(actions/talk entities :ego "Here goes!")
(actions/play-animation entities :ego :reach-start :stop? false)
(actions/play-sound entities "outsidehouse/drop.ogg" 0.2)
(actions/camera-shake entities 12)
(magic entities)
@@ -141,6 +143,7 @@
(actions/walk-to entities :ego [141 90] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :broken-clock)
(actions/play-sound entities "outsidehouse/drop.ogg" 0.2)
(actions/camera-shake entities 2)
(Thread/sleep 500)
(actions/talk entities :ego "Just in the nick of time."))
@@ -155,6 +158,7 @@
(actions/walk-to entities :ego [141 90] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :spell-component)
(actions/play-sound entities "outsidehouse/drop.ogg" 0.2)
(actions/camera-shake entities 2)
(Thread/sleep 500)
(actions/talk entities :ego "I poured it in. Now what?"))
@@ -514,7 +518,7 @@
(update-in entities [:room :entities] #(assoc % :cauldron (get-in entities [:room :cauldron])))
(utils/play-sound! screen entities
(get-in entities [:room :cauldron-sound :sound])
(utils/sourced-volume-fn :cauldron 0.1 [139 73])
(utils/sourced-volume-fn :cauldron 0.075 [139 73])
(utils/get-sound-pan 139)
:loop)
(add-wizard-if-necessary entities)