From d63ffc58db0f032cf7573b2a8a7720de2d5050ab Mon Sep 17 00:00:00 2001 From: TrueDoctor Date: Sun, 3 Jun 2018 23:16:17 +0200 Subject: -General restructuring -seperated talents and spells --- DiscoBot/Commands/CommandTypes.cs | 3 ++- DiscoBot/Commands/FileHandler.cs | 3 ++- DiscoBot/Commands/Gm.cs | 3 +++ DiscoBot/Commands/List.cs | 3 ++- DiscoBot/Commands/MiscCommands.cs | 36 ++---------------------------------- DiscoBot/Commands/NpcCommands.cs | 4 +++- DiscoBot/Commands/ProbenTest.cs | 27 +++++++++++++++++++++++++++ 7 files changed, 41 insertions(+), 38 deletions(-) (limited to 'DiscoBot/Commands') diff --git a/DiscoBot/Commands/CommandTypes.cs b/DiscoBot/Commands/CommandTypes.cs index 4ff0814..c1d0954 100644 --- a/DiscoBot/Commands/CommandTypes.cs +++ b/DiscoBot/Commands/CommandTypes.cs @@ -7,6 +7,7 @@ Angriff, Parade, Fernkampf, - KeinChar + KeinChar, + Zauber } } diff --git a/DiscoBot/Commands/FileHandler.cs b/DiscoBot/Commands/FileHandler.cs index efebe3f..1a82a9c 100644 --- a/DiscoBot/Commands/FileHandler.cs +++ b/DiscoBot/Commands/FileHandler.cs @@ -5,7 +5,8 @@ using System.Net; using DiscoBot.Auxiliary; - using DiscoBot.Characters; + using DiscoBot.DSA_Game; + using DiscoBot.DSA_Game.Characters; using Discord.Commands; diff --git a/DiscoBot/Commands/Gm.cs b/DiscoBot/Commands/Gm.cs index b426655..b92b5b8 100644 --- a/DiscoBot/Commands/Gm.cs +++ b/DiscoBot/Commands/Gm.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using DiscoBot.Auxiliary; + using DiscoBot.DSA_Game; using Discord.Commands; using Discord.WebSocket; @@ -27,6 +28,8 @@ return chr.Parade(waffe, erschwernis); case CommandTypes.Fernkampf: return chr.Fernkampf(waffe, erschwernis); + case CommandTypes.Zauber: + return chr.TestZauber(waffe, erschwernis); } return $"{name} verwendet {waffe}"; diff --git a/DiscoBot/Commands/List.cs b/DiscoBot/Commands/List.cs index 41fa3d9..3cd66b9 100644 --- a/DiscoBot/Commands/List.cs +++ b/DiscoBot/Commands/List.cs @@ -8,7 +8,8 @@ using DiscoBot.Audio; using DiscoBot.Auxiliary; - using DiscoBot.Characters; + using DiscoBot.DSA_Game; + using DiscoBot.DSA_Game.Characters; using Discord.Commands; diff --git a/DiscoBot/Commands/MiscCommands.cs b/DiscoBot/Commands/MiscCommands.cs index 8c9417c..158882c 100644 --- a/DiscoBot/Commands/MiscCommands.cs +++ b/DiscoBot/Commands/MiscCommands.cs @@ -24,6 +24,7 @@ namespace DiscoBot.Commands using System.Windows.Forms; using DiscoBot.Auxiliary; + using DiscoBot.DSA_Game; using Discord; using Discord.Commands; @@ -111,40 +112,7 @@ namespace DiscoBot.Commands var us = users.Result.Select(x => x.Username); var lines = test.Where(x => !x.Equals(string.Empty)).ToList(); - - string ls = string.Empty; - using (var client = new WebClient()) - { - ls =client.DownloadString(@"https://discordapp.com/assets/8529401dde4ab112e81d.js"); - } - - /*using (ScriptEngine engine = new ScriptEngine("jscript")) - { - ParsedScript parsed = engine.Parse(ls); - Debug.WriteLine(parsed.CallMethod("t", 3)); - }*/ - /*var task = MessageLoopWorker.Run(WebCrawler.DoWorkAsync, - "https://discordapp.com/widget?id=361270203952136203&theme=dark"); - task.Wait(); - var kl =task.Result; - Console.WriteLine("DoWorkAsync completed."); - - - ls = WebCrawler.Crawl("https://discordapp.com/widget?id=361270203952136203&theme=dark"); -*/ - /* - ScrapingBrowser Browser = new ScrapingBrowser(); - Browser.AllowAutoRedirect = true; // Browser has settings you can access in setup - Browser.AllowMetaRedirect = true; - Browser.UserAgent = new FakeUserAgent("The Doctor", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36"); - Browser.Timeout = TimeSpan.FromMinutes(1); - WebPage PageResult = Browser.NavigateToPage(new Uri("https://discordapp.com/widget?id=361270203952136203&theme=dark")); - //await Task.Delay(TimeSpan.FromSeconds(10)); - - var dom = new ScrapySharp.Html.Parsing.HtmlDomBuilder(new HtmlDeclarationReader(new CodeReader(PageResult.Html.OuterHtml))); - - HtmlNode TitleNode = PageResult.Html.CssSelect(".widget-header").First(); - string PageTitle = TitleNode.InnerText;*/ + var sc = new SpellCorrect(); diff --git a/DiscoBot/Commands/NpcCommands.cs b/DiscoBot/Commands/NpcCommands.cs index f2b17b6..98f4589 100644 --- a/DiscoBot/Commands/NpcCommands.cs +++ b/DiscoBot/Commands/NpcCommands.cs @@ -6,6 +6,8 @@ using DiscoBot.Auxiliary; using DiscoBot.Characters; + using DiscoBot.DSA_Game; + using DiscoBot.DSA_Game.Characters; using Discord.Commands; @@ -34,4 +36,4 @@ return this.ReplyAsync($"{npcName} wurde als variierte Kopie von {source} erstellt"); } } -} +} \ No newline at end of file diff --git a/DiscoBot/Commands/ProbenTest.cs b/DiscoBot/Commands/ProbenTest.cs index bdfaf23..ae98ec2 100644 --- a/DiscoBot/Commands/ProbenTest.cs +++ b/DiscoBot/Commands/ProbenTest.cs @@ -2,6 +2,8 @@ { using System.Threading.Tasks; + using DiscoBot.DSA_Game; + using Discord.Commands; public class ProbenTest : ModuleBase @@ -31,6 +33,31 @@ return this.ReplyAsync("```xl\n" + res + "\n```"); } + [Command("Zauber"), Summary("Würfelt ein Zauberprobe")] + [Alias("Z", "zauber", "z")] + public Task ZauberAsync([Summary("Zaubername")] string zauber, int erschwernis = 0) + { + string res; + try + { + res = Gm.CheckCommand( + Dsa.Relation[this.Context.User.Username], + CommandTypes.Zauber, + zauber, + erschwernis); + } + catch + { + res = Gm.CheckCommand( + Dsa.Relation["Tardis"], + CommandTypes.Zauber, + zauber, + erschwernis); + } + + return this.ReplyAsync("```xl\n" + res + "\n```"); + } + [Command("e"), Summary("Würfelt eine Eigenschaftsprobe")] [Alias("E", "Eigenschaft", "eigenschaft", "eigen")] public Task EigenschaftAsync([Summary("Eigenschaftskürzel und Erschwernis")] string talent, int erschwernis = 0) -- cgit v1.2.3-70-g09d2 From 7f55f6f289b5ab5b7fd4ac42b472b51a9a0e679e Mon Sep 17 00:00:00 2001 From: TrueDoctor Date: Mon, 4 Jun 2018 22:56:44 +0200 Subject: implemented Astralpunkte + some cleanup --- DiscoBot/Commands/FileHandler.cs | 3 +-- DiscoBot/Commands/Gm.cs | 1 - DiscoBot/Commands/ProbenTest.cs | 2 +- DiscoBot/DSA_Game/Characters/Character.cs | 10 +++++++--- DiscoBot/DSA_Game/Characters/ICharacter.cs | 2 +- DiscoBot/DSA_Game/Characters/NPC.cs | 2 ++ 6 files changed, 12 insertions(+), 8 deletions(-) (limited to 'DiscoBot/Commands') diff --git a/DiscoBot/Commands/FileHandler.cs b/DiscoBot/Commands/FileHandler.cs index 1a82a9c..7885aa9 100644 --- a/DiscoBot/Commands/FileHandler.cs +++ b/DiscoBot/Commands/FileHandler.cs @@ -3,8 +3,7 @@ using System; using System.Linq; using System.Net; - - using DiscoBot.Auxiliary; + using DiscoBot.DSA_Game; using DiscoBot.DSA_Game.Characters; diff --git a/DiscoBot/Commands/Gm.cs b/DiscoBot/Commands/Gm.cs index b92b5b8..2698926 100644 --- a/DiscoBot/Commands/Gm.cs +++ b/DiscoBot/Commands/Gm.cs @@ -7,7 +7,6 @@ using DiscoBot.DSA_Game; using Discord.Commands; - using Discord.WebSocket; public class Gm : ModuleBase { diff --git a/DiscoBot/Commands/ProbenTest.cs b/DiscoBot/Commands/ProbenTest.cs index ae98ec2..1d8f8b0 100644 --- a/DiscoBot/Commands/ProbenTest.cs +++ b/DiscoBot/Commands/ProbenTest.cs @@ -9,7 +9,7 @@ public class ProbenTest : ModuleBase { [Command("t"), Summary("Würfelt ein Talent-/Zauberprobe")] - [Alias("T", "Talent", "talent", "zauber", "z", "versuche")] + [Alias("T", "Talent", "talent", "versuche")] public Task TalentAsync([Summary("Talent oder Zaubername")] string talent, int erschwernis = 0) { string res; diff --git a/DiscoBot/DSA_Game/Characters/Character.cs b/DiscoBot/DSA_Game/Characters/Character.cs index 01b7eeb..2f994f0 100644 --- a/DiscoBot/DSA_Game/Characters/Character.cs +++ b/DiscoBot/DSA_Game/Characters/Character.cs @@ -65,6 +65,8 @@ public int Lebenspunkte { get; set; } + public int Astralpunkte { get; set; } + public Dictionary Eigenschaften { get; set; } = new Dictionary(); // char properties public List Talente { get; set; } = new List(); // list of talent objects (talents) @@ -176,11 +178,13 @@ private void Post_process() { - var LE_Wert = this.Eigenschaften.First(s => s.Key.Contains("Leben")).Value; - var KK_Wert = this.Eigenschaften.First(s => s.Key.Contains("Körper")).Value; - var KO__Wert = this.Eigenschaften.First(s => s.Key.Contains("Konst")).Value; + var LE_Wert = this.Eigenschaften["Lebensenergie"]; + var KK_Wert = this.Eigenschaften["Körperkraft"]; + var KO__Wert = this.Eigenschaften["Konstitution"]; this.Lebenspunkte = LE_Wert + (int)(KO__Wert + (KK_Wert/2.0) + 0.5); + + // ToDo: Astralpunkte berrechnen } diff --git a/DiscoBot/DSA_Game/Characters/ICharacter.cs b/DiscoBot/DSA_Game/Characters/ICharacter.cs index 91eee2d..1dae15d 100644 --- a/DiscoBot/DSA_Game/Characters/ICharacter.cs +++ b/DiscoBot/DSA_Game/Characters/ICharacter.cs @@ -8,7 +8,7 @@ //int Ausdauer { get; set; } - //int Astralpunkte { get; set; } + int Astralpunkte { get; set; } //int Karmapunkte { get; set; } diff --git a/DiscoBot/DSA_Game/Characters/NPC.cs b/DiscoBot/DSA_Game/Characters/NPC.cs index dce4381..45ff6b0 100644 --- a/DiscoBot/DSA_Game/Characters/NPC.cs +++ b/DiscoBot/DSA_Game/Characters/NPC.cs @@ -20,6 +20,8 @@ public int Lebenspunkte { get; set; } + public int Astralpunkte { get; set; } + public string TestTalent(string talent, int tap = 3) { for (int i = 0; i <= 2; i++) -- cgit v1.2.3-70-g09d2