multiple step sounds

desktop/gametodos.txt

@@ -14,7 +14,6 @@ IOS
 + update-override slow on IOS
 
 AUDIO
-  + Walking
   + blink
   + scratch
   + peddler scratch

desktop/src-common/advent/screens/scene.clj

@@ -518,6 +518,13 @@ void main()
         crawl-stand (utils/make-anim "ego/crawl.png" [39 25] 0.2 [0])
         crawl-hide (utils/make-anim "ego/crawl.png" [39 25] 0.1 (flatten [(repeat 10 3) (range 4 7) (repeat 50 6) (reverse (range 4 7) ) (repeat 20 3)]))
         standup (utils/make-anim "ego/standup.png" [45 55] 0.2 (range 5))
+        choose-step-sound (fn [entities]
+                            (if (#{:inside-house :inside-stash :inside-cafeteria :inside-antique :inside-jail}
+                                 (get-in entities [:state :last-room]))
+                              :blink
+                              (rand-nth [:step-sound-1 :step-sound-2 :step-sound-3 :step-sound-4])))
+
+        
 
         ego {:right {:walk walk-right
                      :stand stand-anim
@@ -625,6 +632,8 @@ void main()
              :milk-sound (utils/load-sound "outsidehouse/milk.ogg")
              :step-sound-1 (utils/load-sound "ego/step-1.ogg")
              :step-sound-2 (utils/load-sound "ego/step-2.ogg")
+             :step-sound-3 (utils/load-sound "ego/step-3.ogg")
+             :step-sound-4 (utils/load-sound "ego/step-4.ogg")
              :sigh-sound (utils/load-sound "ego/sigh.ogg")
              :breakglass-sound (utils/load-sound "ego/breakglass.ogg")
              :idea-sound (utils/load-sound "ego/idea.ogg")
@@ -643,10 +652,10 @@ void main()
              :x (first start-pos) :y (last start-pos)
              :id "ego"}
         
-        ego (assoc ego :anim-sound-frames {(get-in ego [:left :walk]) {2 [:step-sound-1 1.0]
+        ego (assoc ego :anim-sound-frames {(get-in ego [:left :walk]) {2 [choose-step-sound 0.6]
-                                                                       6 [:step-sound-2 0.8]}
+                                                                       6 [choose-step-sound 0.6]}
-                                           (get-in ego [:right :walk]) {2 [:step-sound-1 1.0]
+                                           (get-in ego [:right :walk]) {2 [choose-step-sound 0.6]
-                                                                        6 [:step-sound-2 0.8]}
+                                                                        6 [choose-step-sound 0.6]}
 
                                            (get-in ego [:left :talk] ) {2 [:blink 0.15]}
                                            (get-in ego [:right :talk] ) {2 [:blink 0.15]}
@@ -803,10 +812,13 @@ void main()
   (if (and (not= previous-frame-index current-frame-index)
            ((set (keys anim-sound-frames)) anim))
     (if-let [[snd vol-scale] (get-in anim-sound-frames [anim current-frame-index])]
-      (utils/play-sound! screen entities
+      (let [snd (if (fn? snd)
-                   (or (snd e) (snd (:sounds entities)))
+                  (snd entities)
-                   (utils/sourced-volume-fn target vol-scale [x y])
+                  snd)]
-                   (utils/get-sound-pan x))
+        (utils/play-sound! screen entities
+                           (or (snd e) (snd (:sounds entities)))
+                           (utils/sourced-volume-fn target vol-scale [x y])
+                           (utils/get-sound-pan x)))
       entities)
     entities))