Reorganize Code delete ZoBotanica

7 files changed, 24 insertions, 31 deletions

diff --git a/DSALib/DSA_Game/Characters/Character.cs b/DSALib/DSA_Game/Characters/Character.cs
index ac890cb..aea5671 100644
--- a/DSALib/DSA_Game/Characters/Character.cs
+++ b/DSALib/DSA_Game/Characters/Character.cs
@@ -5,10 +5,11 @@ using System.Linq;
 using System.Text;
 using System.Xml;
 using DSACore.Auxiliary;
-using DSALib;
+using DSALib.Auxiliary;
 using DSALib.Characters;
+using DSALib.Models.Dsa;
 
-namespace DSACore.DSA_Game.Characters
+namespace DSALib.DSA_Game.Characters
 {
     public class Character : Being, ICharacter
     {
@@ -99,11 +100,9 @@ namespace DSACore.DSA_Game.Characters
         public string Angriff(string talent, int erschwernis = 0) // pretty self explanatory
         {
             var output = new StringBuilder();
-            var sc = new SpellCorrect();
-            var attack = Kampftalente.OrderBy(x => sc.Compare(talent, x.Name)).First();
-            if (sc.Compare(talent, attack.Name) > SpellCorrect.ErrorThreshold)
+            if (!Kampftalente.TryMatch(out var iattack, talent))
                 return $"{Name} kann nicht mit der Waffenart {talent} umgehen...";
-
+            var attack = (KampfTalent) iattack;
             var tap = attack.At;
             output.AppendFormat(
                 "{0}-Angriff taw:{1} {2} \n",
@@ -119,12 +118,12 @@ namespace DSACore.DSA_Game.Characters
         public string Parade(string talent, int erschwernis = 0)
         {
             var output = new StringBuilder();
-            var sc = new SpellCorrect();
-            var attack = Kampftalente.OrderBy(x => sc.Compare(talent, x.Name)).First();
 
-            if (sc.Compare(talent, attack.Name) > SpellCorrect.ErrorThreshold)
+            if (Kampftalente.TryMatch(out var iAttack , talent))
                 return $"{Name} kann nicht mit der Waffenart {talent} umgehen...";
 
+
+            var attack = (KampfTalent) iAttack;
             var tap = attack.Pa;
             output.AppendFormat(
                 "{0}-Parade taw:{1} {2}\n",
@@ -140,12 +139,11 @@ namespace DSACore.DSA_Game.Characters
         public string Fernkampf(string talent, int erschwernis = 0)
         {
             var output = new StringBuilder();
-            var sc = new SpellCorrect();
             var fk = Eigenschaften["fk"];
-            var attack = Talente.OrderBy(x => sc.Compare(talent, x.Name)).First();
-            if (sc.Compare(talent, attack.Name) > SpellCorrect.ErrorThreshold)
+            if (! Talente.TryMatch(out var iAttack, talent))
                 return $"{Name} kann nicht mit der Waffenart {talent} umgehen...";
 
+            var attack = (Talent) iAttack;
             var tap = attack.Value;
             output.AppendFormat(
                 "{0} taw:{1} {2} \n",
diff --git a/DSALib/DSA_Game/Characters/NPC.cs b/DSALib/DSA_Game/Characters/NPC.cs
index 75c3fe9..105adda 100644
--- a/DSALib/DSA_Game/Characters/NPC.cs
+++ b/DSALib/DSA_Game/Characters/NPC.cs
@@ -1,8 +1,8 @@
 using System;
-using DSACore.Auxiliary;
+using DSALib.Auxiliary;
 using DSALib.Characters;
 
-namespace DSACore.Characters
+namespace DSALib.Characters
 {
     public class Npc : Being, ICharacter
     {
diff --git a/DSALib/DSA_Game/Characters/SaveChar.cs b/DSALib/DSA_Game/Characters/SaveChar.cs
index 7b29b4e..00e2f86 100644
--- a/DSALib/DSA_Game/Characters/SaveChar.cs
+++ b/DSALib/DSA_Game/Characters/SaveChar.cs
@@ -1,6 +1,6 @@
 using DSALib.Characters;
 
-namespace DSACore.DSA_Game.Characters
+namespace DSALib.DSA_Game.Characters
 {
     public class SaveChar
     {
diff --git a/DSALib/DSA_Game/Dsa.cs b/DSALib/DSA_Game/Dsa.cs
index 18d0b81..bcd8951 100644
--- a/DSALib/DSA_Game/Dsa.cs
+++ b/DSALib/DSA_Game/Dsa.cs
@@ -1,20 +1,21 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DSACore.DSA_Game.Characters;
-using DSACore.DSA_Game.Save;
+using DSALib.DSA_Game.Characters;
+using DSALib.DSA_Game.Save;
 using DSALib;
 using DSALib.Characters;
+using DSALib.Models.Dsa;
 
-namespace DSACore.DSA_Game
+namespace DSALib.DSA_Game
 {
     public static class Dsa
     {
 #if DEBUG
         public const string
-            rootPath = ""; //"C:\\Users\\Dennis\\Source\\Repos\\DiscoBot\\DSACore\\";//"DiscoBot\\DSACore\\";
+            rootPath = ""; //"C:\\Users\\Dennis\\Source\\Repos\\DiscoBot\\DSALib\\";//"DiscoBot\\DSALib\\";
 #else
-        public const string rootPath = "";//"DiscoBot\\DSACore\\";
+        public const string rootPath = "";//"DiscoBot\\DSALib\\";
 #endif
         private static Session s_session;
 
diff --git a/DSALib/DSA_Game/Save/Properties.cs b/DSALib/DSA_Game/Save/Properties.cs
index 7eba911..2312af0 100644
--- a/DSALib/DSA_Game/Save/Properties.cs
+++ b/DSALib/DSA_Game/Save/Properties.cs
@@ -3,11 +3,10 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using DSACore.Audio;
-using DSACore.Auxiliary;
+using DSALib.Auxiliary;
 using Newtonsoft.Json;
 
-namespace DSACore.DSA_Game.Save
+namespace DSALib.DSA_Game.Save
 {
     public static class Properties
     {
@@ -26,11 +25,6 @@ namespace DSACore.DSA_Game.Save
             set => objects["CommandInfo"] = value;
         } // use Properties.Commandinfos to access the abstract Object array
 
-        public static List<Sound> Sounds
-        {
-            get => objects["Sound"] as List<Sound>;
-            set => objects["Sound"] = value;
-        }
 
         public static void Deserialize(string path = @"Properties")
         {
diff --git a/DSALib/DSA_Game/Save/SaveCommand.cs b/DSALib/DSA_Game/Save/SaveCommand.cs
index f358047..c5a1bb4 100644
--- a/DSALib/DSA_Game/Save/SaveCommand.cs
+++ b/DSALib/DSA_Game/Save/SaveCommand.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 
-namespace DSACore.DSA_Game.Save
+namespace DSALib.DSA_Game.Save
 {
     public class SaveCommand
     {
diff --git a/DSALib/DSA_Game/Save/Session.cs b/DSALib/DSA_Game/Save/Session.cs
index 6944fb1..62aa8f6 100644
--- a/DSALib/DSA_Game/Save/Session.cs
+++ b/DSALib/DSA_Game/Save/Session.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using DSACore.DSA_Game.Characters;
+using DSALib.DSA_Game.Characters;
 using Newtonsoft.Json;
 
-namespace DSACore.DSA_Game.Save
+namespace DSALib.DSA_Game.Save
 {
     public class Session
     {