diff options
| author | Kobert-P <kassiaK@yahoo.de> | 2018-06-11 20:32:12 +0200 |
|---|---|---|
| committer | Kobert-P <kassiaK@yahoo.de> | 2018-06-11 20:32:12 +0200 |
| commit | e8d91f3e0b8e10001e72859a2942b6eb1b2c7061 (patch) | |
| tree | 073287ddaeda9056b2130c0550a7b024d6123761 /DiscoBot | |
| parent | 3374adf732aebae758daeb514f84236dd79635c8 (diff) | |
| parent | af937e7a8519ea3b06be651eb21b54132295c510 (diff) | |
Merge branch 'master' of https://github.com/TrueDoctor/DiscoBot
Diffstat (limited to 'DiscoBot')
| -rw-r--r-- | DiscoBot/Commands/LebenUndAstral.cs | 9 | ||||
| -rw-r--r-- | DiscoBot/Program.cs | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/DiscoBot/Commands/LebenUndAstral.cs b/DiscoBot/Commands/LebenUndAstral.cs index fd5e502..86fe6f2 100644 --- a/DiscoBot/Commands/LebenUndAstral.cs +++ b/DiscoBot/Commands/LebenUndAstral.cs @@ -22,11 +22,8 @@ if (prop.ToLower().Equals("help") || prop.ToLower().Equals("man")) { - await this.ReplyAsync("```xl\n" + Help.Get_Specific_Help("LE") + "\n```"); return; - - } //In case the input is badly formated @@ -53,7 +50,6 @@ if (prop.ToLower().Equals("help") || prop.ToLower().Equals("man")) { - await this.ReplyAsync("```xl\n" + Help.Get_Specific_Help("AE") + "\n```"); return; } @@ -84,7 +80,6 @@ //If there is actual input we process it if (prop.Length > 0) { - res += "LE: "; res += character.Lebenspunkte_Aktuell + "/" + character.Lebenspunkte_Basis + " -> "; @@ -111,12 +106,12 @@ character.Lebenspunkte_Aktuell = character.Lebenspunkte_Aktuell + Convert.ToInt32(prop); } } - res += character.Lebenspunkte_Aktuell + "/" + character.Lebenspunkte_Basis; + res += character.Lebenspunkte_Aktuell + "/" + character.Lebenspunkte_Basis; } - //Set to new value regardless of original else { + // Set to new value regardless of original character.Lebenspunkte_Aktuell = Convert.ToInt32(prop); res += character.Lebenspunkte_Aktuell + "/" + character.Lebenspunkte_Basis; diff --git a/DiscoBot/Program.cs b/DiscoBot/Program.cs index 05577ce..89a1a42 100644 --- a/DiscoBot/Program.cs +++ b/DiscoBot/Program.cs @@ -10,6 +10,8 @@ using Microsoft.Extensions.DependencyInjection; namespace DiscoBot { + using System.IO; + using DiscoBot.Audio; using DiscoBot.DSA_Game; @@ -28,7 +30,10 @@ namespace DiscoBot this.client = new DiscordSocketClient(); this.commands = new CommandService(); - string token = Properties.Settings.Default.Token; + + + string token = File.ReadAllText("Token"); + //Properties.Settings.Default.Token; this.services = new ServiceCollection().AddSingleton(new AudioService()) .BuildServiceProvider(); |