From ac3f4ef1a70c4cdb538a0f0629c97bf34871a58b Mon Sep 17 00:00:00 2001
From: TrueDoctor <d-kobert@web.de>
Date: Mon, 9 Jul 2018 00:48:46 +0200
Subject: Revert "Revert "Reworked inheritance structure""

This reverts commit deb3640255abe60289e042944abf66bedcf1184e.
---
 DiscoBot/DSA_Game/Characters/Character.cs | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'DiscoBot/DSA_Game/Characters/Character.cs')

diff --git a/DiscoBot/DSA_Game/Characters/Character.cs b/DiscoBot/DSA_Game/Characters/Character.cs
index 6616a03..c2d14eb 100644
--- a/DiscoBot/DSA_Game/Characters/Character.cs
+++ b/DiscoBot/DSA_Game/Characters/Character.cs
@@ -9,7 +9,7 @@
     using DiscoBot.Audio;
     using DiscoBot.Auxiliary;
 
-    public class Character : ICharacter
+    public class Character : Being, ICharacter
     {
         public Character()
         {
@@ -61,19 +61,6 @@
             this.Post_process(); // calculate derived values
         }
 
-        public string Name { get; set; } // char name
-
-        public int Lebenspunkte_Basis { get; set; }
-        public int Lebenspunkte_Aktuell { get; set; }
-
-        public int Astralpunkte_Basis { get; set; }
-        public int Astralpunkte_Aktuell { get; set; }
-
-        public int Ausdauer_Basis { get; set; }
-        public int Ausdauer_Aktuell { get; set; }
-
-        
-
         public Dictionary<string, int> Eigenschaften { get; set; } = new Dictionary<string, int>();   // char properties
 
         public List<Talent> Talente { get; set; } = new List<Talent>();       // list of talent objects (talents)
-- 
cgit v1.2.3-70-g09d2