diff --git a/src/AudioManager.hx b/src/AudioManager.hx index 9fc59ea8..3864589a 100644 --- a/src/AudioManager.hx +++ b/src/AudioManager.hx @@ -60,7 +60,7 @@ class AudioManager { public static function playShell() { AudioManager.manager.stopByName("music"); - var sndres = ResourceLoader.getAudio("data/sound/music/Pianoforte.ogg"); + var sndres = ResourceLoader.getAudio("data/sound/shell.ogg"); if (sndres == null) return; sndres.acquire(); diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index 85426541..7dd8eb55 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -367,11 +367,12 @@ class MarbleWorld extends Scheduler { this.scene.addChild(this.sky); this._ready = true; - var musicFileName = 'data/sound/music/' + this.mission.missionInfo.music; - if (ResourceLoader.exists(musicFileName)) - AudioManager.playMusic(ResourceLoader.getResource(musicFileName, ResourceLoader.getAudio, this.soundResources), this.mission.missionInfo.music); - else - AudioManager.playShell(); + var musicFileName = [ + 'data/sound/groovepolice.ogg', + 'data/sound/classic vibe.ogg', + 'data/sound/beach party.ogg' + ][(mission.index + 1) % 3]; + AudioManager.playMusic(ResourceLoader.getResource(musicFileName, ResourceLoader.getAudio, this.soundResources), musicFileName); MarbleGame.canvas.clearContent(); if (this.endPad != null) this.endPad.generateCollider();