summaryrefslogtreecommitdiff
path: root/DiscoBot
diff options
context:
space:
mode:
authorKobert <Kassian.Kobert@gmail.com>2018-04-09 22:32:51 +0200
committerKobert <Kassian.Kobert@gmail.com>2018-04-09 22:32:51 +0200
commit9a5f1eec946c2b17c27c3aa71a23056f3e41827a (patch)
treeb28e370c57f3e98057e9f2d2c4fbdfe315da0783 /DiscoBot
parent91ee301f7f459dbd4f7ef93a017c4ecb3927410e (diff)
parent74b9248fa51bd6c934a718b407972dc99fd297b0 (diff)
Merge branch 'master' of https://github.com/TrueDoctor/DiscoBot
Diffstat (limited to 'DiscoBot')
-rw-r--r--DiscoBot/Auxiliary/Soundeffects.cs2
-rw-r--r--DiscoBot/Characters/Character.cs2
-rw-r--r--DiscoBot/Characters/ICharacter.cs2
-rw-r--r--DiscoBot/Characters/NPC.cs4
4 files changed, 8 insertions, 2 deletions
diff --git a/DiscoBot/Auxiliary/Soundeffects.cs b/DiscoBot/Auxiliary/Soundeffects.cs
index d04b1c0..3c67fac 100644
--- a/DiscoBot/Auxiliary/Soundeffects.cs
+++ b/DiscoBot/Auxiliary/Soundeffects.cs
@@ -53,7 +53,7 @@ namespace DiscoBot.Auxiliary
if (url != string.Empty)
{
- await Task.Run(() => Voice.SendAsync(url, vol));
+ Task.Run(() => Voice.SendAsync(url, vol));
return;
}
diff --git a/DiscoBot/Characters/Character.cs b/DiscoBot/Characters/Character.cs
index 57debe2..ddba35b 100644
--- a/DiscoBot/Characters/Character.cs
+++ b/DiscoBot/Characters/Character.cs
@@ -54,6 +54,8 @@
public string Name { get; set; } // char name
+ public int Lebenspunkte { get; set; }
+
public Dictionary<string, int> Eigenschaften { get; set; } = new Dictionary<string, int>(); // char properties
public List<Talent> Talente { get; set; } = new List<Talent>(); // list of talent objects (talents and spells)
diff --git a/DiscoBot/Characters/ICharacter.cs b/DiscoBot/Characters/ICharacter.cs
index 135243a..233110b 100644
--- a/DiscoBot/Characters/ICharacter.cs
+++ b/DiscoBot/Characters/ICharacter.cs
@@ -4,6 +4,8 @@
{
string Name { get; set; }
+ int Lebenspunkte { get; set; }
+
string TestTalent(string talent, int erschwernis = 0);
string TestEigenschaft(string eigenschaft, int erschwernis = 0);
diff --git a/DiscoBot/Characters/NPC.cs b/DiscoBot/Characters/NPC.cs
index 1a71e86..f399a70 100644
--- a/DiscoBot/Characters/NPC.cs
+++ b/DiscoBot/Characters/NPC.cs
@@ -16,7 +16,9 @@
}
public string Name { get; set; }
-
+
+ public int Lebenspunkte { get; set; }
+
public string TestTalent(string talent, int tap = 3)
{
for (int i = 0; i <= 2; i++)