diff options
author | Kobert <Kassian.Kobert@gmail.com> | 2018-06-01 13:36:58 +0200 |
---|---|---|
committer | Kobert <Kassian.Kobert@gmail.com> | 2018-06-01 13:36:58 +0200 |
commit | 62c71f7189b0bc3689fe6f82a8234af922cef2d2 (patch) | |
tree | a940f01d71d2e876067124cf7455c67cfed880ac /DiscoBot/Audio | |
parent | dafc59577d16eac7fb198e36c81bd3fe4b008f18 (diff) | |
parent | f6edadbfcadbc9e38e22500a496a74dd49d96d8a (diff) |
Merge branch 'master' of https://github.com/TrueDoctor/DiscoBot
Diffstat (limited to 'DiscoBot/Audio')
-rw-r--r-- | DiscoBot/Audio/Soundeffects.cs | 29 | ||||
-rw-r--r-- | DiscoBot/Audio/Voice.cs | 16 |
2 files changed, 32 insertions, 13 deletions
diff --git a/DiscoBot/Audio/Soundeffects.cs b/DiscoBot/Audio/Soundeffects.cs index 485be28..9982947 100644 --- a/DiscoBot/Audio/Soundeffects.cs +++ b/DiscoBot/Audio/Soundeffects.cs @@ -10,19 +10,23 @@ Bell, Ding, Nooo, - Monterkill, + Monsterkill, Finish, Wrong, Magic, - Stupid + Stupid, + Police, + Roblox } public static class SoundEffects { + public static int Volume { get; set; } = 50; + public static async Task Play(Sound s) { string url = string.Empty; - int vol = 256; + int volume = 256; switch (s) { case Sound.Bell: @@ -35,26 +39,35 @@ case Sound.Magic: url = "https://www.myinstants.com/media/sounds/dream-harp-sound-effect.mp3"; break; - case Sound.Monterkill: + case Sound.Monsterkill: url = "https://www.myinstants.com/media/sounds/announcer_kill_monster_01.mp3"; break; case Sound.Nooo: url = "https://www.myinstants.com/media/sounds/nooo.swf.mp3"; break; + case Sound.Roblox: + url = "https://www.myinstants.com/media/sounds/roblox-death-sound_ytkBL7X.mp3"; + break; case Sound.Stupid: url = "https://www.myinstants.com/media/sounds/stupid_dum_03.mp3"; - vol = 10; + volume = 10; + break; + case Sound.Police: + url = "https://www.myinstants.com/media/sounds/sound-of-the-police.mp3"; break; case Sound.Wrong: url = "https://www.myinstants.com/media/sounds/wrong-answer-sound-effect.mp3"; - vol = 50; - break; + volume = 50; + break; } + volume = (int)(volume * (Volume / 100.0)); + + if (url != string.Empty) { // await Dsa.Service.SendAudioAsync(url, vol); - await Voice.SendAsync(url, vol); + await Voice.SendAsync(url, volume); return; } diff --git a/DiscoBot/Audio/Voice.cs b/DiscoBot/Audio/Voice.cs index 7a7da5c..f9fc7a3 100644 --- a/DiscoBot/Audio/Voice.cs +++ b/DiscoBot/Audio/Voice.cs @@ -62,11 +62,8 @@ [Command("leave", RunMode = RunMode.Async)] public async Task LeaveChannelAsync(IVoiceChannel channel = null) { - if (!((SocketGuildUser)this.Context.User).Roles.ToList().Exists(v => v.Name.Equals("Meister"))) - { - await this.ReplyAsync("```xl\n Keine ausreichenden Berechtigunen\n```"); - return; - } +// Permissions.Test(this.Context, "Meister"); + if (Client != null) { var wait = SoundEffects.Play(Sound.Nooo); @@ -76,6 +73,15 @@ } } + [Command("volume")] + public async Task SetVolume(int volume) + { + if (volume <= 100 && volume >= 0) + { + SoundEffects.Volume = volume; + } + } + [Command("play", RunMode = RunMode.Async)] public async Task PlayAudioAsync(string path) { |