From c4d046858e0822b7c2c540ac2368b2c0e88e7a26 Mon Sep 17 00:00:00 2001
From: Dennis Kobert <d-kobert@web.de>
Date: Sun, 19 May 2019 17:00:02 +0200
Subject: general refectoring

added 42 as dummy Token
---
 DSACore/Models/Database/DSA/DatabaseChar.cs |  3 ++-
 DSACore/Models/Database/DSA/Weapon.cs       | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

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

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
-- 
cgit v1.2.3-70-g09d2