V2.2 Asteroid Overlaps, Bugfixes, Abstraction

Mshl2299 · Aug 12, 2024 · 305d0e2 · 305d0e2
1 parent 65403de
commit 305d0e2
Show file tree

Hide file tree

Showing 14 changed files with 838 additions and 1,106 deletions.
diff --git a/Audio/explosion.wav b/Audio/explosion.wav
diff --git a/Backgrounds/galaxyAnim.gif b/Backgrounds/galaxyAnim.gif
diff --git a/BlueExplosion/blueExplosion.gif b/BlueExplosion/blueExplosion.gif
diff --git a/Scripts/asteroids.js b/Scripts/asteroids.js
diff --git a/Scripts/audio.js b/Scripts/audio.js
@@ -67,6 +67,7 @@ function changeMenuMusic(source) {
 }
 
 function randomizeMenuMusic() {
+    menuMusic.pause();
     menuMusicNumber = Math.floor((Math.random() * 4));
     switch (menuMusicNumber) {
         case 0:
@@ -82,44 +83,7 @@ function randomizeMenuMusic() {
             menuMusic.src = "Audio/stageSelectJJunkala.wav";
             break;
     }
-}
-
-//navigation
-function prevMusicPage() {
-    //if on page 1 go to page 3
-    if (!musicPage1.classList.contains("hidden")) {
-        musicPage1.classList.add("hidden");
-        musicPage3.classList.remove("hidden");
-    }
-    //if on page 2 go to page 1
-    else if (!musicPage2.classList.contains("hidden")) {
-        musicPage2.classList.add("hidden");
-        musicPage1.classList.remove("hidden");
-    }
-    //if on page 3 go to page 2
-    else if (!musicPage3.classList.contains("hidden")) {
-        musicPage3.classList.add("hidden");
-        musicPage2.classList.remove("hidden");
-    }
-    clickSound.play();
-}
-function nextMusicPage() {
-    //if on page 1 go to page 2
-    if (!musicPage1.classList.contains("hidden")) {
-        musicPage1.classList.add("hidden");
-        musicPage2.classList.remove("hidden");
-    }
-    //if on page 2 go to page 3
-    else if (!musicPage2.classList.contains("hidden")) {
-        musicPage2.classList.add("hidden");
-        musicPage3.classList.remove("hidden");
-    }
-    //if on page 3 go to page 1
-    else if (!musicPage3.classList.contains("hidden")) {
-        musicPage3.classList.add("hidden");
-        musicPage1.classList.remove("hidden");
-    }
-    clickSound.play();
+    menuMusic.play();
 }
 
 function updateVolume() { //!!!

diff --git a/Scripts/detections.js b/Scripts/detections.js