From cad4ba7a9f33789179cdee6fa3ac26f40f282f67 Mon Sep 17 00:00:00 2001 From: Kobert Date: Tue, 5 Jun 2018 00:06:37 +0200 Subject: Merge fix --- DiscoBot/DSA_Game/Characters/Character.cs | 14 ++++++++++++-- DiscoBot/DSA_Game/Dsa.cs | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/DiscoBot/DSA_Game/Characters/Character.cs b/DiscoBot/DSA_Game/Characters/Character.cs index 2f994f0..9808fd9 100644 --- a/DiscoBot/DSA_Game/Characters/Character.cs +++ b/DiscoBot/DSA_Game/Characters/Character.cs @@ -179,13 +179,23 @@ private void Post_process() { var LE_Wert = this.Eigenschaften["Lebensenergie"]; + var AE_Wert = this.Eigenschaften.First(s => s.Key.Contains("Astralenergie")).Value; + + //var KL_Wert = this.Eigenschaften.First(s => s.Key.Contains("Klugheit")).Value; + var MU_Wert = this.Eigenschaften.First(s => s.Key.Contains("Mut")).Value; + var IN_Wert = this.Eigenschaften.First(s => s.Key.Contains("Intuition")).Value; + var CH_Wert = this.Eigenschaften.First(s => s.Key.Contains("Charisma")).Value; var KK_Wert = this.Eigenschaften["Körperkraft"]; var KO__Wert = this.Eigenschaften["Konstitution"]; + this.Astralpunkte = 0; this.Lebenspunkte = LE_Wert + (int)(KO__Wert + (KK_Wert/2.0) + 0.5); - // ToDo: Astralpunkte berrechnen - + if (this.Vorteile.Exists(x => x.Name.ToLower().Contains("zauberer"))) + { + this.Astralpunkte = AE_Wert + (int)((MU_Wert + IN_Wert + CH_Wert) / 2.0 + 0.5); + } + } private void Load(string path) diff --git a/DiscoBot/DSA_Game/Dsa.cs b/DiscoBot/DSA_Game/Dsa.cs index c645eb7..d580ed5 100644 --- a/DiscoBot/DSA_Game/Dsa.cs +++ b/DiscoBot/DSA_Game/Dsa.cs @@ -33,7 +33,7 @@ Relation.Add("Nicolas", "Hartmut Reiher"); Relation.Add("TrueKuehli", "Ledur Torfinson"); - relation.Add("Papo","Gwendelson"); + //Relation.Add("Papo","Gwendelson"); //Relation.Add("Papo", "Pump aus der Gosse"); //Nachteile für LE, AE, MR @@ -41,7 +41,7 @@ //Vorteile für LE, AE, MR //Relation.Add("Papo", "Beef"); - //Relation.Add("Papo", "Astrallos"); + Relation.Add("Papo", "Astrallos"); Relation.Add("Potus", "Potus"); -- cgit v1.2.3-70-g09d2