From 17e8fa6018dc9045eab9e5d0f1bcfee08adb1e2e Mon Sep 17 00:00:00 2001
From: Kobert-P <kassiaK@yahoo.de>
Date: Tue, 12 Jun 2018 14:12:31 +0200
Subject: !held fern wie in issue #10

---
 DiscoBot/Commands/Gm.cs       |  2 +-
 DiscoBot/Commands/HeldList.cs | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'DiscoBot/Commands')

diff --git a/DiscoBot/Commands/Gm.cs b/DiscoBot/Commands/Gm.cs
index 212bc83..7fe858c 100644
--- a/DiscoBot/Commands/Gm.cs
+++ b/DiscoBot/Commands/Gm.cs
@@ -18,7 +18,7 @@
             string res;
             string name;
 
-            if (givenName.Length == 0)
+            if (givenName.Length == 0 || (givenName.Length == 1 && (givenName[0].ToLower().Equals("bin") || givenName[0].ToLower().Equals("am"))))
             {
                 res = " \nDu bist " + Dsa.Relation[this.Context.User.Username] + "!\n \n";
 
diff --git a/DiscoBot/Commands/HeldList.cs b/DiscoBot/Commands/HeldList.cs
index a7eb920..d1b25be 100644
--- a/DiscoBot/Commands/HeldList.cs
+++ b/DiscoBot/Commands/HeldList.cs
@@ -48,6 +48,11 @@
                 res.AddRange(
                     character.Kampftalente.Select(s => s.Name.AddSpaces(first_column_width) + " " + s.At.ToString().AddSpacesAtHead(2) + "/" + s.Pa.ToString().AddSpacesAtHead(2)));
                 res.Add("");
+                //Fernkampf
+                res.Add("".AddSpaces(first_column_width) + " FK");
+                res.AddRange(
+                    character.Talente.Where(x => x.IstFernkampftalent()).Select(s => s.Name.AddSpaces(first_column_width) + " " + (character.Eigenschaften["fk"] + s.Value).ToString().AddSpacesAtHead(2)));
+                res.Add("");
                 //Vorteile
                 res.AddRange(
                     character.Vorteile
@@ -126,9 +131,11 @@
                             res.AddRange(
                                 character.Kampftalente.Select(s => s.Name.AddSpaces(first_column_width) + " " + s.At.ToString().AddSpacesAtHead(2) + "/" + s.Pa.ToString().AddSpacesAtHead(2)));
                             break;
+                        case "f":
                         case "fern":
+                            res.Add("".AddSpaces(first_column_width) + " FK");
                             res.AddRange(
-                                character.Talente.Select(s => s.Name));
+                                character.Talente.Where(x => x.IstFernkampftalent()).Select(s => s.Name.AddSpaces(first_column_width) + " " + (character.Eigenschaften["fk"] + s.Value).ToString().AddSpacesAtHead(2)));
                             break;
                         case "v":
                         case "vt":
@@ -173,7 +180,7 @@
             //}
             if (persist == 1)
             {
-                await this.ReplyAsync(res);
+                await this.ReplyAsync(res, true);
             }
             else
             {
-- 
cgit v1.2.3-54-g00ecf