Merge branch 'h12-sfx-webaudio' into development

Timtam · Aug 5, 2024 · e5ba859 · e5ba859
2 parents 967a274 + 85af25a
commit e5ba859
Show file tree

Hide file tree

Showing 25 changed files with 13 additions and 14 deletions.
diff --git a/client/sfx/claim_hit.mp3 b/client/sfx/claim_hit.mp3
diff --git a/client/sfx/claim_hit.opus b/client/sfx/claim_hit.opus
diff --git a/client/sfx/join_game.mp3 b/client/sfx/join_game.mp3
diff --git a/client/sfx/join_game.opus b/client/sfx/join_game.opus
diff --git a/client/sfx/leave_game.mp3 b/client/sfx/leave_game.mp3
diff --git a/client/sfx/leave_game.opus b/client/sfx/leave_game.opus
diff --git a/client/sfx/no_interception.mp3 b/client/sfx/no_interception.mp3
diff --git a/client/sfx/no_interception.opus b/client/sfx/no_interception.opus
diff --git a/client/sfx/pay_token.mp3 b/client/sfx/pay_token.mp3
diff --git a/client/sfx/pay_token.opus b/client/sfx/pay_token.opus
diff --git a/client/sfx/play_hit.mp3 b/client/sfx/play_hit.mp3
diff --git a/client/sfx/play_hit.opus b/client/sfx/play_hit.opus
diff --git a/client/sfx/receive_token.mp3 b/client/sfx/receive_token.mp3
diff --git a/client/sfx/receive_token.opus b/client/sfx/receive_token.opus
diff --git a/client/sfx/stop_hit.mp3 b/client/sfx/stop_hit.mp3
diff --git a/client/sfx/stop_hit.opus b/client/sfx/stop_hit.opus
diff --git a/client/sfx/you_fail.mp3 b/client/sfx/you_fail.mp3
diff --git a/client/sfx/you_fail.opus b/client/sfx/you_fail.opus
diff --git a/client/sfx/you_lose.mp3 b/client/sfx/you_lose.mp3
diff --git a/client/sfx/you_lose.opus b/client/sfx/you_lose.opus
diff --git a/client/sfx/you_score.mp3 b/client/sfx/you_score.mp3
diff --git a/client/sfx/you_score.opus b/client/sfx/you_score.opus
diff --git a/client/sfx/you_win.mp3 b/client/sfx/you_win.mp3
diff --git a/client/sfx/you_win.opus b/client/sfx/you_win.opus
diff --git a/client/src/sfx-player.tsx b/client/src/sfx-player.tsx
@@ -20,58 +20,57 @@ const getSfx = (sfx: Sfx): Howl => {
 
     switch (sfx) {
         case Sfx.noInterception: {
-            url = new URL("../sfx/no_interception.mp3", import.meta.url).href
+            url = new URL("../sfx/no_interception.opus", import.meta.url).href
             break
         }
         case Sfx.payToken: {
-            url = new URL("../sfx/pay_token.mp3", import.meta.url).href
+            url = new URL("../sfx/pay_token.opus", import.meta.url).href
             break
         }
         case Sfx.playHit: {
-            url = new URL("../sfx/play_hit.mp3", import.meta.url).href
+            url = new URL("../sfx/play_hit.opus", import.meta.url).href
             break
         }
         case Sfx.receiveToken: {
-            url = new URL("../sfx/receive_token.mp3", import.meta.url).href
+            url = new URL("../sfx/receive_token.opus", import.meta.url).href
             break
         }
         case Sfx.stopHit: {
-            url = new URL("../sfx/stop_hit.mp3", import.meta.url).href
+            url = new URL("../sfx/stop_hit.opus", import.meta.url).href
             break
         }
         case Sfx.youFail: {
-            url = new URL("../sfx/you_fail.mp3", import.meta.url).href
+            url = new URL("../sfx/you_fail.opus", import.meta.url).href
             break
         }
         case Sfx.youLose: {
-            url = new URL("../sfx/you_lose.mp3", import.meta.url).href
+            url = new URL("../sfx/you_lose.opus", import.meta.url).href
             break
         }
         case Sfx.youScore: {
-            url = new URL("../sfx/you_score.mp3", import.meta.url).href
+            url = new URL("../sfx/you_score.opus", import.meta.url).href
             break
         }
         case Sfx.youWin: {
-            url = new URL("../sfx/you_win.mp3", import.meta.url).href
+            url = new URL("../sfx/you_win.opus", import.meta.url).href
             break
         }
         case Sfx.joinGame: {
-            url = new URL("../sfx/join_game.mp3", import.meta.url).href
+            url = new URL("../sfx/join_game.opus", import.meta.url).href
             break
         }
         case Sfx.leaveGame: {
-            url = new URL("../sfx/leave_game.mp3", import.meta.url).href
+            url = new URL("../sfx/leave_game.opus", import.meta.url).href
             break
         }
         case Sfx.youClaim: {
-            url = new URL("../sfx/claim_hit.mp3", import.meta.url).href
+            url = new URL("../sfx/claim_hit.opus", import.meta.url).href
             break
         }
     }
     return new Howl({
         src: [url],
-        format: "audio/mpeg",
-        html5: true,
+        format: "opus",
     })
 }