Merge pull request #8504 from NBKelly/shuffle-sound

sound for shuffling

Author: NoahTheDuke

resources/public/sound/shuffle.mp3

@@ -6,7 +6,7 @@
    [game.core.engine :refer [trigger-event]]
    [game.core.flags :refer [zone-locked?]]
    [game.core.moving :refer [move move-zone]]
-   [game.core.say :refer [system-msg]]
+   [game.core.say :refer [system-msg play-sfx]]
    [game.core.servers :refer [name-zone]]
    [game.macros :refer [continue-ability msg req]]
    [game.utils :refer [enumerate-str enumerate-cards quantify]])
@@ -36,21 +36,24 @@
 
 (defn shuffle!
   "Shuffles the vector in @state [side kw]."
-  [state side kw]
-  (when (contains? #{:deck :hand :discard} kw)
-    (trigger-event state side (when (= :deck kw) (if (= :corp side) :corp-shuffle-deck :runner-shuffle-deck)))
-    (when (and (:breach @state)
-               (= :corp side)
-               (= :deck kw))
-      ;; we no longer know the cards in R&D, even if they were candidates before
-      (swap! state assoc-in [:breach :known-cids :deck] []))
-    (when (and (:access @state)
-               (:run @state)
-               (= :corp side)
-               (= :deck kw))
-      (swap! state assoc-in [:run :shuffled-during-access :rd] true))
-    (swap! state update-in [:stats side :shuffle-count] (fnil + 0) 1)
-    (swap! state update-in [side kw] shuffle-coll)))
+  ([state side kw] (shuffle! state side kw nil))
+  ([state side kw {:keys [no-sfx] :as args}]
+   (when (contains? #{:deck :hand :discard} kw)
+     (trigger-event state side (when (= :deck kw) (if (= :corp side) :corp-shuffle-deck :runner-shuffle-deck)))
+     (when (and (:breach @state)
+                (= :corp side)
+                (= :deck kw))
+       ;; we no longer know the cards in R&D, even if they were candidates before
+       (swap! state assoc-in [:breach :known-cids :deck] []))
+     (when (and (:access @state)
+                (:run @state)
+                (= :corp side)
+                (= :deck kw))
+       (swap! state assoc-in [:run :shuffled-during-access :rd] true))
+     (when-not no-sfx
+       (play-sfx state side "shuffle"))
+     (swap! state update-in [:stats side :shuffle-count] (fnil + 0) 1)
+     (swap! state update-in [side kw] shuffle-coll))))
 
 (defn shuffle-cards-into-deck!
   "Shuffles a given set of cards into the deck. Will print out what's happened. Will always shuffle."
@@ -115,6 +118,7 @@
   "Shuffle R&D/Stack."
   [state side {:keys [close]}]
   (swap! state update-in [side :deck] shuffle)
+  (play-sfx state side "shuffle")
   (if close
     (do
       (swap! state update-in [side] dissoc :view-deck)

resources/public/sound/shuffle.ogg

@@ -70,6 +70,7 @@
    "rez-other"
    "run-successful"
    "run-unsuccessful"
+   "shuffle"
    "time-out"
    "virus-purge"])