diff --git a/UWP/Content/Content.mgcb b/UWP/Content/Content.mgcb index 0fa7ed6..069735d 100644 --- a/UWP/Content/Content.mgcb +++ b/UWP/Content/Content.mgcb @@ -1,4 +1,4 @@ - + #----------------------------- Global Properties ----------------------------# /outputDir:bin/$(Platform) @@ -697,6 +697,12 @@ /processorParam:Quality=Best /build:../../www/sound/sac.wav;sound/sac.wav +#begin ../../www/sound/skull.wav +/importer:WavImporter +/processor:SoundEffectProcessor +/processorParam:Quality=Best +/build:../../www/sound/skull.wav;sound/skull.wav + #begin ../../www/sound/time_end.wav /importer:WavImporter /processor:SoundEffectProcessor @@ -720,3 +726,4 @@ /processorParam:MakeSquare=False /processorParam:TextureFormat=Color /build:CONTROLS.png + diff --git a/UWP/GameScreen.cs b/UWP/GameScreen.cs index 383978e..8cda611 100644 --- a/UWP/GameScreen.cs +++ b/UWP/GameScreen.cs @@ -213,6 +213,7 @@ private void PlaySounds(Sound soundsToPlay) if (soundsToPlay.HasFlag(Sound.Draw)) soundAssets.Draw.Play(); if (soundsToPlay.HasFlag(Sound.Clock)) soundAssets.Clock.Play(); if (soundsToPlay.HasFlag(Sound.TimeEnd)) soundAssets.TimeEnd.Play(); + if (soundsToPlay.HasFlag(Sound.Skull)) soundAssets.Skull.Play(); } } } diff --git a/UWP/Player.cs b/UWP/Player.cs index 252f36a..e1d20b3 100644 --- a/UWP/Player.cs +++ b/UWP/Player.cs @@ -158,6 +158,7 @@ public override void Update() } else if (powerUpType == PowerUpType.Skull) { + terrain.PlaySound(Sound.Skull); skullIndex = 600; SkullType = (SkullType)Terrain.Random.Next(5); } diff --git a/UWP/Sound.cs b/UWP/Sound.cs index e0b8eb2..eb4a0ee 100644 --- a/UWP/Sound.cs +++ b/UWP/Sound.cs @@ -49,6 +49,7 @@ public void Play() public Sound Draw; public Sound Clock; public Sound TimeEnd; + public Sound Skull; public Music[] Musics; public static SoundAssets Load(ContentManager content) @@ -77,6 +78,7 @@ Music loadMusic(string name) Draw = loadSound("draw"), Clock = loadSound("clock"), TimeEnd = loadSound("time_end"), + Skull = loadSound("skull"), Musics = new Music[] { loadMusic("anar11"), @@ -107,5 +109,6 @@ public enum Sound Draw = 2 << 9, Clock = 2 << 10, TimeEnd = 2 << 11, + Skull = 2 << 12 } } diff --git a/www/sound/kick.wav b/www/sound/kick.wav new file mode 100644 index 0000000..a390125 Binary files /dev/null and b/www/sound/kick.wav differ diff --git a/www/sound/skull.wav b/www/sound/skull.wav new file mode 100644 index 0000000..8121aa7 Binary files /dev/null and b/www/sound/skull.wav differ