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

intro tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-08 16:45:32 -07:00
parent c247afe96f
commit 778fe7fb40
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
desktop/src-common/advent/screens/rooms/dream.clj
View File

@@ -179,9 +179,10 @@
"Show yourself!" "Show yourself!"
{:run #(actions/talk entities :ego %)}]}) {:run #(actions/talk entities :ego %)}]})
(actions/talk entities :fairy-godfather "Taaaaaaaaaaaaaaaaaa-") (actions/talk entities :fairy-godfather "Taaaaaaaaaaaaaaaaaa-")
(sound! (utils/load-sound "dream/appear.ogg") :play (utils/current-sound-volume))
(particle-effect! (get-in @entities [:room :entities :magic]) :reset) (particle-effect! (get-in @entities [:room :entities :magic]) :reset)
(particle-effect! (get-in @entities [:room :entities :magic]) :start) (particle-effect! (get-in @entities [:room :entities :magic]) :start)
(actions/begin-animation entities :fairy-godfather :magic)
(fade-in entities) (fade-in entities)
(actions/transition-music entities :dream :duration 0.25 ) (actions/transition-music entities :dream :duration 0.25 )
(actions/talk entities :fairy-godfather "-daaaaaaaaaaaaa!") (actions/talk entities :fairy-godfather "-daaaaaaaaaaaaa!")
@@ -199,7 +200,7 @@
(particle-effect! (get-in @entities [:room :entities :magic]) :reset) (particle-effect! (get-in @entities [:room :entities :magic]) :reset)
(particle-effect! (get-in @entities [:room :entities :magic]) :start) (particle-effect! (get-in @entities [:room :entities :magic]) :start)
(actions/play-animation entities :fairy-godfather :magic) (actions/play-animation entities :fairy-godfather :magic)
(sound! (utils/load-sound "dream/appear.ogg") :play (utils/current-sound-volume))
(fade-in-tools entities) (fade-in-tools entities)
(Thread/sleep 2500) (Thread/sleep 2500)
@@ -342,7 +343,7 @@
(defn make [screen] (defn make [screen]
(let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1]) (let [fairy-godfather-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [0 1 2 3 2 1 0 1 4 3 2 1])
fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6]) fairy-godfather-talk-anim (utils/make-anim "dream/fairy-godfather.png" [63 77] 0.15 [5 6 7 8 7 6])
fairy-godfather-magic-anim (utils/make-anim "dream/fairy-godfather-magic.png" [100 77] 0.15 [0 1 2 3 4 4 4 4 4 4 4 4 4 3 2 1 0])] fairy-godfather-magic-anim (utils/make-anim "dream/fairy-godfather-magic.png" [100 77] 0.15 [0 1 2 3 4 4 4 4 3 2 1 0])]
(rooms/make :music {:intro :wind :day :dream} (rooms/make :music {:intro :wind :day :dream}
:interactions {:pit {:box [54 0 219 36] :interactions {:pit {:box [54 0 219 36]
:script (actions/get-script entities :script (actions/get-script entities
@@ -467,6 +468,8 @@
:anim fairy-godfather-anim :anim-start 0 :anim fairy-godfather-anim :anim-start 0
:path (catmull-rom-spline (map #(apply vector-2* %) [[200 130] [200 134]]) true) :path (catmull-rom-spline (map #(apply vector-2* %) [[200 130] [200 134]]) true)
:scaled true :scaled true
:magic-sound (utils/load-sound "dream/appear.ogg")
:anim-sound-frames {fairy-godfather-magic-anim {1 [:magic-sound 0.8]}}
:left {:walk fairy-godfather-anim :left {:walk fairy-godfather-anim
:talk fairy-godfather-talk-anim :talk fairy-godfather-talk-anim
:stand fairy-godfather-anim :stand fairy-godfather-anim