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

music.

Browse Source
This commit is contained in:
Bryce Covert
2014-12-24 13:43:24 -08:00
parent 5d9bf0b7f3
commit ec51db0ee0
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,6 +98,7 @@
(defn pull-sword [entities] (defn pull-sword [entities]
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(actions/transition-music entities :town-1 :pull-sword)
(actions/add-entity entities :blackout (get-in @entities [:room :blackout])) (actions/add-entity entities :blackout (get-in @entities [:room :blackout]))
(actions/add-entity entities :pull-sword (get-in @entities [:room :pull-sword])) (actions/add-entity entities :pull-sword (get-in @entities [:room :pull-sword]))
(actions/play-animation entities :pull-sword :pull-sword) (actions/play-animation entities :pull-sword :pull-sword)
@@ -105,6 +106,7 @@
(actions/remove-entity entities :sword) (actions/remove-entity entities :sword)
(actions/remove-entity entities :pull-sword) (actions/remove-entity entities :pull-sword)
(actions/remove-entity entities :blackout) (actions/remove-entity entities :blackout)
(actions/transition-music entities :pull-sword :town-1)
(actions/do-dialogue entities :ego "That was weird." (actions/do-dialogue entities :ego "That was weird."
:ego "I have to go show my friends!") :ego "I have to go show my friends!")
(actions/walk-to entities :ego [85 145] :face :right) (actions/walk-to entities :ego [85 145] :face :right)
@@ -153,10 +155,10 @@
game-player-stand (animation 0.15 (for [i [0 0 0 0 0 0 0 0 0 0 0 1]] game-player-stand (animation 0.15 (for [i [0 0 0 0 0 0 0 0 0 0 0 1]]
(aget game-player-talk-sheet 0 i))) (aget game-player-talk-sheet 0 i)))
game-player-flex (animation 0.075 (for [i [0 0 4 4 5 5 5 5 5 5 5 6 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 6 5 5 5 5 5 5 5 5 5 5 4 4 0 0 0 0]] game-player-flex (animation 0.075 (for [i [0 0 4 4 5 5 5 5 5 5 5 6 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 6 5 5 5 5 5 5 5 5 5 5 4 4 0 0 0 0]]
(aget game-player-talk-sheet 0 i))) (aget game-player-talk-sheet 0 i)))
trophy (utils/make-anim "inside-castle/trophy.png" [16 16] 0.1 (flatten [(repeat 50 0) 1 2 3 3 3 3 2 1])) trophy (utils/make-anim "inside-castle/trophy.png" [16 16] 0.1 (flatten [(repeat 50 0) 1 2 3 3 3 3 2 1]))
pull-sword-anim (utils/make-anim "inside-castle/pull-sword.png" [95 190] 0.10 (flatten [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 2 2 2 2 2 2 3 2 3 2 3 3 2 3 2 2 3 3 2 3 2 3 2 3 2 3 2 3 2 2 3 3 3 2 3 2 3 3 2 3 2 3 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1]))] pull-sword-anim (utils/make-anim "inside-castle/pull-sword.png" [95 190] 0.10 (flatten [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 2 2 2 2 2 2 3 2 3 2 3 3 2 3 2 2 3 3 2 3 2 3 2 3 2 3 2 3 2 2 3 3 3 2 3 2 3 3 2 3 2 3 2 2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 ]))]
(rooms/make :music :town-1 (rooms/make :music :town-1
:interactions :interactions
{:right-door {:box [286 140 306 160] {:right-door {:box [286 140 306 160]

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

@@ -118,6 +118,7 @@
(cond (actions/has-obtained? entities :balloon) (do-completed-peddler-conversation entities) (cond (actions/has-obtained? entities :balloon) (do-completed-peddler-conversation entities)
(get-in @entities [:state :wants-toy]) (do-wants-toy-conversation entities) (get-in @entities [:state :wants-toy]) (do-wants-toy-conversation entities)
:else (do-initial-peddler-conversation entities))) :else (do-initial-peddler-conversation entities)))
(defn make [screen] (defn make [screen]
(let [peddler-sheet (texture! (texture "outside-castle/peddler-talk.png" ) :split 18 36) (let [peddler-sheet (texture! (texture "outside-castle/peddler-talk.png" ) :split 18 36)
peddler-talk (animation 0.18 (for [i (flatten [2 3 2 3 2 3 6 1 0 1 0 1 0 1 0 1 2 3 2 3 2 3 6 4 5 4 5 4 5 4 5])] peddler-talk (animation 0.18 (for [i (flatten [2 3 2 3 2 3 6 1 0 1 0 1 0 1 0 1 2 3 2 3 2 3 6 4 5 4 5 4 5 4 5])]

3
desktop/src-common/advent/screens/scene.clj
View File

@@ -314,7 +314,8 @@
:town-1 (make-music "town-music-1.ogg") :town-1 (make-music "town-music-1.ogg")
:town-2 (make-music "town-music-2.ogg") :town-2 (make-music "town-music-2.ogg")
:inside-fangald (make-music "inside-fangald.ogg") :inside-fangald (make-music "inside-fangald.ogg")
:fight (make-music "megaboss.mp3")} :fight (make-music "megaboss.mp3")
:pull-sword (make-music "pull-sword.ogg")}
:state (get-state) :state (get-state)
:actions {:object nil :actions {:object nil
:channel (chan) :channel (chan)