From ed26623e17e8dfcc036f88cca6de10d5a35697ec Mon Sep 17 00:00:00 2001
From: uzvkl <dennis.kobert@student.kit.edu>
Date: Mon, 20 May 2019 00:54:14 +0200
Subject: Reorganize Code delete ZoBotanica

---
 DSALib/Models/Database/DSA/Advantage.cs    | 2 +-
 DSALib/Models/Database/DSA/CharSpell.cs    | 2 +-
 DSALib/Models/Database/DSA/DatabaseChar.cs | 4 ++--
 DSALib/Models/Database/DSA/Field.cs        | 2 +-
 DSALib/Models/Database/DSA/GeneralSpell.cs | 2 +-
 DSALib/Models/Database/DSA/GroupChar.cs    | 2 +-
 DSALib/Models/Database/DSA/Inventory.cs    | 2 +-
 DSALib/Models/Database/DSA/Talent.cs       | 6 ++----
 DSALib/Models/Database/DSA/Weapon.cs       | 2 +-
 DSALib/Models/Database/DSA/WeaponTalent.cs | 2 +-
 10 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'DSALib/Models/Database/DSA')

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
     {
-- 
cgit v1.2.3-54-g00ecf