diff options
| author | TrueDoctor <d-kobert@web.de> | 2018-06-04 22:56:44 +0200 |
|---|---|---|
| committer | TrueDoctor <d-kobert@web.de> | 2018-06-04 22:56:44 +0200 |
| commit | 7f55f6f289b5ab5b7fd4ac42b472b51a9a0e679e (patch) | |
| tree | 7864a485fe3236dca5d3a2ca4c1596eeb08ab92b | |
| parent | d63ffc58db0f032cf7573b2a8a7720de2d5050ab (diff) | |
implemented Astralpunkte + some cleanup
| -rw-r--r-- | DiscoBot/Commands/FileHandler.cs | 3 | ||||
| -rw-r--r-- | DiscoBot/Commands/Gm.cs | 1 | ||||
| -rw-r--r-- | DiscoBot/Commands/ProbenTest.cs | 2 | ||||
| -rw-r--r-- | DiscoBot/DSA_Game/Characters/Character.cs | 10 | ||||
| -rw-r--r-- | DiscoBot/DSA_Game/Characters/ICharacter.cs | 2 | ||||
| -rw-r--r-- | DiscoBot/DSA_Game/Characters/NPC.cs | 2 |
6 files changed, 12 insertions, 8 deletions
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<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) @@ -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++) |