Merge pull request #252 from trifle-labs/audio-refactor

Audio refactor
trifle-labs · Aug 12, 2024 · 3846d3e · 3846d3e
2 parents ebfd9ce + 8811ae8
commit 3846d3e
Show file tree

Hide file tree

Showing 34 changed files with 174 additions and 343 deletions.
diff --git a/dist/index.html b/dist/index.html
diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/public/sound/ipod/ipod_14_FX.mp3.asd b/public/sound/ipod/ipod_14_FX.mp3.asd
diff --git a/public/sound/ipod/ipod_15_Delay_Reverb.mp3.asd b/public/sound/ipod/ipod_15_Delay_Reverb.mp3.asd
diff --git a/public/sound/ipod/ipod_2_T1.mp3.asd b/public/sound/ipod/ipod_2_T1.mp3.asd
diff --git a/public/sound/ipod/ipod_5_T4.mp3.asd b/public/sound/ipod/ipod_5_T4.mp3.asd
diff --git a/public/sound/ipod/ipod_7_T6.mp3.asd b/public/sound/ipod/ipod_7_T6.mp3.asd
diff --git a/public/sound/ipod/ipod_8_T7.mp3.asd b/public/sound/ipod/ipod_8_T7.mp3.asd
diff --git a/public/sound/ipod/ipod_hiss.mp3.asd b/public/sound/ipod/ipod_hiss.mp3.asd
diff --git a/public/sound/orbit/orbit_10_DT6.mp3.asd b/public/sound/orbit/orbit_10_DT6.mp3.asd
diff --git a/public/sound/orbit/orbit_3-Audio.mp3.asd b/public/sound/orbit/orbit_3-Audio.mp3.asd
diff --git a/public/sound/orbit/orbit_8_DT1.mp3.asd b/public/sound/orbit/orbit_8_DT1.mp3.asd
diff --git a/public/sound/orbit/orbit_9_DT2.mp3.asd b/public/sound/orbit/orbit_9_DT2.mp3.asd
diff --git a/public/sound/tracks/ipod.mp3 b/public/sound/tracks/ipod.mp3
diff --git a/public/sound/tracks/orbit.mp3 b/public/sound/tracks/orbit.mp3
diff --git a/public/sound/tracks/whistle.mp3 b/public/sound/tracks/whistle.mp3
diff --git a/public/sound/tracks/wii_A.mp3 b/public/sound/tracks/wii_A.mp3
diff --git a/public/sound/tracks/wii_B.mp3 b/public/sound/tracks/wii_B.mp3
diff --git a/public/sound/whistle/whistle_12_T11.mp3.asd b/public/sound/whistle/whistle_12_T11.mp3.asd
diff --git a/public/sound/whistle/whistle_12_T11.wav.asd b/public/sound/whistle/whistle_12_T11.wav.asd
diff --git a/public/sound/whistle/whistle_4_T3.wav.asd b/public/sound/whistle/whistle_4_T3.wav.asd
diff --git a/public/sound/whistle/whistle_7_T6.wav.asd b/public/sound/whistle/whistle_7_T6.wav.asd
diff --git a/public/sound/whistle/whistle_8_T7.wav.asd b/public/sound/whistle/whistle_8_T7.wav.asd
diff --git a/public/sound/whistle/whistle_8_T7_B.mp3.asd b/public/sound/whistle/whistle_8_T7_B.mp3.asd
diff --git a/public/sound/wii/wii_10_T9.mp3.asd b/public/sound/wii/wii_10_T9.mp3.asd
diff --git a/public/sound/wii/wii_12_T11.mp3.asd b/public/sound/wii/wii_12_T11.mp3.asd
diff --git a/public/sound/wii/wii_2_T1.mp3.asd b/public/sound/wii/wii_2_T1.mp3.asd
diff --git a/public/sound/wii/wii_4_T3.mp3.asd b/public/sound/wii/wii_4_T3.mp3.asd
diff --git a/public/sound/wii/wii_T5.mp3.asd b/public/sound/wii/wii_T5.mp3.asd
diff --git a/public/sound/wii/wii_chord.mp3.asd b/public/sound/wii/wii_chord.mp3.asd
diff --git a/src/anybody.js b/src/anybody.js
@@ -429,14 +429,19 @@ export class Anybody extends EventEmitter {
       case 'KeyP':
         if (!this.gameOver) this.setPause()
         break
+      case 'KeyM':
+        this.mute = !this.mute
+        break
     }
   }
 
   handleGameOver = ({ won }) => {
     if (this.handledGameOver) return
     this.handledGameOver = true
     this.gameoverTickerX = 0
-    // this.sound?.playGameOver({ won }) // TDDO: improve audio
+    if (this.level !== 0) {
+      this.sound?.playGameOver({ won }) // TDDO: improve audio
+    }
     this.gameOver = true
     this.won = won
     if (this.level !== 0 && !this.won) {
@@ -483,13 +488,16 @@ export class Anybody extends EventEmitter {
     if (options) {
       this.setOptions(options)
     }
-    if (this.level !== this.lastLevel) {
-      // this.starBG = null
-    }
     this.clearValues()
-    this.sound?.stop()
-    this.sound?.playStart()
-    this.sound?.setSong()
+    if (this.level !== this.lastLevel && this.level !== 1 && this.level !== 0) {
+      this.sound?.stop()
+      this.sound?.playStart()
+      this.sound?.setSong()
+      this.sound?.resume()
+    }
+    if (this.sound?.playbackRate !== 'normal') {
+      this.sound?.setPlaybackRate('normal')
+    }
     this.init()
     this.draw()
     if (beginPaused) {
@@ -523,9 +531,13 @@ export class Anybody extends EventEmitter {
 
     this.emit('paused', newPauseState)
     if (newPauseState) {
-      if (!mute) this.sound?.pause()
+      if (!mute) {
+        this.sound?.pause()
+      }
     } else {
-      if (!mute) this.sound?.resume()
+      if (!mute) {
+        this.sound?.resume()
+      }
     }
   }