general refectoring

added 42 as dummy Token

7 files changed, 20 insertions, 31 deletions

diff --git a/DSACore/Models/Database/DSA/DatabaseChar.cs b/DSACore/Models/Database/DSA/DatabaseChar.cs
index 6a57629..872b82e 100644
--- a/DSACore/Models/Database/DSA/DatabaseChar.cs
+++ b/DSACore/Models/Database/DSA/DatabaseChar.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using DSACore.DSA_Game.Characters;
 
 namespace DSACore.Models.Database.DSA
 {
@@ -40,7 +41,7 @@ namespace DSACore.Models.Database.DSA
         public List<WeaponTalent> WeaponTalents { get; set; } = new List<WeaponTalent>();
 
 
-        public static void LoadChar(DSA_Game.Characters.Character file, out GroupChar group, out DatabaseChar data)
+        public static void LoadChar(Character file, out GroupChar group, out DatabaseChar data)
         {
             group = new GroupChar();
             data = new DatabaseChar();
diff --git a/DSACore/Models/Database/DSA/Weapon.cs b/DSACore/Models/Database/DSA/Weapon.cs
index d6d7999..58a44cd 100644
--- a/DSACore/Models/Database/DSA/Weapon.cs
+++ b/DSACore/Models/Database/DSA/Weapon.cs
@@ -26,27 +26,27 @@ namespace DSACore.Models.Database.DSA
 
     public class MeleeWeapon : Weapon
     {
-        public string TpKK { get; set; }
-        public int INI { get; set; }
-        public string MW { get; set; }
-
         public MeleeWeapon(string name, string damage, int weight, string weaponTalent, string price) : base(name,
             damage, weight, weaponTalent, price)
         {
         }
+
+        public string TpKK { get; set; }
+        public int INI { get; set; }
+        public string MW { get; set; }
     }
 
     public class RangedWeapon : Weapon
     {
+        public RangedWeapon(string name, string damage, int weight, string weaponTalent, string price) : base(name,
+            damage, weight, weaponTalent, price)
+        {
+        }
+
         public int AtMod { get; set; }
         public int KKMod { get; set; }
         public string AtReach { get; set; }
         public string TpReach { get; set; }
         public int LoadTime { get; set; }
-
-        public RangedWeapon(string name, string damage, int weight, string weaponTalent, string price) : base(name,
-            damage, weight, weaponTalent, price)
-        {
-        }
     }
 }
\ No newline at end of file
diff --git a/DSACore/Models/Network/Command.cs b/DSACore/Models/Network/Command.cs
index 316461e..00b00a6 100644
--- a/DSACore/Models/Network/Command.cs
+++ b/DSACore/Models/Network/Command.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace DSACore.Models.Network
 {
diff --git a/DSACore/Models/Network/CommandResponse.cs b/DSACore/Models/Network/CommandResponse.cs
index 7478397..c7a410a 100644
--- a/DSACore/Models/Network/CommandResponse.cs
+++ b/DSACore/Models/Network/CommandResponse.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace DSACore.Models.Network
 {
@@ -13,8 +10,8 @@ namespace DSACore.Models.Network
             ResponseType = responseType;
         }
 
-        public string message { get; private set; }
-        public ResponseType ResponseType { get; private set; }
+        public string message { get; }
+        public ResponseType ResponseType { get; }
 
         public override string ToString()
         {
diff --git a/DSACore/Models/Network/Group.cs b/DSACore/Models/Network/Group.cs
index 3a8ce77..efe12ee 100644
--- a/DSACore/Models/Network/Group.cs
+++ b/DSACore/Models/Network/Group.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace DSACore.Models.Network
 {
diff --git a/DSACore/Models/Network/Token.cs b/DSACore/Models/Network/Token.cs
index 0021317..451cafc 100644
--- a/DSACore/Models/Network/Token.cs
+++ b/DSACore/Models/Network/Token.cs
@@ -1,18 +1,18 @@
 using System;
-using Microsoft.EntityFrameworkCore;
 
 namespace DSACore.Models.Network
 {
     public class Token
     {
-        public string Group { get; set; }
-        private DateTime creation = DateTime.Now;
+        private readonly DateTime creation = DateTime.Now;
 
-        public Token(string @group)
+        public Token(string group)
         {
-            Group = @group;
+            Group = group;
         }
 
+        public string Group { get; set; }
+
         public bool IsValid()
         {
             return DateTime.Now - creation < TimeSpan.FromMinutes(1);
diff --git a/DSACore/Models/Network/User.cs b/DSACore/Models/Network/User.cs
index 97a9224..8b8008c 100644
--- a/DSACore/Models/Network/User.cs
+++ b/DSACore/Models/Network/User.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace DSACore.Models.Network
+namespace DSACore.Models.Network
 {
     public class User
     {