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

added drop sound.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-10 13:24:45 -07:00
parent e830e62421
commit 7c85e01e9b
5 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/gametodos.txt
View File

@@ -1,11 +1,11 @@
ART ART
+ Update all collisions + Update all collisions
+ Have georgia mcgorgeous talk to you
PROGRAMMING PROGRAMMING
+ try to have dialogue for every wrong interaction + try to have dialogue for every wrong interaction
+ preload all sounds + preload all sounds
+ behind house left direction not great + behind house left direction not great
+
IOS IOS
+ all mp3s + all mp3s
@@ -34,9 +34,7 @@ AUDIO
+ antique sigh + antique sigh
+ bloodclot grunt + bloodclot grunt
+ bloodclot explode + bloodclot explode
+ fountain
+ crowbar + crowbar
+ door
+ ambient forest + ambient forest
+ get sick + get sick
+ sigh + sigh

15
desktop/src-common/advent/actions.clj
View File

@@ -514,8 +514,11 @@
:none))) :none)))
(defn play-sound (defn play-sound
([entities sound-file vol] ([entities sound-file vol & [wait?]]
(let [s (sound sound-file)] (let [wait? (if (nil? wait?) true wait?)
s (if (string? sound-file)
(sound sound-file)
sound-file)]
(run-action entities (run-action entities
(begin [this screen entities] (begin [this screen entities]
(utils/play-sound! screen entities s (constantly vol))) (utils/play-sound! screen entities s (constantly vol)))
@@ -523,9 +526,11 @@
(continue [this screen entities] entities) (continue [this screen entities] entities)
(done? [this screen entities] (done? [this screen entities]
(not (seq (filter (if wait?
#(= s (:sound %)) (not (seq (filter
(get-in entities [:current-sounds :value]))))) #(= s (:sound %))
(get-in entities [:current-sounds :value]))))
true))
(terminate [this screen entities] (terminate [this screen entities]
entities) entities)

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

@@ -398,6 +398,10 @@
(actions/do-dialogue entities :ego "Yes! Now, before he gets back!") (actions/do-dialogue entities :ego "Yes! Now, before he gets back!")
(actions/pause-camera entities) (actions/pause-camera entities)
(actions/walk-straight-to entities :ego [173 51] :anim :jump :update-baseline? false :speed 2.0) (actions/walk-straight-to entities :ego [173 51] :anim :jump :update-baseline? false :speed 2.0)
(actions/play-sound entities
(get-in @entities [:room :entities :ego :drop-sound])
0.2
false)
(actions/walk-straight-to entities :ego [200 -80] :anim :stand :update-baseline? false :speed 3.0) (actions/walk-straight-to entities :ego [200 -80] :anim :stand :update-baseline? false :speed 3.0)
(actions/remove-item entities :dream-sword) (actions/remove-item entities :dream-sword)
(actions/remove-item entities :broom) (actions/remove-item entities :broom)

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

@@ -251,9 +251,14 @@
:ball-n-chain (actions/get-script entities (if (get-in @entities [:state :bent-bars?]) :ball-n-chain (actions/get-script entities (if (get-in @entities [:state :bent-bars?])
(do (actions/walk-to entities :ego [102 88] :face :right) (do (actions/walk-to entities :ego [102 88] :face :right)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(actions/play-sound entities
(get-in @entities [:room :entities :ego :drop-sound])
0.2)
(actions/update-state entities #(assoc % :dropped-ball? true)) (actions/update-state entities #(assoc % :dropped-ball? true))
(actions/do-dialogue entities :ego "Geronimo!!" (actions/do-dialogue entities :ego "Geronimo!!")
:ego "*crash*!") (actions/play-sound entities
(get-in @entities [:room :entities :ego :breakglass-sound])
0.2)
(Thread/sleep 200) (Thread/sleep 200)
(actions/begin-animation entities :warden :stand) (actions/begin-animation entities :warden :stand)
(Thread/sleep 300) (Thread/sleep 300)

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

@@ -629,6 +629,7 @@ void main()
:origin-x 9 :origin-x 9
:origin-y 0 :origin-y 0
:scaled true :scaled true
:drop-sound (utils/load-sound "ego/drop.ogg")
:milk-sound (utils/load-sound "outsidehouse/milk.ogg") :milk-sound (utils/load-sound "outsidehouse/milk.ogg")
:step-sound-1 (utils/load-sound "ego/step-1.ogg") :step-sound-1 (utils/load-sound "ego/step-1.ogg")
:step-sound-2 (utils/load-sound "ego/step-2.ogg") :step-sound-2 (utils/load-sound "ego/step-2.ogg")