From deb3640255abe60289e042944abf66bedcf1184e Mon Sep 17 00:00:00 2001 From: TrueDoctor Date: Mon, 9 Jul 2018 00:47:20 +0200 Subject: Revert "Reworked inheritance structure" This reverts commit f0d68ad8edb06ff68400644fd4c943f66705cc97. --- DSALib/Class1.cs | 12 ------- DSALib/DSALib.csproj | 53 ------------------------------ DSALib/Properties/AssemblyInfo.cs | 36 -------------------- DiscoBot.sln | 6 ---- DiscoBot/DSA_Game/Characters/Being.cs | 23 ------------- DiscoBot/DSA_Game/Characters/Character.cs | 15 ++++++++- DiscoBot/DSA_Game/Characters/Combatant.cs | 26 --------------- DiscoBot/DSA_Game/Characters/Entity.cs | 18 ---------- DiscoBot/DSA_Game/Characters/ICharacter.cs | 19 ++++++++++- DiscoBot/DSA_Game/Characters/NPC.cs | 13 +++++++- DiscoBot/DiscoBot.csproj | 3 -- 11 files changed, 44 insertions(+), 180 deletions(-) delete mode 100644 DSALib/Class1.cs delete mode 100644 DSALib/DSALib.csproj delete mode 100644 DSALib/Properties/AssemblyInfo.cs delete mode 100644 DiscoBot/DSA_Game/Characters/Being.cs delete mode 100644 DiscoBot/DSA_Game/Characters/Combatant.cs delete mode 100644 DiscoBot/DSA_Game/Characters/Entity.cs diff --git a/DSALib/Class1.cs b/DSALib/Class1.cs deleted file mode 100644 index 13d3431..0000000 --- a/DSALib/Class1.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DSALib -{ - public class Class1 - { - } -} diff --git a/DSALib/DSALib.csproj b/DSALib/DSALib.csproj deleted file mode 100644 index 35d1b00..0000000 --- a/DSALib/DSALib.csproj +++ /dev/null @@ -1,53 +0,0 @@ - - - - - Debug - AnyCPU - 3f5ff9fb-53e6-4eba-85a6-f44b1dc84883 - Library - Properties - DSALib - DSALib - v4.7.1 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DSALib/Properties/AssemblyInfo.cs b/DSALib/Properties/AssemblyInfo.cs deleted file mode 100644 index d348d14..0000000 --- a/DSALib/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("DSALib")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DSALib")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly -// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von -// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("3f5ff9fb-53e6-4eba-85a6-f44b1dc84883")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -// indem Sie "*" wie unten gezeigt eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/DiscoBot.sln b/DiscoBot.sln index 25ae7da..0dc4781 100644 --- a/DiscoBot.sln +++ b/DiscoBot.sln @@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoBot", "DiscoBot\DiscoBot.csproj", "{1186AF1C-BC46-4B3D-BEE0-CE478B8AEAC7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DSALib", "DSALib\DSALib.csproj", "{3F5FF9FB-53E6-4EBA-85A6-F44B1DC84883}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -22,10 +20,6 @@ Global {1186AF1C-BC46-4B3D-BEE0-CE478B8AEAC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {1186AF1C-BC46-4B3D-BEE0-CE478B8AEAC7}.Release|Any CPU.ActiveCfg = Release|Any CPU {1186AF1C-BC46-4B3D-BEE0-CE478B8AEAC7}.Release|Any CPU.Build.0 = Release|Any CPU - {3F5FF9FB-53E6-4EBA-85A6-F44B1DC84883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3F5FF9FB-53E6-4EBA-85A6-F44B1DC84883}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3F5FF9FB-53E6-4EBA-85A6-F44B1DC84883}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3F5FF9FB-53E6-4EBA-85A6-F44B1DC84883}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DiscoBot/DSA_Game/Characters/Being.cs b/DiscoBot/DSA_Game/Characters/Being.cs deleted file mode 100644 index 154e69e..0000000 --- a/DiscoBot/DSA_Game/Characters/Being.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DiscoBot.DSA_Game.Characters -{ - public class Being : Entity - { - public int Lebenspunkte_Basis { get; set; } = 30; - - public int Lebenspunkte_Aktuell { get; set; } = 30; - - public int Ausdauer_Basis { get; set; } = 30; - - public int Ausdauer_Aktuell { get; set; } = 30; - - public int Astralpunkte_Basis { get; set; } = 0; - - public int Astralpunkte_Aktuell { get; set; } = 0; - } -} diff --git a/DiscoBot/DSA_Game/Characters/Character.cs b/DiscoBot/DSA_Game/Characters/Character.cs index c2d14eb..6616a03 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 : Being, ICharacter + public class Character : ICharacter { public Character() { @@ -61,6 +61,19 @@ 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 Eigenschaften { get; set; } = new Dictionary(); // char properties public List Talente { get; set; } = new List(); // list of talent objects (talents) diff --git a/DiscoBot/DSA_Game/Characters/Combatant.cs b/DiscoBot/DSA_Game/Characters/Combatant.cs deleted file mode 100644 index a99bff9..0000000 --- a/DiscoBot/DSA_Game/Characters/Combatant.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DiscoBot.DSA_Game.Characters -{ - public interface ICombatant - { - string Name { get; set; } - - int Lebenspunkte_Basis { get; set; } - int Lebenspunkte_Aktuell { get; set; } - - int Ausdauer_Basis { get; set; } - int Ausdauer_Aktuell { get; set; } - - int Astralpunkte_Basis { get; set; } - int Astralpunkte_Aktuell { get; set; } - - string Angriff(string talent, int erschwernis = 0); - - string Parade(string talent, int erschwernis = 0); - } -} diff --git a/DiscoBot/DSA_Game/Characters/Entity.cs b/DiscoBot/DSA_Game/Characters/Entity.cs deleted file mode 100644 index f8e7a12..0000000 --- a/DiscoBot/DSA_Game/Characters/Entity.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DiscoBot.DSA_Game.Characters -{ - public class Entity - { - public string Name { get; set; } - - public override string ToString() - { - return this.Name; - } - } -} diff --git a/DiscoBot/DSA_Game/Characters/ICharacter.cs b/DiscoBot/DSA_Game/Characters/ICharacter.cs index aabebe6..3ec4258 100644 --- a/DiscoBot/DSA_Game/Characters/ICharacter.cs +++ b/DiscoBot/DSA_Game/Characters/ICharacter.cs @@ -1,11 +1,28 @@ namespace DiscoBot.DSA_Game.Characters { - public interface ICharacter : ICombatant + public interface ICharacter { + string Name { get; set; } + + int Lebenspunkte_Basis { get; set; } + int Lebenspunkte_Aktuell { get; set; } + + int Ausdauer_Basis { get; set; } + int Ausdauer_Aktuell { get; set; } + + int Astralpunkte_Basis { get; set; } + int Astralpunkte_Aktuell { get; set; } + + //int Karmapunkte { get; set; } + string TestTalent(string talent, int erschwernis = 0); string TestEigenschaft(string eigenschaft, int erschwernis = 0); + string Angriff(string talent, int erschwernis = 0); + + string Parade(string talent, int erschwernis = 0); + string Fernkampf(string talent, int erschwernis = 0); string TestZauber(string waffe, int erschwernis); diff --git a/DiscoBot/DSA_Game/Characters/NPC.cs b/DiscoBot/DSA_Game/Characters/NPC.cs index c135e30..0894df6 100644 --- a/DiscoBot/DSA_Game/Characters/NPC.cs +++ b/DiscoBot/DSA_Game/Characters/NPC.cs @@ -5,7 +5,7 @@ using DiscoBot.Auxiliary; using DiscoBot.DSA_Game.Characters; - public class Npc : Being, ICharacter + public class Npc : ICharacter { private readonly int mean, stDv; @@ -16,6 +16,17 @@ this.Name = name; } + public string Name { get; set; } + + 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 string TestTalent(string talent, int tap = 3) { for (int i = 0; i <= 2; i++) diff --git a/DiscoBot/DiscoBot.csproj b/DiscoBot/DiscoBot.csproj index efadae4..e0f8668 100644 --- a/DiscoBot/DiscoBot.csproj +++ b/DiscoBot/DiscoBot.csproj @@ -104,10 +104,7 @@ - - - -- cgit v1.3.1