general refectoring

added 42 as dummy Token

4 files changed, 29 insertions, 44 deletions

diff --git a/DSALib/Characters/Being.cs b/DSALib/Characters/Being.cs
index cf338f9..27879a1 100644
--- a/DSALib/Characters/Being.cs
+++ b/DSALib/Characters/Being.cs
@@ -1,6 +1,4 @@
-using DiscoBot.DSA_Game.Characters;
-
-namespace DSALib.Characters
+namespace DSALib.Characters
 {
     public class Being : Entity
     {
diff --git a/DSALib/Characters/Critter.cs b/DSALib/Characters/Critter.cs
index c511090..d9f8b53 100644
--- a/DSALib/Characters/Critter.cs
+++ b/DSALib/Characters/Critter.cs
@@ -1,14 +1,32 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using DiscoBot.DSA_Game.Characters;
+using Newtonsoft.Json;
 
 namespace DSALib.Characters
 {
-    using System.IO;
-    using DiscoBot.DSA_Game.Characters;
-    using Newtonsoft.Json;
-
     public class Critter : Being, ICombatant
     {
+        public CritterAttack lastAttack;
+
+        public Critter(int gw, int gs, int rs, int mr, int ko, int pa, string ini, List<CritterAttack> critterAttacks)
+        {
+            Gw = gw;
+            Gs = gs;
+            Rs = rs;
+            Mr = mr;
+            Ko = ko;
+            Pa = pa;
+            Ini = ini;
+            CritterAttacks = critterAttacks;
+            lastAttack = CritterAttacks[new Random().Next(critterAttacks.Count)];
+        }
+
+        public Critter()
+        {
+        }
+
         public int Rs { get; set; }
 
         public int Mr { get; set; }
@@ -27,23 +45,14 @@ namespace DSALib.Characters
 
         public List<CritterAttack> CritterAttacks { get; set; }
 
-        public CritterAttack lastAttack;
-
-        public Critter(int gw, int gs, int rs, int mr, int ko, int pa, string ini, List<CritterAttack> critterAttacks)
+        public string Angriff(string talent, int erschwernis = 0)
         {
-            Gw = gw;
-            Gs = gs;
-            Rs = rs;
-            Mr = mr;
-            Ko = ko;
-            Pa = pa;
-            Ini = ini;
-            CritterAttacks = critterAttacks;
-            lastAttack = CritterAttacks[new Random().Next(critterAttacks.Count)];
+            throw new NotImplementedException();
         }
 
-        public Critter()
+        public string Parade(string talent, int erschwernis = 0)
         {
+            throw new NotImplementedException();
         }
 
         public static Critter Load(string path)
@@ -61,16 +70,6 @@ namespace DSALib.Characters
             }
         }
 
-        public string Angriff(string talent, int erschwernis = 0)
-        {
-            throw new NotImplementedException();
-        }
-
-        public string Parade(string talent, int erschwernis = 0)
-        {
-            throw new NotImplementedException();
-        }
-
         public void Save(string path = @"..\..\Critters\")
         {
             try
diff --git a/DSALib/Characters/ICombatant.cs b/DSALib/Characters/ICombatant.cs
index 887893c..a4ce601 100644
--- a/DSALib/Characters/ICombatant.cs
+++ b/DSALib/Characters/ICombatant.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DiscoBot.DSA_Game.Characters
+namespace DiscoBot.DSA_Game.Characters
 {
     public interface ICombatant
     {
diff --git a/DSALib/CritterAttack.cs b/DSALib/CritterAttack.cs
index 5fdcffa..3b0a11d 100644
--- a/DSALib/CritterAttack.cs
+++ b/DSALib/CritterAttack.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DSALib
+namespace DSALib
 {
     public class CritterAttack
     {