diff options
| author | TrueDoctor <d-kobert@web.de> | 2018-09-25 21:36:25 +0200 |
|---|---|---|
| committer | TrueDoctor <d-kobert@web.de> | 2018-09-25 21:36:25 +0200 |
| commit | ee0202042aafc76eb4339b3a04d06d06921ccdc2 (patch) | |
| tree | ba5a41be5c4e61cbf759f3252d1562b649023d69 /DiscoBot/Audio | |
| parent | fe1af24f3cda4b94d02e3b2aad68a6c4398362b0 (diff) | |
minor error fixes and functional improvements
Diffstat (limited to 'DiscoBot/Audio')
| -rw-r--r-- | DiscoBot/Audio/Soundeffects.cs | 16 | ||||
| -rw-r--r-- | DiscoBot/Audio/Voice.cs | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/DiscoBot/Audio/Soundeffects.cs b/DiscoBot/Audio/Soundeffects.cs index 919e149..f3a014c 100644 --- a/DiscoBot/Audio/Soundeffects.cs +++ b/DiscoBot/Audio/Soundeffects.cs @@ -24,12 +24,17 @@ public static class SoundEffects { - public static int Volume { get; set; } = 50; + public static int MaxVolume { get; set; } = 50; public static void Play(string s) { string url = string.Empty; int volume = 255; + + var tSound = DSA_Game.Save.Properties.Sounds.OrderBy(x => SpellCorrect.CompareEasy(s, x.Name)).First(); + + url = s; + switch (s) { case "Bell": @@ -64,16 +69,15 @@ break; } - var tSound = DSA_Game.Save.Properties.Sounds.OrderBy(x => SpellCorrect.CompareEasy(s, x.Name)).First(); - - url = s; + - if (SpellCorrect.CompareEasy(s, tSound.Name) > SpellCorrect.ErrorThreshold) + if (SpellCorrect.CompareEasy(s, tSound.Name) < SpellCorrect.ErrorThreshold) { url = tSound.Url; + volume = tSound.Volume; } - volume = (int)(volume * (Volume / 100.0)); + volume = (int)(volume * (MaxVolume / 100.0)); if (url != string.Empty) diff --git a/DiscoBot/Audio/Voice.cs b/DiscoBot/Audio/Voice.cs index 24512d2..379f65b 100644 --- a/DiscoBot/Audio/Voice.cs +++ b/DiscoBot/Audio/Voice.cs @@ -78,7 +78,7 @@ { if (volume <= 100 && volume >= 0) { - SoundEffects.Volume = volume; + SoundEffects.MaxVolume = volume; } } @@ -90,6 +90,8 @@ await this.Context.Channel.SendMessageAsync("Erst Joinen!"); } + SoundEffects.Play(path); + var sounds = Enum.GetValues(typeof(Sound)); var soundList = new List<Sound>(); foreach (var sound in sounds) |