From ed26623e17e8dfcc036f88cca6de10d5a35697ec Mon Sep 17 00:00:00 2001 From: uzvkl 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 +- DSALib/Models/Database/DataObject.cs | 13 +++++++++++++ DSALib/Models/Database/Groups/DSAGroup.cs | 4 ++-- DSALib/Models/Database/Groups/Group.cs | 3 +-- DSALib/Models/Database/IDataObject.cs | 7 +++++++ 14 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 DSALib/Models/Database/DataObject.cs create mode 100644 DSALib/Models/Database/IDataObject.cs (limited to 'DSALib/Models/Database') 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 -- cgit v1.2.3-70-g09d2