diff options
author | TrueDoctor <d-kobert@web.de> | 2018-06-06 17:11:09 +0200 |
---|---|---|
committer | TrueDoctor <d-kobert@web.de> | 2018-06-06 17:11:09 +0200 |
commit | 0b5fd9f180d9537f81f5dabf7692106a0127f849 (patch) | |
tree | 9d47136f29133c7b73fb10e2180116a6c3ce7c17 /DiscoBot/DSA_Game/Characters | |
parent | 97450e451fe535bccec1651b9960dd0f446736f3 (diff) | |
parent | 58d7568f4818feb111d0c8d929f349514043d4a7 (diff) |
Merge branch 'master' of https://github.com/TrueDoctor/DiscoBot
Diffstat (limited to 'DiscoBot/DSA_Game/Characters')
-rw-r--r-- | DiscoBot/DSA_Game/Characters/Character.cs | 35 | ||||
-rw-r--r-- | DiscoBot/DSA_Game/Characters/ICharacter.cs | 9 | ||||
-rw-r--r-- | DiscoBot/DSA_Game/Characters/NPC.cs | 9 |
3 files changed, 43 insertions, 10 deletions
diff --git a/DiscoBot/DSA_Game/Characters/Character.cs b/DiscoBot/DSA_Game/Characters/Character.cs index 86e9831..d92fc63 100644 --- a/DiscoBot/DSA_Game/Characters/Character.cs +++ b/DiscoBot/DSA_Game/Characters/Character.cs @@ -63,9 +63,16 @@ public string Name { get; set; } // char name - public int Lebenspunkte { get; set; } + public int Lebenspunkte_Basis { get; set; } + public int Lebenspunkte_Aktuell { get; set; } - public int Astralpunkte { get; set; } + public int Astralpunkte_Basis { get; set; } + public int Astralpunkte_Aktuell { get; set; } + + public int Ausdauer_Basis { get; set; } + public int Ausdauer_Aktuell { get; set; } + + public Dictionary<string, int> Eigenschaften { get; set; } = new Dictionary<string, int>(); // char properties @@ -179,13 +186,31 @@ 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.Lebenspunkte = LE_Wert + (int)(KO__Wert + (KK_Wert/2.0) + 0.5); + this.Astralpunkte_Basis = 0; + + this.Ausdauer_Basis = 0; + + this.Lebenspunkte_Basis = LE_Wert + (int)(KO__Wert + (KK_Wert/2.0) + 0.5); + + if (this.Vorteile.Exists(x => x.Name.ToLower().Contains("zauberer"))) + { + this.Astralpunkte_Basis = AE_Wert + (int)((MU_Wert + IN_Wert + CH_Wert) / 2.0 + 0.5); + } + + this.Lebenspunkte_Aktuell = this.Lebenspunkte_Basis; + this.Astralpunkte_Aktuell = this.Astralpunkte_Basis; + this.Ausdauer_Aktuell = this.Ausdauer_Basis; + - // ToDo: Astralpunkte berrechnen - } private void Load(string path) diff --git a/DiscoBot/DSA_Game/Characters/ICharacter.cs b/DiscoBot/DSA_Game/Characters/ICharacter.cs index 1dae15d..3ec4258 100644 --- a/DiscoBot/DSA_Game/Characters/ICharacter.cs +++ b/DiscoBot/DSA_Game/Characters/ICharacter.cs @@ -4,11 +4,14 @@ { string Name { get; set; } - int Lebenspunkte { get; set; } + int Lebenspunkte_Basis { get; set; } + int Lebenspunkte_Aktuell { get; set; } - //int Ausdauer { get; set; } + int Ausdauer_Basis { get; set; } + int Ausdauer_Aktuell { get; set; } - int Astralpunkte { get; set; } + int Astralpunkte_Basis { get; set; } + int Astralpunkte_Aktuell { get; set; } //int Karmapunkte { get; set; } diff --git a/DiscoBot/DSA_Game/Characters/NPC.cs b/DiscoBot/DSA_Game/Characters/NPC.cs index 45ff6b0..0894df6 100644 --- a/DiscoBot/DSA_Game/Characters/NPC.cs +++ b/DiscoBot/DSA_Game/Characters/NPC.cs @@ -18,9 +18,14 @@ public string Name { get; set; } - public int Lebenspunkte { get; set; } + public int Lebenspunkte_Basis { get; set; } + public int Lebenspunkte_Aktuell { get; set; } - public int Astralpunkte { get; set; } + public int Astralpunkte_Basis { get; set; } + public int Astralpunkte_Aktuell { get; set; } + + public int Ausdauer_Basis { get; set; } + public int Ausdauer_Aktuell { get; set; } public string TestTalent(string talent, int tap = 3) { |