summaryrefslogtreecommitdiff
path: root/DSALib
diff options
context:
space:
mode:
Diffstat (limited to 'DSALib')
-rw-r--r--DSALib/Characters/Being.cs8
-rw-r--r--DSALib/Characters/Entity.cs8
-rw-r--r--DSALib/Characters/ICharacter.cs4
-rw-r--r--DSALib/DSALib.csproj65
-rw-r--r--DSALib/KampfTalent.cs2
-rw-r--r--DSALib/Properties/AssemblyInfo.cs36
-rw-r--r--DSALib/Talent.cs5
-rw-r--r--DSALib/Vorteil.cs2
-rw-r--r--DSALib/Zauber.cs8
-rw-r--r--DSALib/packages.config4
10 files changed, 17 insertions, 125 deletions
diff --git a/DSALib/Characters/Being.cs b/DSALib/Characters/Being.cs
index 154e69e..7ac7341 100644
--- a/DSALib/Characters/Being.cs
+++ b/DSALib/Characters/Being.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using DiscoBot.DSA_Game.Characters;
-namespace DiscoBot.DSA_Game.Characters
+namespace DSALib.Characters
{
public class Being : Entity
{
diff --git a/DSALib/Characters/Entity.cs b/DSALib/Characters/Entity.cs
index f8e7a12..6b03e50 100644
--- a/DSALib/Characters/Entity.cs
+++ b/DSALib/Characters/Entity.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 DSALib.Characters
{
public class Entity
{
diff --git a/DSALib/Characters/ICharacter.cs b/DSALib/Characters/ICharacter.cs
index aabebe6..83b53bf 100644
--- a/DSALib/Characters/ICharacter.cs
+++ b/DSALib/Characters/ICharacter.cs
@@ -1,4 +1,6 @@
-namespace DiscoBot.DSA_Game.Characters
+using DiscoBot.DSA_Game.Characters;
+
+namespace DSALib.Characters
{
public interface ICharacter : ICombatant
{
diff --git a/DSALib/DSALib.csproj b/DSALib/DSALib.csproj
index 27514d5..afada82 100644
--- a/DSALib/DSALib.csproj
+++ b/DSALib/DSALib.csproj
@@ -1,62 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{33281E45-1D5C-4645-8D2B-DD05B40FDFD5}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>DSALib</RootNamespace>
- <AssemblyName>DSALib</AssemblyName>
- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
+ <TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Characters\Being.cs" />
- <Compile Include="Characters\Critter.cs" />
- <Compile Include="Characters\ICombatant.cs" />
- <Compile Include="Characters\Entity.cs" />
- <Compile Include="Characters\ICharacter.cs" />
- <Compile Include="CritterAttack.cs" />
- <Compile Include="KampfTalent.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Talent.cs" />
- <Compile Include="Vorteil.cs" />
- <Compile Include="Zauber.cs" />
- </ItemGroup>
+
<ItemGroup>
- <None Include="packages.config" />
+ <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
</ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project> \ No newline at end of file
+
+</Project>
diff --git a/DSALib/KampfTalent.cs b/DSALib/KampfTalent.cs
index 79703d5..7e4e9be 100644
--- a/DSALib/KampfTalent.cs
+++ b/DSALib/KampfTalent.cs
@@ -1,4 +1,4 @@
-namespace DiscoBot.DSA_Game
+namespace DSALib
{
public class KampfTalent
{
diff --git a/DSALib/Properties/AssemblyInfo.cs b/DSALib/Properties/AssemblyInfo.cs
deleted file mode 100644
index e4e18bb..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("33281e45-1d5c-4645-8d2b-dd05b40fdfd5")]
-
-// 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/DSALib/Talent.cs b/DSALib/Talent.cs
index 7176194..bf1e52d 100644
--- a/DSALib/Talent.cs
+++ b/DSALib/Talent.cs
@@ -1,8 +1,5 @@
-namespace DiscoBot.DSA_Game
+namespace DSALib
{
- using System;
-
-
public class Talent // talent objekt
{
public Talent(string name, string probe, int value)
diff --git a/DSALib/Vorteil.cs b/DSALib/Vorteil.cs
index 493c4d1..bf698d8 100644
--- a/DSALib/Vorteil.cs
+++ b/DSALib/Vorteil.cs
@@ -1,4 +1,4 @@
-namespace DiscoBot.DSA_Game
+namespace DSALib
{
public class Vorteil // talent objekt
{
diff --git a/DSALib/Zauber.cs b/DSALib/Zauber.cs
index bf49a2e..3c7533f 100644
--- a/DSALib/Zauber.cs
+++ b/DSALib/Zauber.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
+namespace DSALib
{
public class Zauber : Talent
{
diff --git a/DSALib/packages.config b/DSALib/packages.config
deleted file mode 100644
index 5762754..0000000
--- a/DSALib/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
-</packages> \ No newline at end of file