From 93113b8501160aee4b9e644416a90444eb7490bb Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Tue, 11 Oct 2016 16:04:37 -0600 Subject: [PATCH] Adjusted music system --- www/js/music.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/js/music.js b/www/js/music.js index 853f6cf..266d193 100644 --- a/www/js/music.js +++ b/www/js/music.js @@ -43,7 +43,7 @@ function playAudio() { return; } // If something is going on, come back in 10 seconds. - if (audio_doneplaying && audio_isplaying) { + if ((audio_doneplaying && audio_isplaying) || !lockGot) { setTimeout(playAudio, 10 * 1000); return; } @@ -52,7 +52,7 @@ function playAudio() { queuesong("Sisters of Snow Assent.mp3"); } else if (rawWeatherData.icon == "rain" || terrainType == 0) { queuesong("We Dream of Booty.mp3"); - } else if (terrainType >= 1 && terrainType <= 5) { + } else if (terrainType >= 1 && terrainType <= 6) { queuesong("Enter the Woods.mp3"); } else { queuesong("Heroes March.mp3");