From 82f07c959dc7a87251b4617e462003471e3cc071 Mon Sep 17 00:00:00 2001
From: TrueDoctor <d-kobert@web.de>
Date: Mon, 9 Apr 2018 00:54:19 +0200
Subject: Refactoring and Cleanup

---
 DiscoBot/DSA.cs | 44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

(limited to 'DiscoBot/DSA.cs')

diff --git a/DiscoBot/DSA.cs b/DiscoBot/DSA.cs
index af02023..d9cefb2 100644
--- a/DiscoBot/DSA.cs
+++ b/DiscoBot/DSA.cs
@@ -3,37 +3,43 @@
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
-    using System.Threading.Tasks;
+
+    using DiscoBot.Auxiliary;
+    using DiscoBot.Characters;
 
     using Discord.Commands;
 
-    public static class DSA
+    public static class Dsa
     {
         public static ICommandContext GeneralContext { get; set; }
-        public static Dictionary<string, string> relation = new Dictionary<string, string>(); //dictionary to match the char
-        public static List<ICharacter> chars = new List<ICharacter>();                                      //list of all charackters
 
-        public static List<Talent> Talente { get; set; } = new List<Talent>();
+        public static Dictionary<string, string> Relation { get; set; } = new Dictionary<string, string>(); // dictionary to match the char
+
+        public static List<ICharacter> Chars { get; set; } = new List<ICharacter>();  // list of all characters
 
-        public static async Task Startup()
+        public static List<Talent> Talente { get; set; } = new List<Talent>();
+        
+        public static void Startup()
         {
-            relation.Add("The Doctor", "Numeri Illuminus");//Relation
-            relation.Add("Tardis", "Morla");//"Numeri Illuminus");
-            relation.Add("DSA Bot", "Morla");//"Felis Exodus Schattenwald");
-            relation.Add("Morla", "Morla");
-            relation.Add("Rhoktar", "Rhoktar4");
-            //relation.Add("Papo","Gwendelson");
-            relation.Add("Papo", "Pump aus der Gosse");
-            relation.Add("Potus", "Potus");
-            //relation.Add("Papo", "Pump aus der Gosse");
+            Relation.Add("The Doctor", "Numeri Illuminus"); // Relation
+            Relation.Add("Tardis", "Morla"); // "Numeri Illuminus");
+            Relation.Add("DSA Bot", "Morla"); // "Felis Exodus Schattenwald");
+            Relation.Add("Morla", "Morla");
+            Relation.Add("Rhoktar", "Rhoktar4");
+
+            // relation.Add("Papo","Gwendelson");
+            Relation.Add("Papo", "Pump aus der Gosse");
+            Relation.Add("Potus", "Potus");
+
+            // relation.Add("Papo", "Pump aus der Gosse");
             foreach (var filename in Directory.GetFiles("helden", "*.xml"))
             {
-                chars.Add(new Character(filename));
-                (chars.Last() as Character)?.Talente.Select(x => new Talent(x.name, x.probe, 0))
-                    .Where(c => !Talente.Exists(v => v.name.Equals(c.name))).ToList().ForEach(v => Talente.Add(v));
+                Chars.Add(new Character(filename));
+                (Chars.Last() as Character)?.Talente.Select(x => new Talent(x.Name, x.Probe, 0))
+                    .Where(c => !Talente.Exists(v => v.Name.Equals(c.Name))).ToList().ForEach(v => Talente.Add(v));
             }
 
-            Talente = Talente.OrderBy(x => x.name).ToList();
+            Talente = Talente.OrderBy(x => x.Name).ToList();
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2