Reorganize Code delete ZoBotanica

24 files changed, 150 insertions, 23 deletions

diff --git a/DSALib/Models/Database/DSA/Advantage.cs b/DSALib/Models/Database/DSA/Advantage.cs
index cc8f5cc..500cf6d 100644
--- a/DSALib/Models/Database/DSA/Advantage.cs
+++ b/DSALib/Models/Database/DSA/Advantage.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
     public class Advantage
     {
diff --git a/DSALib/Models/Database/DSA/CharSpell.cs b/DSALib/Models/Database/DSA/CharSpell.cs
index fabd456..77a8dc8 100644
--- a/DSALib/Models/Database/DSA/CharSpell.cs
+++ b/DSALib/Models/Database/DSA/CharSpell.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
     public class CharSpell
     {
diff --git a/DSALib/Models/Database/DSA/DatabaseChar.cs b/DSALib/Models/Database/DSA/DatabaseChar.cs
index 872b82e..cfd7174 100644
--- a/DSALib/Models/Database/DSA/DatabaseChar.cs
+++ b/DSALib/Models/Database/DSA/DatabaseChar.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DSACore.DSA_Game.Characters;
+using DSALib.DSA_Game.Characters;
 
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
     public class DatabaseChar
     {
diff --git a/DSALib/Models/Database/DSA/Field.cs b/DSALib/Models/Database/DSA/Field.cs
index e63aeb4..1b10232 100644
--- a/DSALib/Models/Database/DSA/Field.cs
+++ b/DSALib/Models/Database/DSA/Field.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
     public class Field
     {
diff --git a/DSALib/Models/Database/DSA/GeneralSpell.cs b/DSALib/Models/Database/DSA/GeneralSpell.cs
index b4dbc0b..6fe6a78 100644
--- a/DSALib/Models/Database/DSA/GeneralSpell.cs
+++ b/DSALib/Models/Database/DSA/GeneralSpell.cs
@@ -1,4 +1,4 @@
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
     public class GeneralSpell : Talent
     {
diff --git a/DSALib/Models/Database/DSA/GroupChar.cs b/DSALib/Models/Database/DSA/GroupChar.cs
index 31fc583..0c1ecf1 100644
--- a/DSALib/Models/Database/DSA/GroupChar.cs
+++ b/DSALib/Models/Database/DSA/GroupChar.cs
@@ -1,4 +1,4 @@
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
     public class GroupChar
     {
diff --git a/DSALib/Models/Database/DSA/Inventory.cs b/DSALib/Models/Database/DSA/Inventory.cs
index 9a025d4..086564c 100644
--- a/DSALib/Models/Database/DSA/Inventory.cs
+++ b/DSALib/Models/Database/DSA/Inventory.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
     public class Inventory
     {
diff --git a/DSALib/Models/Database/DSA/Talent.cs b/DSALib/Models/Database/DSA/Talent.cs
index 59ff4bc..578d93c 100644
--- a/DSALib/Models/Database/DSA/Talent.cs
+++ b/DSALib/Models/Database/DSA/Talent.cs
@@ -1,8 +1,8 @@
 using System;
 
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
-    public class Talent
+    public class Talent : DSALib.Models.Database.DataObject
     {
         public Talent()
         {
@@ -19,8 +19,6 @@ namespace DSACore.Models.Database.DSA
             Roll = roll.Split('/');
         }
 
-        public string Name { get; set; }
-
         public string[] Roll { get; set; } = new string[3];
     }
 }
\ No newline at end of file
diff --git a/DSALib/Models/Database/DSA/Weapon.cs b/DSALib/Models/Database/DSA/Weapon.cs
index 58a44cd..8ed63d7 100644
--- a/DSALib/Models/Database/DSA/Weapon.cs
+++ b/DSALib/Models/Database/DSA/Weapon.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
     public class Weapon
     {
diff --git a/DSALib/Models/Database/DSA/WeaponTalent.cs b/DSALib/Models/Database/DSA/WeaponTalent.cs
index 98eb38d..f65fb3f 100644
--- a/DSALib/Models/Database/DSA/WeaponTalent.cs
+++ b/DSALib/Models/Database/DSA/WeaponTalent.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSACore.Models.Database.DSA
+namespace DSALib.Models.Database.DSA
 {
     public class WeaponTalent
     {
diff --git a/DSALib/Models/Database/DataObject.cs b/DSALib/Models/Database/DataObject.cs
new file mode 100644
index 0000000..59cfdf2
--- /dev/null
+++ b/DSALib/Models/Database/DataObject.cs
@@ -0,0 +1,13 @@
+namespace DSALib.Models.Database
+{
+    public class DataObject : IDataObject
+    {
+
+        public override string ToString()
+        {
+            return Name;
+        }
+
+        public string Name { get; set; }
+    }
+}
diff --git a/DSALib/Models/Database/Groups/DSAGroup.cs b/DSALib/Models/Database/Groups/DSAGroup.cs
index 89fac2f..377376e 100644
--- a/DSALib/Models/Database/Groups/DSAGroup.cs
+++ b/DSALib/Models/Database/Groups/DSAGroup.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using DSACore.Models.Database.DSA;
+using DSALib.Models.Database.DSA;
 
-namespace DSACore.Models.Database.Groups
+namespace DSALib.Models.Database.Groups
 {
     public class DSAGroup : Group
     {
diff --git a/DSALib/Models/Database/Groups/Group.cs b/DSALib/Models/Database/Groups/Group.cs
index 77d3a64..096f2be 100644
--- a/DSALib/Models/Database/Groups/Group.cs
+++ b/DSALib/Models/Database/Groups/Group.cs
@@ -1,9 +1,8 @@
-namespace DSACore.Models.Database.Groups
+namespace DSALib.Models.Database.Groups
 {
     public class Group
     {
         public string Name { get; set; }
-        public string Discord { get; set; }
         public string Password { get; set; }
         public int Id { get; set; }
     }
diff --git a/DSALib/Models/Database/IDataObject.cs b/DSALib/Models/Database/IDataObject.cs
new file mode 100644
index 0000000..bdc88b7
--- /dev/null
+++ b/DSALib/Models/Database/IDataObject.cs
@@ -0,0 +1,7 @@
+namespace DSALib.Models.Database
+{
+    public interface IDataObject
+    {
+        string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/DSALib/Models/Dsa/CritterAttack.cs b/DSALib/Models/Dsa/CritterAttack.cs
new file mode 100644
index 0000000..8cd8b09
--- /dev/null
+++ b/DSALib/Models/Dsa/CritterAttack.cs
@@ -0,0 +1,19 @@
+namespace DSALib.Models.Dsa
+{
+    public class CritterAttack : Database.DataObject
+    {
+        public CritterAttack(string name, int at, string tp, string comment = "")
+        {
+            Name = name;
+            At = at;
+            Tp = tp;
+            Comment = comment;
+        }
+
+        public int At { get; set; }
+
+        public string Tp { get; set; }
+
+        public string Comment { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/DSALib/Models/Dsa/KampfTalent.cs b/DSALib/Models/Dsa/KampfTalent.cs
new file mode 100644
index 0000000..51ad255
--- /dev/null
+++ b/DSALib/Models/Dsa/KampfTalent.cs
@@ -0,0 +1,16 @@
+namespace DSALib.Models.Dsa
+{
+    public class KampfTalent : Database.DataObject
+    {
+        public KampfTalent(string name, int at, int pa)
+        {
+            Name = name;
+            At = at;
+            Pa = pa;
+        }
+
+        public int At { get; set; }
+
+        public int Pa { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/DSALib/Models/Dsa/Talent.cs b/DSALib/Models/Dsa/Talent.cs
new file mode 100644
index 0000000..5771a74
--- /dev/null
+++ b/DSALib/Models/Dsa/Talent.cs
@@ -0,0 +1,43 @@
+namespace DSALib.Models.Dsa
+{
+    public class Talent : Database.DataObject // talent objekt
+    {
+        public Talent(string name, string probe, int value)
+        {
+            Name = name;
+            Probe = probe;
+            Value = value;
+        }
+
+        public string Probe { get; set; }
+
+        public int Value { get; set; }
+
+        public string[] GetEigenschaften() // turn XX/XX/XX into string[]{XX,XX,XX}
+        {
+            var temp = Probe.Split('/');
+            for (var index = 0; index < temp.Length; index++) temp[index] = temp[index].Replace("/", string.Empty);
+
+            return temp;
+        }
+
+        public bool IstFernkampftalent()
+        {
+            switch (Name)
+            {
+                case "Armbrust":
+                case "Belagerungswaffen":
+                case "Blasrohr":
+                case "Bogen":
+                case "Diskus":
+                case "Schleuder":
+                case "Wurfbeile":
+                case "Wurfmesser":
+                case "Wurfspeere":
+                    return true;
+                default:
+                    return false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DSALib/Models/Dsa/Vorteil.cs b/DSALib/Models/Dsa/Vorteil.cs
new file mode 100644
index 0000000..e37af20
--- /dev/null
+++ b/DSALib/Models/Dsa/Vorteil.cs
@@ -0,0 +1,16 @@
+namespace DSALib.Models.Dsa
+{
+    public class Vorteil : Database.DataObject // talent objekt
+    {
+        public Vorteil(string name, string value = "")
+        {
+            Name = name;
+            Value = value;
+            // this.Choice = choice;
+        }
+
+        public string Value { get; set; }
+
+        //public string Choice { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/DSALib/Models/Dsa/Zauber.cs b/DSALib/Models/Dsa/Zauber.cs
new file mode 100644
index 0000000..e4387bf
--- /dev/null
+++ b/DSALib/Models/Dsa/Zauber.cs
@@ -0,0 +1,16 @@
+namespace DSALib.Models.Dsa
+{
+    public class Zauber : Talent
+    {
+        public Zauber(string name, string probe, int value, char complexity = 'A', string representation = "Magier")
+            : base(name, probe, value)
+        {
+            Complexity = complexity;
+            Representation = Representation;
+        }
+
+        public char Complexity { get; }
+
+        public string Representation { get; }
+    }
+}
\ No newline at end of file
diff --git a/DSALib/Models/Network/Command.cs b/DSALib/Models/Network/Command.cs
index 00b00a6..5a97e88 100644
--- a/DSALib/Models/Network/Command.cs
+++ b/DSALib/Models/Network/Command.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace DSACore.Models.Network
+namespace DSALib.Models.Network
 {
     public class Command
     {
diff --git a/DSALib/Models/Network/CommandResponse.cs b/DSALib/Models/Network/CommandResponse.cs
index c7a410a..0816e4a 100644
--- a/DSALib/Models/Network/CommandResponse.cs
+++ b/DSALib/Models/Network/CommandResponse.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSACore.Models.Network
+namespace DSALib.Models.Network
 {
     public class CommandResponse
     {
diff --git a/DSALib/Models/Network/Group.cs b/DSALib/Models/Network/Group.cs
index efe12ee..608e5ea 100644
--- a/DSALib/Models/Network/Group.cs
+++ b/DSALib/Models/Network/Group.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace DSACore.Models.Network
+namespace DSALib.Models.Network
 {
     public class Group
     {
diff --git a/DSALib/Models/Network/Token.cs b/DSALib/Models/Network/Token.cs
index 451cafc..2310607 100644
--- a/DSALib/Models/Network/Token.cs
+++ b/DSALib/Models/Network/Token.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace DSACore.Models.Network
+namespace DSALib.Models.Network
 {
     public class Token
     {
diff --git a/DSALib/Models/Network/User.cs b/DSALib/Models/Network/User.cs
index 8b8008c..314a0bf 100644
--- a/DSALib/Models/Network/User.cs
+++ b/DSALib/Models/Network/User.cs
@@ -1,4 +1,4 @@
-namespace DSACore.Models.Network
+namespace DSALib.Models.Network
 {
     public class User
     {