From dad67f269ade9578f9bafd50a9bf57ae19b1676e Mon Sep 17 00:00:00 2001
From: Kobert <Kassian.Kobert@gmail.com>
Date: Mon, 9 Apr 2018 19:07:05 +0200
Subject: Negative tap

---
 DiscoBot/Auxiliary/Soundeffects.cs |  6 ++++--
 DiscoBot/Characters/Character.cs   | 12 ++++++++----
 DiscoBot/Characters/NPC.cs         |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'DiscoBot')

diff --git a/DiscoBot/Auxiliary/Soundeffects.cs b/DiscoBot/Auxiliary/Soundeffects.cs
index 880753d..d275eb4 100644
--- a/DiscoBot/Auxiliary/Soundeffects.cs
+++ b/DiscoBot/Auxiliary/Soundeffects.cs
@@ -44,8 +44,10 @@ namespace DiscoBot.Auxiliary
                     url = "https://www.myinstants.com/media/sounds/nooo.swf.mp3";
                     break;
                 case Sound.Wrong:
-                    url = "https://www.myinstants.com/media/sounds/stupid_dum_03.mp3";
-                    vol = 10;
+                    // url = "https://www.myinstants.com/media/sounds/stupid_dum_03.mp3";
+                    // vol = 10;
+                    url = "https://www.myinstants.com/media/sounds/wrong-answer-sound-effect.mp3";
+                    vol = 50;
                     break;
             }
 
diff --git a/DiscoBot/Characters/Character.cs b/DiscoBot/Characters/Character.cs
index 249c6f5..86b4bef 100644
--- a/DiscoBot/Characters/Character.cs
+++ b/DiscoBot/Characters/Character.cs
@@ -78,7 +78,7 @@
                 }
 
                 var props = tTalent.Test(); // get the required properties
-                int tap = tTalent.Value; // get tap
+                int tap = tTalent.Value; // get taw
                 var werte = props.Select(p => this.Eigenschaften[this.PropTable[p]]).ToList();
 
                 output.AppendFormat(
@@ -102,9 +102,9 @@
                         int temp = Dice.Roll();
                         int eigenschaft = this.Eigenschaften[this.PropTable[props[i]]];
 
-                        if (eigenschaft - gesamtErschwernis < temp)
+                        if (eigenschaft + gesamtErschwernis < temp)
                         {
-                            tap -= temp - eigenschaft + gesamtErschwernis;
+                            tap -= temp - (eigenschaft + gesamtErschwernis);
                         }
 
                         output.Append($"[{temp}]"); // add to string
@@ -132,8 +132,12 @@
                     }
                 }
 
-                tap = tap == 0 ? 1 : tap;
+                tap = (tap == 0) ? 1 : tap;
 
+                if(tap < 0)
+                {
+                    SoundEffects.Play(Sound.Wrong);
+                }
                 output.AppendFormat(" tap: {0,2}", tap);
 
                 return output.ToString(); // return output
diff --git a/DiscoBot/Characters/NPC.cs b/DiscoBot/Characters/NPC.cs
index 470d5ff..1a71e86 100644
--- a/DiscoBot/Characters/NPC.cs
+++ b/DiscoBot/Characters/NPC.cs
@@ -36,6 +36,7 @@
                 return $"{this.Name} vollführt {talent} erfolgreich";
             }
 
+
             return $"{this.Name} scheitert an {talent}";
         }
 
-- 
cgit v1.2.3-70-g09d2