summaryrefslogtreecommitdiff
path: root/DiscoBot/Audio
diff options
context:
space:
mode:
Diffstat (limited to 'DiscoBot/Audio')
-rw-r--r--DiscoBot/Audio/Soundeffects.cs16
-rw-r--r--DiscoBot/Audio/Voice.cs4
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)