diff --git a/audio/asteroid-hit-1.flac b/audio/asteroid-hit-1.flac new file mode 100644 index 0000000..c9925aa Binary files /dev/null and b/audio/asteroid-hit-1.flac differ diff --git a/audio/asteroid-hit-2.flac b/audio/asteroid-hit-2.flac new file mode 100644 index 0000000..ae19a76 Binary files /dev/null and b/audio/asteroid-hit-2.flac differ diff --git a/audio/asteroid-hit-3.flac b/audio/asteroid-hit-3.flac new file mode 100644 index 0000000..67dfedf Binary files /dev/null and b/audio/asteroid-hit-3.flac differ diff --git a/audio/asteroid-hit-4.flac b/audio/asteroid-hit-4.flac new file mode 100644 index 0000000..0dcccbd Binary files /dev/null and b/audio/asteroid-hit-4.flac differ diff --git a/audio/asteroid-hit-5.flac b/audio/asteroid-hit-5.flac new file mode 100644 index 0000000..e8ab91e Binary files /dev/null and b/audio/asteroid-hit-5.flac differ diff --git a/audio/asteroid-hit-6.flac b/audio/asteroid-hit-6.flac new file mode 100644 index 0000000..7a8b9b0 Binary files /dev/null and b/audio/asteroid-hit-6.flac differ diff --git a/audio/asteroid-hit-7.flac b/audio/asteroid-hit-7.flac new file mode 100644 index 0000000..3391f3b Binary files /dev/null and b/audio/asteroid-hit-7.flac differ diff --git a/audio/asteroid-hit-8.flac b/audio/asteroid-hit-8.flac new file mode 100644 index 0000000..bf1d2eb Binary files /dev/null and b/audio/asteroid-hit-8.flac differ diff --git a/audio/crash.flac b/audio/crash.flac new file mode 100644 index 0000000..89b6e94 Binary files /dev/null and b/audio/crash.flac differ diff --git a/audio/space.flac b/audio/space.flac new file mode 100644 index 0000000..461a95d Binary files /dev/null and b/audio/space.flac differ diff --git a/script/audioLibrary.js b/script/audioLibrary.js index bd6eda2..b44e03b 100644 --- a/script/audioLibrary.js +++ b/script/audioLibrary.js @@ -83,8 +83,13 @@ var AudioLibrary = { REINFORCE_HULL: 'audio/reinforce-hull.flac', UPGRADE_ENGINE: 'audio/upgrade-engine.flac', LIFT_OFF: 'audio/lift-off.flac', - ASTEROID_HIT1: 'audio/asteroid-hit-1.flac', - ASTEROID_HIT2: 'audio/asteroid-hit-2.flac', - ASTEROID_HIT3: 'audio/asteroid-hit-3.flac', + ASTEROID_HIT_1: 'audio/asteroid-hit-1.flac', + ASTEROID_HIT_2: 'audio/asteroid-hit-2.flac', + ASTEROID_HIT_3: 'audio/asteroid-hit-3.flac', + ASTEROID_HIT_4: 'audio/asteroid-hit-4.flac', + ASTEROID_HIT_5: 'audio/asteroid-hit-5.flac', + ASTEROID_HIT_6: 'audio/asteroid-hit-6.flac', + ASTEROID_HIT_7: 'audio/asteroid-hit-7.flac', + ASTEROID_HIT_8: 'audio/asteroid-hit-8.flac', CRASH: 'audio/crash.flac', }; \ No newline at end of file diff --git a/script/space.js b/script/space.js index 9740c1d..78b020a 100644 --- a/script/space.js +++ b/script/space.js @@ -67,6 +67,7 @@ var Space = { }); Space.startAscent(); Space._shipTimer = setInterval(Space.moveShip, 33); + AudioEngine.changeMusic(AudioLibrary.MUSIC_SPACE); }, setTitle: function() { @@ -74,22 +75,16 @@ var Space = { var t; if(Space.altitude < 10) { t = _("Troposphere"); - AudioEngine.changeMusic(AudioLibrary.MUSIC_TROPOSPHERE); } else if(Space.altitude < 20) { t = _("Stratosphere"); - AudioEngine.changeMusic(AudioLibrary.MUSIC_STRATOSPHERE); } else if(Space.altitude < 30) { t = _("Mesosphere"); - AudioEngine.changeMusic(AudioLibrary.MUSIC_MESOSPHERE); } else if(Space.altitude < 45) { t = _("Thermosphere"); - AudioEngine.changeMusic(AudioLibrary.MUSIC_THERMOSPHERE); } else if(Space.altitude < 60){ t = _("Exosphere"); - AudioEngine.changeMusic(AudioLibrary.MUSIC_EXOSPHERE); } else { t = _("Space"); - AudioEngine.changeMusic(AudioLibrary.MUSIC_SPACE); } document.title = t; } @@ -143,9 +138,20 @@ var Space = { Space.hull--; Space.updateHull(); - // play random asteroid hit - var r = Math.floor(Math.random() * 2) + 1; - AudioEngine.playSound(AudioLibrary['ASTEROID_HIT' + r]); + // play audio on asteroid hit + // higher altitudes play higher frequency hits + var r = Math.floor(Math.random() * 2); + if(Space.altitude > 40) { + r += 6; + AudioEngine.playSound(AudioLibrary['ASTEROID_HIT_' + r]); + } else if(Space.altitude > 20) { + r += 4; + AudioEngine.playSound(AudioLibrary['ASTEROID_HIT_' + r]); + } else { + r += 1; + AudioEngine.playSound(AudioLibrary['ASTEROID_HIT_' + r]); + } + console.log(r); if(Space.hull === 0) { Space.crash();