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

fixed sound problems.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-26 15:08:51 +01:00
parent dc5c4d71d5
commit 4f281a0522
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,13 +249,18 @@
(actions/transition-music entities nil :duration 0.15))
(defn pull-sword [entities]
(actions/play-animation entities :ego :reach)
(actions/play-animation entities :ego :reach-start :stop? false)
(actions/pause-camera entities)
(actions/transition-music entities :pull-sword)
(actions/add-entity entities :blackout (get-in @entities [:room :blackout]))
(actions/add-entity entities :pull-sword (get-in @entities [:room :pull-sword]))
(actions/transition-music entities :pull-sword
:between (fn [e]
(as-> e e
(assoc-in e [:room :entities :blackout]
(get-in e [:room :blackout]))
(assoc-in e [:room :entities :pull-sword]
(get-in e [:room :pull-sword])))))
(actions/play-animation entities :pull-sword :pull-sword)
(actions/play-animation entities :ego :reach-stop)
(actions/give entities :sword)
(actions/remove-entity entities :sword)
(actions/remove-entity entities :pull-sword)
@@ -442,9 +447,9 @@
(assoc (utils/get-texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97)
(assoc (utils/get-texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]}
:blackout (assoc (utils/get-texture "black.png")
:x 0 :y 0
:width 320
:height 240 :opacity 0.8
:x -10 :y -10
:width 340
:height 260 :opacity 0.8
:baseline 239)
:pull-sword (assoc (animation->texture screen pull-sword-anim)
:x 10