summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruzvkl <dennis.kobert@student.kit.edu>2019-06-11 23:05:52 +0200
committeruzvkl <dennis.kobert@student.kit.edu>2019-06-11 23:05:52 +0200
commite6181c24124d97f2fbc932b8a68311e625463156 (patch)
treec1f097c344ca266b7941c9668590b0fd35c7870a
parent2490ad5d31fe2ac778ff9303776f0e91f47a2862 (diff)
Move dsa related stuff to subfolder
-rw-r--r--DiscoBot.sln23
-rw-r--r--dsa/DSACore/Controllers/CommandsController.cs (renamed from DSACore/Controllers/CommandsController.cs)0
-rw-r--r--dsa/DSACore/Controllers/LobbyController.cs (renamed from DSACore/Controllers/LobbyController.cs)0
-rw-r--r--dsa/DSACore/Controllers/TokensController.cs (renamed from DSACore/Controllers/TokensController.cs)0
-rw-r--r--dsa/DSACore/Controllers/ValuesController.cs (renamed from DSACore/Controllers/ValuesController.cs)0
-rw-r--r--dsa/DSACore/DSACore.csproj (renamed from DSACore/DSACore.csproj)0
-rw-r--r--dsa/DSACore/Hubs/Login.cs (renamed from DSACore/Hubs/Login.cs)0
-rw-r--r--dsa/DSACore/Models/Network/Group.cs (renamed from DSACore/Models/Network/Group.cs)0
-rw-r--r--dsa/DSACore/Models/Network/Token.cs (renamed from DSACore/Models/Network/Token.cs)0
-rw-r--r--dsa/DSACore/Models/Network/User.cs (renamed from DSACore/Models/Network/User.cs)0
-rw-r--r--dsa/DSACore/Program.cs (renamed from DSACore/Program.cs)0
-rw-r--r--dsa/DSACore/Properties/DSALib-Auxiliary-CommandInfo.json (renamed from DSACore/Properties/DSALib-Auxiliary-CommandInfo.json)0
-rw-r--r--dsa/DSACore/Properties/DSALib-DSA_Game-Characters-Character.json (renamed from DSACore/Properties/DSALib-DSA_Game-Characters-Character.json)0
-rw-r--r--dsa/DSACore/Properties/PublishProfiles/FolderProfile.pubxml (renamed from DSACore/Properties/PublishProfiles/FolderProfile.pubxml)0
-rw-r--r--dsa/DSACore/Properties/PublishProfiles/FolderProfile1.pubxml (renamed from DSACore/Properties/PublishProfiles/FolderProfile1.pubxml)0
-rw-r--r--dsa/DSACore/Properties/launchSettings.json (renamed from DSACore/Properties/launchSettings.json)0
-rw-r--r--dsa/DSACore/PropertiesDSALib-Auxiliary-CommandInfo.json (renamed from DSALib/Properties-DSACore-Auxiliary-CommandInfo.json)0
-rw-r--r--dsa/DSACore/PropertiesDSALib-DSA_Game-Characters-Character.json (renamed from DSALib/Properties-DSACore-DSA_Game-Characters-Character.json)0
-rw-r--r--dsa/DSACore/PropertiesNewtonsoft-Json-Linq-JProperty.json30
-rw-r--r--dsa/DSACore/Startup.cs (renamed from DSACore/Startup.cs)0
-rw-r--r--dsa/DSACore/Token1
-rw-r--r--dsa/DSACore/appsettings.Development.json (renamed from DSACore/appsettings.Development.json)0
-rw-r--r--dsa/DSACore/appsettings.json (renamed from DSACore/appsettings.json)0
-rw-r--r--dsa/DSALib/Auxiliary/Calculator/Argument.cs (renamed from DSALib/Auxiliary/Calculator/Argument.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/Calculator/ISolvable.cs (renamed from DSALib/Auxiliary/Calculator/ISolvable.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/Calculator/Operator.cs (renamed from DSALib/Auxiliary/Calculator/Operator.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/Calculator/Ops.cs (renamed from DSALib/Auxiliary/Calculator/Ops.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/Calculator/StringSolver.cs (renamed from DSALib/Auxiliary/Calculator/StringSolver.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/CommandInfo.cs (renamed from DSALib/Auxiliary/CommandInfo.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/Dice.cs (renamed from DSALib/Auxiliary/Dice.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/Extensions.cs (renamed from DSALib/Auxiliary/Extensions.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/IDataObjectEnumerableExtension.cs (renamed from DSALib/Auxiliary/IDataObjectEnumerableExtension.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/RandomMisc.cs (renamed from DSALib/Auxiliary/RandomMisc.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/SpellCorrect.cs (renamed from DSALib/Auxiliary/SpellCorrect.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/TalentEnumerableExtension.cs (renamed from DSALib/Auxiliary/TalentEnumerableExtension.cs)0
-rw-r--r--dsa/DSALib/Auxiliary/WeaponImporter.cs (renamed from DSALib/Auxiliary/WeaponImporter.cs)0
-rw-r--r--dsa/DSALib/Characters/Being.cs (renamed from DSALib/Characters/Being.cs)0
-rw-r--r--dsa/DSALib/Characters/Critter.cs (renamed from DSALib/Characters/Critter.cs)0
-rw-r--r--dsa/DSALib/Characters/Entity.cs (renamed from DSALib/Characters/Entity.cs)0
-rw-r--r--dsa/DSALib/Characters/ICharacter.cs (renamed from DSALib/Characters/ICharacter.cs)0
-rw-r--r--dsa/DSALib/Characters/ICombatant.cs (renamed from DSALib/Characters/ICombatant.cs)0
-rw-r--r--dsa/DSALib/Commands/CommandHandler.cs (renamed from DSALib/Commands/CommandHandler.cs)0
-rw-r--r--dsa/DSALib/Commands/CommandTypes.cs (renamed from DSALib/Commands/CommandTypes.cs)0
-rw-r--r--dsa/DSALib/Commands/FileHandler.cs (renamed from DSALib/Commands/FileHandler.cs)0
-rw-r--r--dsa/DSALib/Commands/Gm.cs (renamed from DSALib/Commands/Gm.cs)0
-rw-r--r--dsa/DSALib/Commands/HeldList.cs (renamed from DSALib/Commands/HeldList.cs)0
-rw-r--r--dsa/DSALib/Commands/Help.cs (renamed from DSALib/Commands/Help.cs)0
-rw-r--r--dsa/DSALib/Commands/LebenUndAstral.cs (renamed from DSALib/Commands/LebenUndAstral.cs)0
-rw-r--r--dsa/DSALib/Commands/List.cs (renamed from DSALib/Commands/List.cs)0
-rw-r--r--dsa/DSALib/Commands/MiscCommands.cs (renamed from DSALib/Commands/MiscCommands.cs)0
-rw-r--r--dsa/DSALib/Commands/NpcCommands.cs (renamed from DSALib/Commands/NpcCommands.cs)0
-rw-r--r--dsa/DSALib/Commands/ProbenTest.cs (renamed from DSALib/Commands/ProbenTest.cs)0
-rw-r--r--dsa/DSALib/DSALib.csproj (renamed from DSALib/DSALib.csproj)0
-rw-r--r--dsa/DSALib/DSA_Game/Characters/Character.cs (renamed from DSALib/DSA_Game/Characters/Character.cs)0
-rw-r--r--dsa/DSALib/DSA_Game/Characters/NPC.cs (renamed from DSALib/DSA_Game/Characters/NPC.cs)0
-rw-r--r--dsa/DSALib/DSA_Game/Characters/SaveChar.cs (renamed from DSALib/DSA_Game/Characters/SaveChar.cs)0
-rw-r--r--dsa/DSALib/DSA_Game/Dsa.cs (renamed from DSALib/DSA_Game/Dsa.cs)0
-rw-r--r--dsa/DSALib/DSA_Game/Save/Properties.cs (renamed from DSALib/DSA_Game/Save/Properties.cs)0
-rw-r--r--dsa/DSALib/DSA_Game/Save/SaveCommand.cs (renamed from DSALib/DSA_Game/Save/SaveCommand.cs)0
-rw-r--r--dsa/DSALib/DSA_Game/Save/Session.cs (renamed from DSALib/DSA_Game/Save/Session.cs)0
-rw-r--r--dsa/DSALib/FireBase/Database.cs (renamed from DSALib/FireBase/Database.cs)0
-rw-r--r--dsa/DSALib/Models/Database/DataObject.cs (renamed from DSALib/Models/Database/DataObject.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/Advantage.cs (renamed from DSALib/Models/Database/DSA/Advantage.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/CharSpell.cs (renamed from DSALib/Models/Database/DSA/CharSpell.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/DatabaseChar.cs (renamed from DSALib/Models/Database/DSA/DatabaseChar.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/Field.cs (renamed from DSALib/Models/Database/DSA/Field.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/GeneralSpell.cs (renamed from DSALib/Models/Database/DSA/GeneralSpell.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/GroupChar.cs (renamed from DSALib/Models/Database/DSA/GroupChar.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/Inventory.cs (renamed from DSALib/Models/Database/DSA/Inventory.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/Talent.cs (renamed from DSALib/Models/Database/DSA/Talent.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/Weapon.cs (renamed from DSALib/Models/Database/DSA/Weapon.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Dsa/WeaponTalent.cs (renamed from DSALib/Models/Database/DSA/WeaponTalent.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Groups/DSAGroup.cs (renamed from DSALib/Models/Database/Groups/DSAGroup.cs)0
-rw-r--r--dsa/DSALib/Models/Database/Groups/Group.cs (renamed from DSALib/Models/Database/Groups/Group.cs)0
-rw-r--r--dsa/DSALib/Models/Database/IDataObject.cs (renamed from DSALib/Models/Database/IDataObject.cs)0
-rw-r--r--dsa/DSALib/Models/Dsa/CritterAttack.cs (renamed from DSALib/Models/Dsa/CritterAttack.cs)0
-rw-r--r--dsa/DSALib/Models/Dsa/KampfTalent.cs (renamed from DSALib/Models/Dsa/KampfTalent.cs)0
-rw-r--r--dsa/DSALib/Models/Dsa/Talent.cs (renamed from DSALib/Models/Dsa/Talent.cs)0
-rw-r--r--dsa/DSALib/Models/Dsa/Vorteil.cs (renamed from DSALib/Models/Dsa/Vorteil.cs)0
-rw-r--r--dsa/DSALib/Models/Dsa/Zauber.cs (renamed from DSALib/Models/Dsa/Zauber.cs)0
-rw-r--r--dsa/DSALib/Models/Network/Command.cs (renamed from DSALib/Models/Network/Command.cs)0
-rw-r--r--dsa/DSALib/Models/Network/CommandResponse.cs (renamed from DSALib/Models/Network/CommandResponse.cs)0
-rw-r--r--dsa/DSALib/Properties-DSACore-Auxiliary-CommandInfo.json (renamed from DiscoBot/Properties/DiscoBot-Auxiliary-CommandInfo.json)0
-rw-r--r--dsa/DSALib/Properties-DSACore-DSA_Game-Characters-Character.json (renamed from DiscoBot/Properties/DiscoBot-DSA_Game-Characters-Character.json)0
-rw-r--r--dsa/DSALib/PropertiesNewtonsoft-Json-Linq-JProperty.json (renamed from DSALib/PropertiesNewtonsoft-Json-Linq-JProperty.json)0
-rw-r--r--dsa/DiscoBot/App.config (renamed from DiscoBot/App.config)0
-rw-r--r--dsa/DiscoBot/Auxiliary/CommandExtension.cs (renamed from DiscoBot/Auxiliary/CommandExtension.cs)0
-rw-r--r--dsa/DiscoBot/Auxiliary/Dice.cs (renamed from DiscoBot/Auxiliary/Dice.cs)0
-rw-r--r--dsa/DiscoBot/Auxiliary/Permissions.cs (renamed from DiscoBot/Auxiliary/Permissions.cs)0
-rw-r--r--dsa/DiscoBot/Auxiliary/RandomMisc.cs (renamed from DiscoBot/Auxiliary/RandomMisc.cs)0
-rw-r--r--dsa/DiscoBot/Auxiliary/SpellCorrect.cs (renamed from DiscoBot/Auxiliary/SpellCorrect.cs)0
-rw-r--r--dsa/DiscoBot/Commands/CommandExtension.cs (renamed from DiscoBot/Commands/CommandExtension.cs)0
-rw-r--r--dsa/DiscoBot/Commands/FileHandler.cs (renamed from DiscoBot/Commands/FileHandler.cs)0
-rw-r--r--dsa/DiscoBot/Commands/MiscCommands.cs (renamed from DiscoBot/Commands/MiscCommands.cs)0
-rw-r--r--dsa/DiscoBot/DiscoBot.csproj (renamed from DiscoBot/DiscoBot.csproj)0
-rw-r--r--dsa/DiscoBot/Help.json (renamed from DiscoBot/Help.json)0
-rw-r--r--dsa/DiscoBot/Program.cs (renamed from DiscoBot/Program.cs)0
-rw-r--r--dsa/DiscoBot/Properties.json (renamed from DiscoBot/Properties.json)0
-rw-r--r--dsa/DiscoBot/Properties/AssemblyInfo.cs (renamed from DiscoBot/Properties/AssemblyInfo.cs)0
-rw-r--r--dsa/DiscoBot/Properties/DiscoBot-Audio-Sound.json (renamed from DiscoBot/Properties/DiscoBot-Audio-Sound.json)0
-rw-r--r--dsa/DiscoBot/Properties/DiscoBot-Auxiliary-CommandInfo.json101
-rw-r--r--dsa/DiscoBot/Properties/DiscoBot-DSA_Game-Characters-Character.json290
-rw-r--r--dsa/DiscoBot/Properties/Settings.Designer.cs (renamed from DiscoBot/Properties/Settings.Designer.cs)0
-rw-r--r--dsa/DiscoBot/Properties/Settings.settings (renamed from DiscoBot/Properties/Settings.settings)0
-rw-r--r--dsa/DiscoBot/Rework/Permissions.cs (renamed from DiscoBot/Rework/Permissions.cs)0
-rw-r--r--dsa/DiscoBot/Token (renamed from DiscoBot/Token)0
-rw-r--r--dsa/DiscoBot/packages.config (renamed from DiscoBot/packages.config)0
-rw-r--r--dsa/DiscoBot/session.json (renamed from DiscoBot/session.json)0
-rw-r--r--dsa/DiscoBot/sessions/TheCrew/TheCrew-0.json (renamed from DiscoBot/sessions/TheCrew/TheCrew-0.json)0
-rw-r--r--dsa/DiscoBot/sessions/copy/copy-0.json (renamed from DiscoBot/sessions/copy/copy-0.json)0
-rw-r--r--dsa/DiscoBot/sessions/test/test-0.json (renamed from DiscoBot/sessions/test/test-0.json)0
-rw-r--r--dsa/DiscoBot/sessions/test/test-1.json (renamed from DiscoBot/sessions/test/test-1.json)0
-rw-r--r--dsa/DiscoBot/sessions/test/test-2.json (renamed from DiscoBot/sessions/test/test-2.json)0
-rw-r--r--dsa/DiscoBot/sessions/test/test-3.json (renamed from DiscoBot/sessions/test/test-3.json)0
-rw-r--r--dsa/DiscoBot/sessions/test/test-4.json (renamed from DiscoBot/sessions/test/test-4.json)0
-rw-r--r--dsa/FireBase/ExceptionEventArgs.cs (renamed from FireBase/ExceptionEventArgs.cs)0
-rw-r--r--dsa/FireBase/Extensions/ObservableExtensions.cs (renamed from FireBase/Extensions/ObservableExtensions.cs)0
-rw-r--r--dsa/FireBase/Extensions/TaskExtensions.cs (renamed from FireBase/Extensions/TaskExtensions.cs)0
-rw-r--r--dsa/FireBase/FireBase.csproj (renamed from FireBase/FireBase.csproj)0
-rw-r--r--dsa/FireBase/FirebaseClient.cs (renamed from FireBase/FirebaseClient.cs)0
-rw-r--r--dsa/FireBase/FirebaseException.cs (renamed from FireBase/FirebaseException.cs)0
-rw-r--r--dsa/FireBase/FirebaseKeyGenerator.cs (renamed from FireBase/FirebaseKeyGenerator.cs)0
-rw-r--r--dsa/FireBase/FirebaseObject.cs (renamed from FireBase/FirebaseObject.cs)0
-rw-r--r--dsa/FireBase/FirebaseOptions.cs (renamed from FireBase/FirebaseOptions.cs)0
-rw-r--r--dsa/FireBase/Http/HttpClientExtensions.cs (renamed from FireBase/Http/HttpClientExtensions.cs)0
-rw-r--r--dsa/FireBase/Http/PostResult.cs (renamed from FireBase/Http/PostResult.cs)0
-rw-r--r--dsa/FireBase/ObservableExtensions.cs (renamed from FireBase/ObservableExtensions.cs)0
-rw-r--r--dsa/FireBase/Offline/ConcurrentOfflineDatabase.cs (renamed from FireBase/Offline/ConcurrentOfflineDatabase.cs)0
-rw-r--r--dsa/FireBase/Offline/DatabaseExtensions.cs (renamed from FireBase/Offline/DatabaseExtensions.cs)0
-rw-r--r--dsa/FireBase/Offline/ISetHandler.cs (renamed from FireBase/Offline/ISetHandler.cs)0
-rw-r--r--dsa/FireBase/Offline/InitialPullStrategy.cs (renamed from FireBase/Offline/InitialPullStrategy.cs)0
-rw-r--r--dsa/FireBase/Offline/Internals/MemberAccessVisitor.cs (renamed from FireBase/Offline/Internals/MemberAccessVisitor.cs)0
-rw-r--r--dsa/FireBase/Offline/OfflineCacheAdapter.cs (renamed from FireBase/Offline/OfflineCacheAdapter.cs)0
-rw-r--r--dsa/FireBase/Offline/OfflineDatabase.cs (renamed from FireBase/Offline/OfflineDatabase.cs)0
-rw-r--r--dsa/FireBase/Offline/OfflineEntry.cs (renamed from FireBase/Offline/OfflineEntry.cs)0
-rw-r--r--dsa/FireBase/Offline/RealtimeDatabase.cs (renamed from FireBase/Offline/RealtimeDatabase.cs)0
-rw-r--r--dsa/FireBase/Offline/SetHandler.cs (renamed from FireBase/Offline/SetHandler.cs)0
-rw-r--r--dsa/FireBase/Offline/StreamingOptions.cs (renamed from FireBase/Offline/StreamingOptions.cs)0
-rw-r--r--dsa/FireBase/Offline/SyncOptions.cs (renamed from FireBase/Offline/SyncOptions.cs)0
-rw-r--r--dsa/FireBase/Query/AuthQuery.cs (renamed from FireBase/Query/AuthQuery.cs)0
-rw-r--r--dsa/FireBase/Query/ChildQuery.cs (renamed from FireBase/Query/ChildQuery.cs)0
-rw-r--r--dsa/FireBase/Query/FilterQuery.cs (renamed from FireBase/Query/FilterQuery.cs)0
-rw-r--r--dsa/FireBase/Query/FirebaseQuery.cs (renamed from FireBase/Query/FirebaseQuery.cs)0
-rw-r--r--dsa/FireBase/Query/IFirebaseQuery.cs (renamed from FireBase/Query/IFirebaseQuery.cs)0
-rw-r--r--dsa/FireBase/Query/OrderQuery.cs (renamed from FireBase/Query/OrderQuery.cs)0
-rw-r--r--dsa/FireBase/Query/ParameterQuery.cs (renamed from FireBase/Query/ParameterQuery.cs)0
-rw-r--r--dsa/FireBase/Query/QueryExtensions.cs (renamed from FireBase/Query/QueryExtensions.cs)0
-rw-r--r--dsa/FireBase/Query/QueryFactoryExtensions.cs (renamed from FireBase/Query/QueryFactoryExtensions.cs)0
-rw-r--r--dsa/FireBase/Query/SilentQuery.cs (renamed from FireBase/Query/SilentQuery.cs)0
-rw-r--r--dsa/FireBase/Settings.StyleCop (renamed from FireBase/Settings.StyleCop)0
-rw-r--r--dsa/FireBase/Streaming/FirebaseCache.cs (renamed from FireBase/Streaming/FirebaseCache.cs)0
-rw-r--r--dsa/FireBase/Streaming/FirebaseEvent.cs (renamed from FireBase/Streaming/FirebaseEvent.cs)0
-rw-r--r--dsa/FireBase/Streaming/FirebaseEventSource.cs (renamed from FireBase/Streaming/FirebaseEventSource.cs)0
-rw-r--r--dsa/FireBase/Streaming/FirebaseEventType.cs (renamed from FireBase/Streaming/FirebaseEventType.cs)0
-rw-r--r--dsa/FireBase/Streaming/FirebaseServerEventType.cs (renamed from FireBase/Streaming/FirebaseServerEventType.cs)0
-rw-r--r--dsa/FireBase/Streaming/FirebaseSubscription.cs (renamed from FireBase/Streaming/FirebaseSubscription.cs)0
-rw-r--r--dsa/FireBase/Streaming/NonBlockingStreamReader.cs (renamed from FireBase/Streaming/NonBlockingStreamReader.cs)0
-rw-r--r--dsa/NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs (renamed from NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs)0
-rw-r--r--dsa/NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs (renamed from NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs)0
-rw-r--r--dsa/NUnitTestProject1/Auxiliary/DiceTests.cs (renamed from NUnitTestProject1/Auxiliary/DiceTests.cs)0
-rw-r--r--dsa/NUnitTestProject1/NUnitTest.csproj (renamed from NUnitTestProject1/NUnitTest.csproj)0
161 files changed, 426 insertions, 19 deletions
diff --git a/DiscoBot.sln b/DiscoBot.sln
index 2016e7e..4cfe904 100644
--- a/DiscoBot.sln
+++ b/DiscoBot.sln
@@ -3,17 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSACore", "DSACore\DSACore.csproj", "{35A5E2CC-0FD4-4BC0-ACBF-38599CAED1C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSACore", "dsa\DSACore\DSACore.csproj", "{35A5E2CC-0FD4-4BC0-ACBF-38599CAED1C4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FireBase", "FireBase\FireBase.csproj", "{87CC30E6-CBEA-4282-A3CC-FD5119A1993B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FireBase", "dsa\FireBase\FireBase.csproj", "{87CC30E6-CBEA-4282-A3CC-FD5119A1993B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSALib", "DSALib\DSALib.csproj", "{C5D9AFDF-70E2-4A47-96FF-1EC47C1DE38D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DSALib", "dsa\DSALib\DSALib.csproj", "{C5D9AFDF-70E2-4A47-96FF-1EC47C1DE38D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordBot", "DiscordBot\DiscordBot.csproj", "{F1418B62-F043-4761-9BDD-AE078B6A99FB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnitTest", "NUnitTestProject1\NUnitTest.csproj", "{CF821E64-B50E-420F-98A2-07315B362ED0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DSA", "DSA", "{2EAC96BE-4273-409B-AE1A-99542E8BAA02}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnitTest", "dsa\NUnitTestProject1\NUnitTest.csproj", "{CF821E64-B50E-420F-98A2-07315B362ED0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -33,10 +29,6 @@ Global
{C5D9AFDF-70E2-4A47-96FF-1EC47C1DE38D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5D9AFDF-70E2-4A47-96FF-1EC47C1DE38D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5D9AFDF-70E2-4A47-96FF-1EC47C1DE38D}.Release|Any CPU.Build.0 = Release|Any CPU
- {F1418B62-F043-4761-9BDD-AE078B6A99FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F1418B62-F043-4761-9BDD-AE078B6A99FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F1418B62-F043-4761-9BDD-AE078B6A99FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F1418B62-F043-4761-9BDD-AE078B6A99FB}.Release|Any CPU.Build.0 = Release|Any CPU
{CF821E64-B50E-420F-98A2-07315B362ED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF821E64-B50E-420F-98A2-07315B362ED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF821E64-B50E-420F-98A2-07315B362ED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -45,13 +37,6 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {35A5E2CC-0FD4-4BC0-ACBF-38599CAED1C4} = {2EAC96BE-4273-409B-AE1A-99542E8BAA02}
- {87CC30E6-CBEA-4282-A3CC-FD5119A1993B} = {2EAC96BE-4273-409B-AE1A-99542E8BAA02}
- {C5D9AFDF-70E2-4A47-96FF-1EC47C1DE38D} = {2EAC96BE-4273-409B-AE1A-99542E8BAA02}
- {F1418B62-F043-4761-9BDD-AE078B6A99FB} = {2EAC96BE-4273-409B-AE1A-99542E8BAA02}
- {CF821E64-B50E-420F-98A2-07315B362ED0} = {2EAC96BE-4273-409B-AE1A-99542E8BAA02}
- EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CADA01A3-B80B-4979-8397-7CB5B825CE34}
EndGlobalSection
diff --git a/DSACore/Controllers/CommandsController.cs b/dsa/DSACore/Controllers/CommandsController.cs
index b6e0be2..b6e0be2 100644
--- a/DSACore/Controllers/CommandsController.cs
+++ b/dsa/DSACore/Controllers/CommandsController.cs
diff --git a/DSACore/Controllers/LobbyController.cs b/dsa/DSACore/Controllers/LobbyController.cs
index 7890b4f..7890b4f 100644
--- a/DSACore/Controllers/LobbyController.cs
+++ b/dsa/DSACore/Controllers/LobbyController.cs
diff --git a/DSACore/Controllers/TokensController.cs b/dsa/DSACore/Controllers/TokensController.cs
index a85cabe..a85cabe 100644
--- a/DSACore/Controllers/TokensController.cs
+++ b/dsa/DSACore/Controllers/TokensController.cs
diff --git a/DSACore/Controllers/ValuesController.cs b/dsa/DSACore/Controllers/ValuesController.cs
index eb08898..eb08898 100644
--- a/DSACore/Controllers/ValuesController.cs
+++ b/dsa/DSACore/Controllers/ValuesController.cs
diff --git a/DSACore/DSACore.csproj b/dsa/DSACore/DSACore.csproj
index f7def31..f7def31 100644
--- a/DSACore/DSACore.csproj
+++ b/dsa/DSACore/DSACore.csproj
diff --git a/DSACore/Hubs/Login.cs b/dsa/DSACore/Hubs/Login.cs
index f08c24a..f08c24a 100644
--- a/DSACore/Hubs/Login.cs
+++ b/dsa/DSACore/Hubs/Login.cs
diff --git a/DSACore/Models/Network/Group.cs b/dsa/DSACore/Models/Network/Group.cs
index efe12ee..efe12ee 100644
--- a/DSACore/Models/Network/Group.cs
+++ b/dsa/DSACore/Models/Network/Group.cs
diff --git a/DSACore/Models/Network/Token.cs b/dsa/DSACore/Models/Network/Token.cs
index 451cafc..451cafc 100644
--- a/DSACore/Models/Network/Token.cs
+++ b/dsa/DSACore/Models/Network/Token.cs
diff --git a/DSACore/Models/Network/User.cs b/dsa/DSACore/Models/Network/User.cs
index 8b8008c..8b8008c 100644
--- a/DSACore/Models/Network/User.cs
+++ b/dsa/DSACore/Models/Network/User.cs
diff --git a/DSACore/Program.cs b/dsa/DSACore/Program.cs
index 8af0a74..8af0a74 100644
--- a/DSACore/Program.cs
+++ b/dsa/DSACore/Program.cs
diff --git a/DSACore/Properties/DSALib-Auxiliary-CommandInfo.json b/dsa/DSACore/Properties/DSALib-Auxiliary-CommandInfo.json
index b9941f2..b9941f2 100644
--- a/DSACore/Properties/DSALib-Auxiliary-CommandInfo.json
+++ b/dsa/DSACore/Properties/DSALib-Auxiliary-CommandInfo.json
diff --git a/DSACore/Properties/DSALib-DSA_Game-Characters-Character.json b/dsa/DSACore/Properties/DSALib-DSA_Game-Characters-Character.json
index fd387f5..fd387f5 100644
--- a/DSACore/Properties/DSALib-DSA_Game-Characters-Character.json
+++ b/dsa/DSACore/Properties/DSALib-DSA_Game-Characters-Character.json
diff --git a/DSACore/Properties/PublishProfiles/FolderProfile.pubxml b/dsa/DSACore/Properties/PublishProfiles/FolderProfile.pubxml
index 2fd07c5..2fd07c5 100644
--- a/DSACore/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/dsa/DSACore/Properties/PublishProfiles/FolderProfile.pubxml
diff --git a/DSACore/Properties/PublishProfiles/FolderProfile1.pubxml b/dsa/DSACore/Properties/PublishProfiles/FolderProfile1.pubxml
index e03b55a..e03b55a 100644
--- a/DSACore/Properties/PublishProfiles/FolderProfile1.pubxml
+++ b/dsa/DSACore/Properties/PublishProfiles/FolderProfile1.pubxml
diff --git a/DSACore/Properties/launchSettings.json b/dsa/DSACore/Properties/launchSettings.json
index 2da5fec..2da5fec 100644
--- a/DSACore/Properties/launchSettings.json
+++ b/dsa/DSACore/Properties/launchSettings.json
diff --git a/DSALib/Properties-DSACore-Auxiliary-CommandInfo.json b/dsa/DSACore/PropertiesDSALib-Auxiliary-CommandInfo.json
index b9941f2..b9941f2 100644
--- a/DSALib/Properties-DSACore-Auxiliary-CommandInfo.json
+++ b/dsa/DSACore/PropertiesDSALib-Auxiliary-CommandInfo.json
diff --git a/DSALib/Properties-DSACore-DSA_Game-Characters-Character.json b/dsa/DSACore/PropertiesDSALib-DSA_Game-Characters-Character.json
index fd387f5..fd387f5 100644
--- a/DSALib/Properties-DSACore-DSA_Game-Characters-Character.json
+++ b/dsa/DSACore/PropertiesDSALib-DSA_Game-Characters-Character.json
diff --git a/dsa/DSACore/PropertiesNewtonsoft-Json-Linq-JProperty.json b/dsa/DSACore/PropertiesNewtonsoft-Json-Linq-JProperty.json
new file mode 100644
index 0000000..0ed0f48
--- /dev/null
+++ b/dsa/DSACore/PropertiesNewtonsoft-Json-Linq-JProperty.json
@@ -0,0 +1,30 @@
+{
+ "$schema": "http://json.schemastore.org/launchsettings.json",
+ "iisSettings": {
+ "windowsAuthentication": false,
+ "anonymousAuthentication": true,
+ "iisExpress": {
+ "applicationUrl": "http://localhost:2170",
+ "sslPort": 44365
+ }
+ },
+ "profiles": {
+ "IIS Express": {
+ "commandName": "IISExpress",
+ "launchBrowser": true,
+ "launchUrl": "api/commands",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ },
+ "DSACore": {
+ "commandName": "Project",
+ "launchBrowser": true,
+ "launchUrl": "api/commands",
+ "applicationUrl": "https://0.0.0.0:5001;http://0.0.0.0:5000",
+ "environmentVariables": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/DSACore/Startup.cs b/dsa/DSACore/Startup.cs
index ef22802..ef22802 100644
--- a/DSACore/Startup.cs
+++ b/dsa/DSACore/Startup.cs
diff --git a/dsa/DSACore/Token b/dsa/DSACore/Token
new file mode 100644
index 0000000..eb02248
--- /dev/null
+++ b/dsa/DSACore/Token
@@ -0,0 +1 @@
+fBhKAyCEJlqqU1l6gS1LNWwEZByQ23oAWbvtXXB5 \ No newline at end of file
diff --git a/DSACore/appsettings.Development.json b/dsa/DSACore/appsettings.Development.json
index e203e94..e203e94 100644
--- a/DSACore/appsettings.Development.json
+++ b/dsa/DSACore/appsettings.Development.json
diff --git a/DSACore/appsettings.json b/dsa/DSACore/appsettings.json
index dee968c..dee968c 100644
--- a/DSACore/appsettings.json
+++ b/dsa/DSACore/appsettings.json
diff --git a/DSALib/Auxiliary/Calculator/Argument.cs b/dsa/DSALib/Auxiliary/Calculator/Argument.cs
index e681377..e681377 100644
--- a/DSALib/Auxiliary/Calculator/Argument.cs
+++ b/dsa/DSALib/Auxiliary/Calculator/Argument.cs
diff --git a/DSALib/Auxiliary/Calculator/ISolvable.cs b/dsa/DSALib/Auxiliary/Calculator/ISolvable.cs
index 844e9b3..844e9b3 100644
--- a/DSALib/Auxiliary/Calculator/ISolvable.cs
+++ b/dsa/DSALib/Auxiliary/Calculator/ISolvable.cs
diff --git a/DSALib/Auxiliary/Calculator/Operator.cs b/dsa/DSALib/Auxiliary/Calculator/Operator.cs
index e6aeec6..e6aeec6 100644
--- a/DSALib/Auxiliary/Calculator/Operator.cs
+++ b/dsa/DSALib/Auxiliary/Calculator/Operator.cs
diff --git a/DSALib/Auxiliary/Calculator/Ops.cs b/dsa/DSALib/Auxiliary/Calculator/Ops.cs
index 93046d0..93046d0 100644
--- a/DSALib/Auxiliary/Calculator/Ops.cs
+++ b/dsa/DSALib/Auxiliary/Calculator/Ops.cs
diff --git a/DSALib/Auxiliary/Calculator/StringSolver.cs b/dsa/DSALib/Auxiliary/Calculator/StringSolver.cs
index 45d6a54..45d6a54 100644
--- a/DSALib/Auxiliary/Calculator/StringSolver.cs
+++ b/dsa/DSALib/Auxiliary/Calculator/StringSolver.cs
diff --git a/DSALib/Auxiliary/CommandInfo.cs b/dsa/DSALib/Auxiliary/CommandInfo.cs
index d8e2188..d8e2188 100644
--- a/DSALib/Auxiliary/CommandInfo.cs
+++ b/dsa/DSALib/Auxiliary/CommandInfo.cs
diff --git a/DSALib/Auxiliary/Dice.cs b/dsa/DSALib/Auxiliary/Dice.cs
index 0bfabeb..0bfabeb 100644
--- a/DSALib/Auxiliary/Dice.cs
+++ b/dsa/DSALib/Auxiliary/Dice.cs
diff --git a/DSALib/Auxiliary/Extensions.cs b/dsa/DSALib/Auxiliary/Extensions.cs
index 7d367a5..7d367a5 100644
--- a/DSALib/Auxiliary/Extensions.cs
+++ b/dsa/DSALib/Auxiliary/Extensions.cs
diff --git a/DSALib/Auxiliary/IDataObjectEnumerableExtension.cs b/dsa/DSALib/Auxiliary/IDataObjectEnumerableExtension.cs
index b8a6067..b8a6067 100644
--- a/DSALib/Auxiliary/IDataObjectEnumerableExtension.cs
+++ b/dsa/DSALib/Auxiliary/IDataObjectEnumerableExtension.cs
diff --git a/DSALib/Auxiliary/RandomMisc.cs b/dsa/DSALib/Auxiliary/RandomMisc.cs
index 2723930..2723930 100644
--- a/DSALib/Auxiliary/RandomMisc.cs
+++ b/dsa/DSALib/Auxiliary/RandomMisc.cs
diff --git a/DSALib/Auxiliary/SpellCorrect.cs b/dsa/DSALib/Auxiliary/SpellCorrect.cs
index 79908c4..79908c4 100644
--- a/DSALib/Auxiliary/SpellCorrect.cs
+++ b/dsa/DSALib/Auxiliary/SpellCorrect.cs
diff --git a/DSALib/Auxiliary/TalentEnumerableExtension.cs b/dsa/DSALib/Auxiliary/TalentEnumerableExtension.cs
index 6ec7fcc..6ec7fcc 100644
--- a/DSALib/Auxiliary/TalentEnumerableExtension.cs
+++ b/dsa/DSALib/Auxiliary/TalentEnumerableExtension.cs
diff --git a/DSALib/Auxiliary/WeaponImporter.cs b/dsa/DSALib/Auxiliary/WeaponImporter.cs
index 61eb33e..61eb33e 100644
--- a/DSALib/Auxiliary/WeaponImporter.cs
+++ b/dsa/DSALib/Auxiliary/WeaponImporter.cs
diff --git a/DSALib/Characters/Being.cs b/dsa/DSALib/Characters/Being.cs
index 27879a1..27879a1 100644
--- a/DSALib/Characters/Being.cs
+++ b/dsa/DSALib/Characters/Being.cs
diff --git a/DSALib/Characters/Critter.cs b/dsa/DSALib/Characters/Critter.cs
index dcedccb..dcedccb 100644
--- a/DSALib/Characters/Critter.cs
+++ b/dsa/DSALib/Characters/Critter.cs
diff --git a/DSALib/Characters/Entity.cs b/dsa/DSALib/Characters/Entity.cs
index a8a5e81..a8a5e81 100644
--- a/DSALib/Characters/Entity.cs
+++ b/dsa/DSALib/Characters/Entity.cs
diff --git a/DSALib/Characters/ICharacter.cs b/dsa/DSALib/Characters/ICharacter.cs
index 256fecd..256fecd 100644
--- a/DSALib/Characters/ICharacter.cs
+++ b/dsa/DSALib/Characters/ICharacter.cs
diff --git a/DSALib/Characters/ICombatant.cs b/dsa/DSALib/Characters/ICombatant.cs
index a4ce601..a4ce601 100644
--- a/DSALib/Characters/ICombatant.cs
+++ b/dsa/DSALib/Characters/ICombatant.cs
diff --git a/DSALib/Commands/CommandHandler.cs b/dsa/DSALib/Commands/CommandHandler.cs
index e63d7b8..e63d7b8 100644
--- a/DSALib/Commands/CommandHandler.cs
+++ b/dsa/DSALib/Commands/CommandHandler.cs
diff --git a/DSALib/Commands/CommandTypes.cs b/dsa/DSALib/Commands/CommandTypes.cs
index 62b8b0f..62b8b0f 100644
--- a/DSALib/Commands/CommandTypes.cs
+++ b/dsa/DSALib/Commands/CommandTypes.cs
diff --git a/DSALib/Commands/FileHandler.cs b/dsa/DSALib/Commands/FileHandler.cs
index d117040..d117040 100644
--- a/DSALib/Commands/FileHandler.cs
+++ b/dsa/DSALib/Commands/FileHandler.cs
diff --git a/DSALib/Commands/Gm.cs b/dsa/DSALib/Commands/Gm.cs
index 74fd673..74fd673 100644
--- a/DSALib/Commands/Gm.cs
+++ b/dsa/DSALib/Commands/Gm.cs
diff --git a/DSALib/Commands/HeldList.cs b/dsa/DSALib/Commands/HeldList.cs
index ef29a14..ef29a14 100644
--- a/DSALib/Commands/HeldList.cs
+++ b/dsa/DSALib/Commands/HeldList.cs
diff --git a/DSALib/Commands/Help.cs b/dsa/DSALib/Commands/Help.cs
index 4506821..4506821 100644
--- a/DSALib/Commands/Help.cs
+++ b/dsa/DSALib/Commands/Help.cs
diff --git a/DSALib/Commands/LebenUndAstral.cs b/dsa/DSALib/Commands/LebenUndAstral.cs
index ac11c91..ac11c91 100644
--- a/DSALib/Commands/LebenUndAstral.cs
+++ b/dsa/DSALib/Commands/LebenUndAstral.cs
diff --git a/DSALib/Commands/List.cs b/dsa/DSALib/Commands/List.cs
index 1213f85..1213f85 100644
--- a/DSALib/Commands/List.cs
+++ b/dsa/DSALib/Commands/List.cs
diff --git a/DSALib/Commands/MiscCommands.cs b/dsa/DSALib/Commands/MiscCommands.cs
index 69b2ffe..69b2ffe 100644
--- a/DSALib/Commands/MiscCommands.cs
+++ b/dsa/DSALib/Commands/MiscCommands.cs
diff --git a/DSALib/Commands/NpcCommands.cs b/dsa/DSALib/Commands/NpcCommands.cs
index 510b78b..510b78b 100644
--- a/DSALib/Commands/NpcCommands.cs
+++ b/dsa/DSALib/Commands/NpcCommands.cs
diff --git a/DSALib/Commands/ProbenTest.cs b/dsa/DSALib/Commands/ProbenTest.cs
index 7c88480..7c88480 100644
--- a/DSALib/Commands/ProbenTest.cs
+++ b/dsa/DSALib/Commands/ProbenTest.cs
diff --git a/DSALib/DSALib.csproj b/dsa/DSALib/DSALib.csproj
index 2281bd6..2281bd6 100644
--- a/DSALib/DSALib.csproj
+++ b/dsa/DSALib/DSALib.csproj
diff --git a/DSALib/DSA_Game/Characters/Character.cs b/dsa/DSALib/DSA_Game/Characters/Character.cs
index aea5671..aea5671 100644
--- a/DSALib/DSA_Game/Characters/Character.cs
+++ b/dsa/DSALib/DSA_Game/Characters/Character.cs
diff --git a/DSALib/DSA_Game/Characters/NPC.cs b/dsa/DSALib/DSA_Game/Characters/NPC.cs
index 105adda..105adda 100644
--- a/DSALib/DSA_Game/Characters/NPC.cs
+++ b/dsa/DSALib/DSA_Game/Characters/NPC.cs
diff --git a/DSALib/DSA_Game/Characters/SaveChar.cs b/dsa/DSALib/DSA_Game/Characters/SaveChar.cs
index 00e2f86..00e2f86 100644
--- a/DSALib/DSA_Game/Characters/SaveChar.cs
+++ b/dsa/DSALib/DSA_Game/Characters/SaveChar.cs
diff --git a/DSALib/DSA_Game/Dsa.cs b/dsa/DSALib/DSA_Game/Dsa.cs
index bcd8951..bcd8951 100644
--- a/DSALib/DSA_Game/Dsa.cs
+++ b/dsa/DSALib/DSA_Game/Dsa.cs
diff --git a/DSALib/DSA_Game/Save/Properties.cs b/dsa/DSALib/DSA_Game/Save/Properties.cs
index 2312af0..2312af0 100644
--- a/DSALib/DSA_Game/Save/Properties.cs
+++ b/dsa/DSALib/DSA_Game/Save/Properties.cs
diff --git a/DSALib/DSA_Game/Save/SaveCommand.cs b/dsa/DSALib/DSA_Game/Save/SaveCommand.cs
index c5a1bb4..c5a1bb4 100644
--- a/DSALib/DSA_Game/Save/SaveCommand.cs
+++ b/dsa/DSALib/DSA_Game/Save/SaveCommand.cs
diff --git a/DSALib/DSA_Game/Save/Session.cs b/dsa/DSALib/DSA_Game/Save/Session.cs
index 62aa8f6..62aa8f6 100644
--- a/DSALib/DSA_Game/Save/Session.cs
+++ b/dsa/DSALib/DSA_Game/Save/Session.cs
diff --git a/DSALib/FireBase/Database.cs b/dsa/DSALib/FireBase/Database.cs
index 1edd699..1edd699 100644
--- a/DSALib/FireBase/Database.cs
+++ b/dsa/DSALib/FireBase/Database.cs
diff --git a/DSALib/Models/Database/DataObject.cs b/dsa/DSALib/Models/Database/DataObject.cs
index 59cfdf2..59cfdf2 100644
--- a/DSALib/Models/Database/DataObject.cs
+++ b/dsa/DSALib/Models/Database/DataObject.cs
diff --git a/DSALib/Models/Database/DSA/Advantage.cs b/dsa/DSALib/Models/Database/Dsa/Advantage.cs
index 2ed0bf9..2ed0bf9 100644
--- a/DSALib/Models/Database/DSA/Advantage.cs
+++ b/dsa/DSALib/Models/Database/Dsa/Advantage.cs
diff --git a/DSALib/Models/Database/DSA/CharSpell.cs b/dsa/DSALib/Models/Database/Dsa/CharSpell.cs
index d08bc74..d08bc74 100644
--- a/DSALib/Models/Database/DSA/CharSpell.cs
+++ b/dsa/DSALib/Models/Database/Dsa/CharSpell.cs
diff --git a/DSALib/Models/Database/DSA/DatabaseChar.cs b/dsa/DSALib/Models/Database/Dsa/DatabaseChar.cs
index 1312f95..1312f95 100644
--- a/DSALib/Models/Database/DSA/DatabaseChar.cs
+++ b/dsa/DSALib/Models/Database/Dsa/DatabaseChar.cs
diff --git a/DSALib/Models/Database/DSA/Field.cs b/dsa/DSALib/Models/Database/Dsa/Field.cs
index 6d1b82e..6d1b82e 100644
--- a/DSALib/Models/Database/DSA/Field.cs
+++ b/dsa/DSALib/Models/Database/Dsa/Field.cs
diff --git a/DSALib/Models/Database/DSA/GeneralSpell.cs b/dsa/DSALib/Models/Database/Dsa/GeneralSpell.cs
index 964c38e..964c38e 100644
--- a/DSALib/Models/Database/DSA/GeneralSpell.cs
+++ b/dsa/DSALib/Models/Database/Dsa/GeneralSpell.cs
diff --git a/DSALib/Models/Database/DSA/GroupChar.cs b/dsa/DSALib/Models/Database/Dsa/GroupChar.cs
index a0115cd..a0115cd 100644
--- a/DSALib/Models/Database/DSA/GroupChar.cs
+++ b/dsa/DSALib/Models/Database/Dsa/GroupChar.cs
diff --git a/DSALib/Models/Database/DSA/Inventory.cs b/dsa/DSALib/Models/Database/Dsa/Inventory.cs
index f3f5d7a..f3f5d7a 100644
--- a/DSALib/Models/Database/DSA/Inventory.cs
+++ b/dsa/DSALib/Models/Database/Dsa/Inventory.cs
diff --git a/DSALib/Models/Database/DSA/Talent.cs b/dsa/DSALib/Models/Database/Dsa/Talent.cs
index 214aecc..214aecc 100644
--- a/DSALib/Models/Database/DSA/Talent.cs
+++ b/dsa/DSALib/Models/Database/Dsa/Talent.cs
diff --git a/DSALib/Models/Database/DSA/Weapon.cs b/dsa/DSALib/Models/Database/Dsa/Weapon.cs
index 308c6c5..308c6c5 100644
--- a/DSALib/Models/Database/DSA/Weapon.cs
+++ b/dsa/DSALib/Models/Database/Dsa/Weapon.cs
diff --git a/DSALib/Models/Database/DSA/WeaponTalent.cs b/dsa/DSALib/Models/Database/Dsa/WeaponTalent.cs
index 2ab921b..2ab921b 100644
--- a/DSALib/Models/Database/DSA/WeaponTalent.cs
+++ b/dsa/DSALib/Models/Database/Dsa/WeaponTalent.cs
diff --git a/DSALib/Models/Database/Groups/DSAGroup.cs b/dsa/DSALib/Models/Database/Groups/DSAGroup.cs
index adbd0ac..adbd0ac 100644
--- a/DSALib/Models/Database/Groups/DSAGroup.cs
+++ b/dsa/DSALib/Models/Database/Groups/DSAGroup.cs
diff --git a/DSALib/Models/Database/Groups/Group.cs b/dsa/DSALib/Models/Database/Groups/Group.cs
index 096f2be..096f2be 100644
--- a/DSALib/Models/Database/Groups/Group.cs
+++ b/dsa/DSALib/Models/Database/Groups/Group.cs
diff --git a/DSALib/Models/Database/IDataObject.cs b/dsa/DSALib/Models/Database/IDataObject.cs
index bdc88b7..bdc88b7 100644
--- a/DSALib/Models/Database/IDataObject.cs
+++ b/dsa/DSALib/Models/Database/IDataObject.cs
diff --git a/DSALib/Models/Dsa/CritterAttack.cs b/dsa/DSALib/Models/Dsa/CritterAttack.cs
index 8cd8b09..8cd8b09 100644
--- a/DSALib/Models/Dsa/CritterAttack.cs
+++ b/dsa/DSALib/Models/Dsa/CritterAttack.cs
diff --git a/DSALib/Models/Dsa/KampfTalent.cs b/dsa/DSALib/Models/Dsa/KampfTalent.cs
index 51ad255..51ad255 100644
--- a/DSALib/Models/Dsa/KampfTalent.cs
+++ b/dsa/DSALib/Models/Dsa/KampfTalent.cs
diff --git a/DSALib/Models/Dsa/Talent.cs b/dsa/DSALib/Models/Dsa/Talent.cs
index 5771a74..5771a74 100644
--- a/DSALib/Models/Dsa/Talent.cs
+++ b/dsa/DSALib/Models/Dsa/Talent.cs
diff --git a/DSALib/Models/Dsa/Vorteil.cs b/dsa/DSALib/Models/Dsa/Vorteil.cs
index e37af20..e37af20 100644
--- a/DSALib/Models/Dsa/Vorteil.cs
+++ b/dsa/DSALib/Models/Dsa/Vorteil.cs
diff --git a/DSALib/Models/Dsa/Zauber.cs b/dsa/DSALib/Models/Dsa/Zauber.cs
index e4387bf..e4387bf 100644
--- a/DSALib/Models/Dsa/Zauber.cs
+++ b/dsa/DSALib/Models/Dsa/Zauber.cs
diff --git a/DSALib/Models/Network/Command.cs b/dsa/DSALib/Models/Network/Command.cs
index 5a97e88..5a97e88 100644
--- a/DSALib/Models/Network/Command.cs
+++ b/dsa/DSALib/Models/Network/Command.cs
diff --git a/DSALib/Models/Network/CommandResponse.cs b/dsa/DSALib/Models/Network/CommandResponse.cs
index 0816e4a..0816e4a 100644
--- a/DSALib/Models/Network/CommandResponse.cs
+++ b/dsa/DSALib/Models/Network/CommandResponse.cs
diff --git a/DiscoBot/Properties/DiscoBot-Auxiliary-CommandInfo.json b/dsa/DSALib/Properties-DSACore-Auxiliary-CommandInfo.json
index b9941f2..b9941f2 100644
--- a/DiscoBot/Properties/DiscoBot-Auxiliary-CommandInfo.json
+++ b/dsa/DSALib/Properties-DSACore-Auxiliary-CommandInfo.json
diff --git a/DiscoBot/Properties/DiscoBot-DSA_Game-Characters-Character.json b/dsa/DSALib/Properties-DSACore-DSA_Game-Characters-Character.json
index fd387f5..fd387f5 100644
--- a/DiscoBot/Properties/DiscoBot-DSA_Game-Characters-Character.json
+++ b/dsa/DSALib/Properties-DSACore-DSA_Game-Characters-Character.json
diff --git a/DSALib/PropertiesNewtonsoft-Json-Linq-JProperty.json b/dsa/DSALib/PropertiesNewtonsoft-Json-Linq-JProperty.json
index 2544397..2544397 100644
--- a/DSALib/PropertiesNewtonsoft-Json-Linq-JProperty.json
+++ b/dsa/DSALib/PropertiesNewtonsoft-Json-Linq-JProperty.json
diff --git a/DiscoBot/App.config b/dsa/DiscoBot/App.config
index c862b4e..c862b4e 100644
--- a/DiscoBot/App.config
+++ b/dsa/DiscoBot/App.config
diff --git a/DiscoBot/Auxiliary/CommandExtension.cs b/dsa/DiscoBot/Auxiliary/CommandExtension.cs
index ad9f323..ad9f323 100644
--- a/DiscoBot/Auxiliary/CommandExtension.cs
+++ b/dsa/DiscoBot/Auxiliary/CommandExtension.cs
diff --git a/DiscoBot/Auxiliary/Dice.cs b/dsa/DiscoBot/Auxiliary/Dice.cs
index f0f4def..f0f4def 100644
--- a/DiscoBot/Auxiliary/Dice.cs
+++ b/dsa/DiscoBot/Auxiliary/Dice.cs
diff --git a/DiscoBot/Auxiliary/Permissions.cs b/dsa/DiscoBot/Auxiliary/Permissions.cs
index 3ec4a2e..3ec4a2e 100644
--- a/DiscoBot/Auxiliary/Permissions.cs
+++ b/dsa/DiscoBot/Auxiliary/Permissions.cs
diff --git a/DiscoBot/Auxiliary/RandomMisc.cs b/dsa/DiscoBot/Auxiliary/RandomMisc.cs
index 205b3a7..205b3a7 100644
--- a/DiscoBot/Auxiliary/RandomMisc.cs
+++ b/dsa/DiscoBot/Auxiliary/RandomMisc.cs
diff --git a/DiscoBot/Auxiliary/SpellCorrect.cs b/dsa/DiscoBot/Auxiliary/SpellCorrect.cs
index c4bd4bf..c4bd4bf 100644
--- a/DiscoBot/Auxiliary/SpellCorrect.cs
+++ b/dsa/DiscoBot/Auxiliary/SpellCorrect.cs
diff --git a/DiscoBot/Commands/CommandExtension.cs b/dsa/DiscoBot/Commands/CommandExtension.cs
index 098e35f..098e35f 100644
--- a/DiscoBot/Commands/CommandExtension.cs
+++ b/dsa/DiscoBot/Commands/CommandExtension.cs
diff --git a/DiscoBot/Commands/FileHandler.cs b/dsa/DiscoBot/Commands/FileHandler.cs
index 4f8a785..4f8a785 100644
--- a/DiscoBot/Commands/FileHandler.cs
+++ b/dsa/DiscoBot/Commands/FileHandler.cs
diff --git a/DiscoBot/Commands/MiscCommands.cs b/dsa/DiscoBot/Commands/MiscCommands.cs
index 738796c..738796c 100644
--- a/DiscoBot/Commands/MiscCommands.cs
+++ b/dsa/DiscoBot/Commands/MiscCommands.cs
diff --git a/DiscoBot/DiscoBot.csproj b/dsa/DiscoBot/DiscoBot.csproj
index 09f4cfd..09f4cfd 100644
--- a/DiscoBot/DiscoBot.csproj
+++ b/dsa/DiscoBot/DiscoBot.csproj
diff --git a/DiscoBot/Help.json b/dsa/DiscoBot/Help.json
index 44ce054..44ce054 100644
--- a/DiscoBot/Help.json
+++ b/dsa/DiscoBot/Help.json
diff --git a/DiscoBot/Program.cs b/dsa/DiscoBot/Program.cs
index 4314a8d..4314a8d 100644
--- a/DiscoBot/Program.cs
+++ b/dsa/DiscoBot/Program.cs
diff --git a/DiscoBot/Properties.json b/dsa/DiscoBot/Properties.json
index 8808dbf..8808dbf 100644
--- a/DiscoBot/Properties.json
+++ b/dsa/DiscoBot/Properties.json
diff --git a/DiscoBot/Properties/AssemblyInfo.cs b/dsa/DiscoBot/Properties/AssemblyInfo.cs
index b0c2901..b0c2901 100644
--- a/DiscoBot/Properties/AssemblyInfo.cs
+++ b/dsa/DiscoBot/Properties/AssemblyInfo.cs
diff --git a/DiscoBot/Properties/DiscoBot-Audio-Sound.json b/dsa/DiscoBot/Properties/DiscoBot-Audio-Sound.json
index 87a0e6b..87a0e6b 100644
--- a/DiscoBot/Properties/DiscoBot-Audio-Sound.json
+++ b/dsa/DiscoBot/Properties/DiscoBot-Audio-Sound.json
diff --git a/dsa/DiscoBot/Properties/DiscoBot-Auxiliary-CommandInfo.json b/dsa/DiscoBot/Properties/DiscoBot-Auxiliary-CommandInfo.json
new file mode 100644
index 0000000..b9941f2
--- /dev/null
+++ b/dsa/DiscoBot/Properties/DiscoBot-Auxiliary-CommandInfo.json
@@ -0,0 +1,101 @@
+[
+ {
+ "Name": "ich bin",
+ "Scope": "All",
+ "Brief": "Setzt den gespielten Charakter fest",
+ "Description": [
+ "Mit \"!Ich bin\" kann der gespielte Charakter definiert, bzw. gewechselt werden.\n",
+ " Die Charaktere müssen als *.xml Dateien hinterlegt sein.\n\n",
+ " !ich Zeigt an welcher Charakter zur Zeit gespielt wird\n",
+ " !ich bin Zalibius Wechsel zum Helden Zalibius\n",
+ " !ich Rhoktar Orkische Variante von !ich bin.\n",
+ " Wechselt zu Rhoktar.\n\n",
+ " !list chars Zeigt die Liste verfügbarer Charaktere.\n",
+ " \n"
+ ]
+ },
+ {
+ "Name": "List",
+ "Scope": "All",
+ "Brief": "Anzeige vonSpielrelevanten Listen",
+ "Description": [
+ "Mit \"!list\" lassen sich spielrelevante Listen ausgeben. Die Angezeigte Liste wird nach einiger Zeit wieder gelöscht.\n",
+ "\n",
+ " !list chars Liste aller verfügbaren Helden (eingelesen per *.xml)\n",
+ " und NSCs.\n",
+ " (Mit \"!ich bin\" kann der Held ausgewählt werden.)\n",
+ " !list commands Liste aller verwendbaren Bot-Kommandos.\n",
+ " !list sounds Liste der Soundeffekte."
+ ]
+ },
+ {
+ "Name": "Held",
+ "Scope": "All",
+ "Brief": "Anzeige von Heldenwerten",
+ "Description": [
+ "Mit \"!Held\" lassen sich Heldenwerte ausgeben. Mehrere Werte können gleichzeitig angefordert werde. \"!Held LE Waffen\" liefert so z.B. Informationen zur Lebensenergie und den Kampfwerten.\n Bis auf wenige Ausnahmen wird die Angezeigte Liste nach einiger Zeit wieder gelöscht.\n",
+ "\n",
+ " !Held Zeigt den Heldenbrief an.\n",
+ " (Diese Liste wird nicht automatisch gelöscht)\n",
+ " !Held Eigenschaften Zeigt die Eigenschaften MU/KL/CH/IN/KK/GE/FF/KO.\n",
+ " !Held e Kurzform von \"!Held Eigenschaften\".\n",
+ " !Held LE Zeigt LE an.\n",
+ " !Held AE Zeigt AE an.\n",
+ " !Held stats Zeigt Eigenschaften und zusätzlich SO/LE/AE.\n",
+ " !Held Kampfwerte Zeigt AT/PA für aktivierte Waffentalente.\n",
+ " !Held Waffe/!list w Kurzformen von \"!Held Kampfwerte\".\n",
+ " !Held Vorteile Zeigt Vor- und Nachteile an.\n",
+ " !Held v Kurzform von \"!Held Vorteile\".\n",
+ " !Held Talente Zeigt die Liste aller aktivierten Talente, deren TaW,\n",
+ " sowie die Probe.\n",
+ " !Held t Kurzform von \"!Held Talente\".\n",
+ " !Held Zauber Zeigt die Liste aller aktivierten Zauber, deren ZaW,\n",
+ " sowie die Probe.\n",
+ " !Held z Kurzform von \"!Held Zauber\".\n"
+ ]
+ },
+ {
+ "Name": "LE",
+ "Scope": "All",
+ "Brief": "Ändert dein Leben - im wahrsten Sinne des Wortes",
+ "Description": [
+ "Mit !LE zeigt man die Lebensenergie an, ändert sie, oder setzt sie auf einen neuen Wert\n\n",
+ " !LE Zeigt Lebensenergie an\n",
+ " !LE 30 Setzt LE auf 30\n",
+ " !LE +5 Erhöht LE um 5 (bis zum Maximum)\n",
+ " !LE ++5 Erhöht LE um 5 (ignoriert Maximum)\n",
+ " !LE -5 Verringert LE um 5\n \n"
+ ]
+ },
+ {
+ "Name": "AE",
+ "Scope": "All",
+ "Brief": "Ändert Astralenergie",
+ "Description": [
+ "Mit !AE (oder !Asp) zeigt man die Astralenergie an, ändert sie, oder setzt sie auf einen neuen Wert\n\n",
+ " !AE Zeigt Astralenergie an\n",
+ " !AE 30 Setzt Asp auf 30\n",
+ " !AE +5 Erhöht Asp um 5 (bis zum Maximum)\n",
+ " !AE ++5 Erhöht Asp um 5 (ignoriert Maximum)\n",
+ " !AE -5 Verringert Asp um 5 (Minimum 0)\n"
+ ]
+ },
+ {
+ "Name": "Gm",
+ "Scope": "Meister",
+ "Brief": "Kontrolliere andere Charaktere",
+ "Description": [
+ "Mit !GM fürhrt man commands als eine andere Person aus.",
+ " !GM [charaktername] [command] [commandattribut] [mofifier]",
+ " Unterstützte [commands]'s:",
+ " !GM [name] LE",
+ " !GM [name] AE",
+ " !GM [name] Talent",
+ " !GM [name] Fernkampf",
+ " !GM [name] Eigenschaft",
+ " !GM [name] Zauber",
+ " !GM [name] Angriff",
+ " !GM [name] Parade"
+ ]
+ }
+] \ No newline at end of file
diff --git a/dsa/DiscoBot/Properties/DiscoBot-DSA_Game-Characters-Character.json b/dsa/DiscoBot/Properties/DiscoBot-DSA_Game-Characters-Character.json
new file mode 100644
index 0000000..fd387f5
--- /dev/null
+++ b/dsa/DiscoBot/Properties/DiscoBot-DSA_Game-Characters-Character.json
@@ -0,0 +1,290 @@
+[
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 30,
+ "Lebenspunkte_Aktuell": 30,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 20,
+ "Astralpunkte_Aktuell": 20,
+ "Name": "Felis Exodus Schattenwald"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 29,
+ "Lebenspunkte_Aktuell": 29,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 0,
+ "Astralpunkte_Aktuell": 0,
+ "Name": "Gardist"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 31,
+ "Lebenspunkte_Aktuell": 31,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 0,
+ "Astralpunkte_Aktuell": 0,
+ "Name": "Hartmut Reiher"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 21,
+ "Lebenspunkte_Aktuell": 21,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 35,
+ "Astralpunkte_Aktuell": 35,
+ "Name": "Helga vom Drachenei, Tausendsasserin"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 25,
+ "Lebenspunkte_Aktuell": 25,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 0,
+ "Astralpunkte_Aktuell": 0,
+ "Name": "Krenko"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 39,
+ "Lebenspunkte_Aktuell": 39,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 0,
+ "Astralpunkte_Aktuell": 0,
+ "Name": "Ledur Torfinson"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 26,
+ "Lebenspunkte_Aktuell": 26,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 13,
+ "Astralpunkte_Aktuell": 13,
+ "Name": "Morla"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 28,
+ "Lebenspunkte_Aktuell": 28,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 40,
+ "Astralpunkte_Aktuell": 40,
+ "Name": "Numeri Illuminus"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 39,
+ "Lebenspunkte_Aktuell": 39,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 16,
+ "Astralpunkte_Aktuell": 16,
+ "Name": "Potus"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 18,
+ "Lebenspunkte_Aktuell": 18,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 13,
+ "Astralpunkte_Aktuell": 13,
+ "Name": "Pump aus der Gosse"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 34,
+ "Lebenspunkte_Aktuell": 34,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 17,
+ "Astralpunkte_Aktuell": 17,
+ "Name": "Rhoktar4"
+ },
+ {
+ "Eigenschaften": {},
+ "Talente": [],
+ "Zauber": [],
+ "Kampftalente": [],
+ "Vorteile": [],
+ "PropTable": {
+ "MU": "Mut",
+ "KL": "Klugheit",
+ "IN": "Intuition",
+ "CH": "Charisma",
+ "FF": "Fingerfertigkeit",
+ "GE": "Gewandtheit",
+ "KO": "Konstitution",
+ "KK": "Körperkraft"
+ },
+ "Lebenspunkte_Basis": 28,
+ "Lebenspunkte_Aktuell": 28,
+ "Ausdauer_Basis": 0,
+ "Ausdauer_Aktuell": 0,
+ "Astralpunkte_Basis": 43,
+ "Astralpunkte_Aktuell": 43,
+ "Name": "Volant"
+ }
+] \ No newline at end of file
diff --git a/DiscoBot/Properties/Settings.Designer.cs b/dsa/DiscoBot/Properties/Settings.Designer.cs
index f80dfa5..f80dfa5 100644
--- a/DiscoBot/Properties/Settings.Designer.cs
+++ b/dsa/DiscoBot/Properties/Settings.Designer.cs
diff --git a/DiscoBot/Properties/Settings.settings b/dsa/DiscoBot/Properties/Settings.settings
index f3be2b7..f3be2b7 100644
--- a/DiscoBot/Properties/Settings.settings
+++ b/dsa/DiscoBot/Properties/Settings.settings
diff --git a/DiscoBot/Rework/Permissions.cs b/dsa/DiscoBot/Rework/Permissions.cs
index 4d73146..4d73146 100644
--- a/DiscoBot/Rework/Permissions.cs
+++ b/dsa/DiscoBot/Rework/Permissions.cs
diff --git a/DiscoBot/Token b/dsa/DiscoBot/Token
index 4b78e50..4b78e50 100644
--- a/DiscoBot/Token
+++ b/dsa/DiscoBot/Token
diff --git a/DiscoBot/packages.config b/dsa/DiscoBot/packages.config
index 75a1f83..75a1f83 100644
--- a/DiscoBot/packages.config
+++ b/dsa/DiscoBot/packages.config
diff --git a/DiscoBot/session.json b/dsa/DiscoBot/session.json
index c81cbf9..c81cbf9 100644
--- a/DiscoBot/session.json
+++ b/dsa/DiscoBot/session.json
diff --git a/DiscoBot/sessions/TheCrew/TheCrew-0.json b/dsa/DiscoBot/sessions/TheCrew/TheCrew-0.json
index 575cd54..575cd54 100644
--- a/DiscoBot/sessions/TheCrew/TheCrew-0.json
+++ b/dsa/DiscoBot/sessions/TheCrew/TheCrew-0.json
diff --git a/DiscoBot/sessions/copy/copy-0.json b/dsa/DiscoBot/sessions/copy/copy-0.json
index 03c46f3..03c46f3 100644
--- a/DiscoBot/sessions/copy/copy-0.json
+++ b/dsa/DiscoBot/sessions/copy/copy-0.json
diff --git a/DiscoBot/sessions/test/test-0.json b/dsa/DiscoBot/sessions/test/test-0.json
index 03c46f3..03c46f3 100644
--- a/DiscoBot/sessions/test/test-0.json
+++ b/dsa/DiscoBot/sessions/test/test-0.json
diff --git a/DiscoBot/sessions/test/test-1.json b/dsa/DiscoBot/sessions/test/test-1.json
index 03c46f3..03c46f3 100644
--- a/DiscoBot/sessions/test/test-1.json
+++ b/dsa/DiscoBot/sessions/test/test-1.json
diff --git a/DiscoBot/sessions/test/test-2.json b/dsa/DiscoBot/sessions/test/test-2.json
index 3458c52..3458c52 100644
--- a/DiscoBot/sessions/test/test-2.json
+++ b/dsa/DiscoBot/sessions/test/test-2.json
diff --git a/DiscoBot/sessions/test/test-3.json b/dsa/DiscoBot/sessions/test/test-3.json
index 3458c52..3458c52 100644
--- a/DiscoBot/sessions/test/test-3.json
+++ b/dsa/DiscoBot/sessions/test/test-3.json
diff --git a/DiscoBot/sessions/test/test-4.json b/dsa/DiscoBot/sessions/test/test-4.json
index 46853cf..46853cf 100644
--- a/DiscoBot/sessions/test/test-4.json
+++ b/dsa/DiscoBot/sessions/test/test-4.json
diff --git a/FireBase/ExceptionEventArgs.cs b/dsa/FireBase/ExceptionEventArgs.cs
index 09c205a..09c205a 100644
--- a/FireBase/ExceptionEventArgs.cs
+++ b/dsa/FireBase/ExceptionEventArgs.cs
diff --git a/FireBase/Extensions/ObservableExtensions.cs b/dsa/FireBase/Extensions/ObservableExtensions.cs
index 0a672d7..0a672d7 100644
--- a/FireBase/Extensions/ObservableExtensions.cs
+++ b/dsa/FireBase/Extensions/ObservableExtensions.cs
diff --git a/FireBase/Extensions/TaskExtensions.cs b/dsa/FireBase/Extensions/TaskExtensions.cs
index c955b3a..c955b3a 100644
--- a/FireBase/Extensions/TaskExtensions.cs
+++ b/dsa/FireBase/Extensions/TaskExtensions.cs
diff --git a/FireBase/FireBase.csproj b/dsa/FireBase/FireBase.csproj
index 2a47b27..2a47b27 100644
--- a/FireBase/FireBase.csproj
+++ b/dsa/FireBase/FireBase.csproj
diff --git a/FireBase/FirebaseClient.cs b/dsa/FireBase/FirebaseClient.cs
index 3079f3b..3079f3b 100644
--- a/FireBase/FirebaseClient.cs
+++ b/dsa/FireBase/FirebaseClient.cs
diff --git a/FireBase/FirebaseException.cs b/dsa/FireBase/FirebaseException.cs
index cfc09d3..cfc09d3 100644
--- a/FireBase/FirebaseException.cs
+++ b/dsa/FireBase/FirebaseException.cs
diff --git a/FireBase/FirebaseKeyGenerator.cs b/dsa/FireBase/FirebaseKeyGenerator.cs
index 37beed5..37beed5 100644
--- a/FireBase/FirebaseKeyGenerator.cs
+++ b/dsa/FireBase/FirebaseKeyGenerator.cs
diff --git a/FireBase/FirebaseObject.cs b/dsa/FireBase/FirebaseObject.cs
index 2e0fd20..2e0fd20 100644
--- a/FireBase/FirebaseObject.cs
+++ b/dsa/FireBase/FirebaseObject.cs
diff --git a/FireBase/FirebaseOptions.cs b/dsa/FireBase/FirebaseOptions.cs
index b4a5e51..b4a5e51 100644
--- a/FireBase/FirebaseOptions.cs
+++ b/dsa/FireBase/FirebaseOptions.cs
diff --git a/FireBase/Http/HttpClientExtensions.cs b/dsa/FireBase/Http/HttpClientExtensions.cs
index 6582769..6582769 100644
--- a/FireBase/Http/HttpClientExtensions.cs
+++ b/dsa/FireBase/Http/HttpClientExtensions.cs
diff --git a/FireBase/Http/PostResult.cs b/dsa/FireBase/Http/PostResult.cs
index 15a4894..15a4894 100644
--- a/FireBase/Http/PostResult.cs
+++ b/dsa/FireBase/Http/PostResult.cs
diff --git a/FireBase/ObservableExtensions.cs b/dsa/FireBase/ObservableExtensions.cs
index bc46261..bc46261 100644
--- a/FireBase/ObservableExtensions.cs
+++ b/dsa/FireBase/ObservableExtensions.cs
diff --git a/FireBase/Offline/ConcurrentOfflineDatabase.cs b/dsa/FireBase/Offline/ConcurrentOfflineDatabase.cs
index 1a9e607..1a9e607 100644
--- a/FireBase/Offline/ConcurrentOfflineDatabase.cs
+++ b/dsa/FireBase/Offline/ConcurrentOfflineDatabase.cs
diff --git a/FireBase/Offline/DatabaseExtensions.cs b/dsa/FireBase/Offline/DatabaseExtensions.cs
index e7c4074..e7c4074 100644
--- a/FireBase/Offline/DatabaseExtensions.cs
+++ b/dsa/FireBase/Offline/DatabaseExtensions.cs
diff --git a/FireBase/Offline/ISetHandler.cs b/dsa/FireBase/Offline/ISetHandler.cs
index c04bd41..c04bd41 100644
--- a/FireBase/Offline/ISetHandler.cs
+++ b/dsa/FireBase/Offline/ISetHandler.cs
diff --git a/FireBase/Offline/InitialPullStrategy.cs b/dsa/FireBase/Offline/InitialPullStrategy.cs
index ca2bebf..ca2bebf 100644
--- a/FireBase/Offline/InitialPullStrategy.cs
+++ b/dsa/FireBase/Offline/InitialPullStrategy.cs
diff --git a/FireBase/Offline/Internals/MemberAccessVisitor.cs b/dsa/FireBase/Offline/Internals/MemberAccessVisitor.cs
index 89a77da..89a77da 100644
--- a/FireBase/Offline/Internals/MemberAccessVisitor.cs
+++ b/dsa/FireBase/Offline/Internals/MemberAccessVisitor.cs
diff --git a/FireBase/Offline/OfflineCacheAdapter.cs b/dsa/FireBase/Offline/OfflineCacheAdapter.cs
index 3153d1b..3153d1b 100644
--- a/FireBase/Offline/OfflineCacheAdapter.cs
+++ b/dsa/FireBase/Offline/OfflineCacheAdapter.cs
diff --git a/FireBase/Offline/OfflineDatabase.cs b/dsa/FireBase/Offline/OfflineDatabase.cs
index be0380b..be0380b 100644
--- a/FireBase/Offline/OfflineDatabase.cs
+++ b/dsa/FireBase/Offline/OfflineDatabase.cs
diff --git a/FireBase/Offline/OfflineEntry.cs b/dsa/FireBase/Offline/OfflineEntry.cs
index 9feffa3..9feffa3 100644
--- a/FireBase/Offline/OfflineEntry.cs
+++ b/dsa/FireBase/Offline/OfflineEntry.cs
diff --git a/FireBase/Offline/RealtimeDatabase.cs b/dsa/FireBase/Offline/RealtimeDatabase.cs
index 973db46..973db46 100644
--- a/FireBase/Offline/RealtimeDatabase.cs
+++ b/dsa/FireBase/Offline/RealtimeDatabase.cs
diff --git a/FireBase/Offline/SetHandler.cs b/dsa/FireBase/Offline/SetHandler.cs
index 6314c3c..6314c3c 100644
--- a/FireBase/Offline/SetHandler.cs
+++ b/dsa/FireBase/Offline/SetHandler.cs
diff --git a/FireBase/Offline/StreamingOptions.cs b/dsa/FireBase/Offline/StreamingOptions.cs
index a420cbb..a420cbb 100644
--- a/FireBase/Offline/StreamingOptions.cs
+++ b/dsa/FireBase/Offline/StreamingOptions.cs
diff --git a/FireBase/Offline/SyncOptions.cs b/dsa/FireBase/Offline/SyncOptions.cs
index ca68d0a..ca68d0a 100644
--- a/FireBase/Offline/SyncOptions.cs
+++ b/dsa/FireBase/Offline/SyncOptions.cs
diff --git a/FireBase/Query/AuthQuery.cs b/dsa/FireBase/Query/AuthQuery.cs
index 2cfda3c..2cfda3c 100644
--- a/FireBase/Query/AuthQuery.cs
+++ b/dsa/FireBase/Query/AuthQuery.cs
diff --git a/FireBase/Query/ChildQuery.cs b/dsa/FireBase/Query/ChildQuery.cs
index 014fe09..014fe09 100644
--- a/FireBase/Query/ChildQuery.cs
+++ b/dsa/FireBase/Query/ChildQuery.cs
diff --git a/FireBase/Query/FilterQuery.cs b/dsa/FireBase/Query/FilterQuery.cs
index 3434d1d..3434d1d 100644
--- a/FireBase/Query/FilterQuery.cs
+++ b/dsa/FireBase/Query/FilterQuery.cs
diff --git a/FireBase/Query/FirebaseQuery.cs b/dsa/FireBase/Query/FirebaseQuery.cs
index 60d0289..60d0289 100644
--- a/FireBase/Query/FirebaseQuery.cs
+++ b/dsa/FireBase/Query/FirebaseQuery.cs
diff --git a/FireBase/Query/IFirebaseQuery.cs b/dsa/FireBase/Query/IFirebaseQuery.cs
index 0da4b15..0da4b15 100644
--- a/FireBase/Query/IFirebaseQuery.cs
+++ b/dsa/FireBase/Query/IFirebaseQuery.cs
diff --git a/FireBase/Query/OrderQuery.cs b/dsa/FireBase/Query/OrderQuery.cs
index 302d1a3..302d1a3 100644
--- a/FireBase/Query/OrderQuery.cs
+++ b/dsa/FireBase/Query/OrderQuery.cs
diff --git a/FireBase/Query/ParameterQuery.cs b/dsa/FireBase/Query/ParameterQuery.cs
index 572224c..572224c 100644
--- a/FireBase/Query/ParameterQuery.cs
+++ b/dsa/FireBase/Query/ParameterQuery.cs
diff --git a/FireBase/Query/QueryExtensions.cs b/dsa/FireBase/Query/QueryExtensions.cs
index df2edfc..df2edfc 100644
--- a/FireBase/Query/QueryExtensions.cs
+++ b/dsa/FireBase/Query/QueryExtensions.cs
diff --git a/FireBase/Query/QueryFactoryExtensions.cs b/dsa/FireBase/Query/QueryFactoryExtensions.cs
index 71dae5c..71dae5c 100644
--- a/FireBase/Query/QueryFactoryExtensions.cs
+++ b/dsa/FireBase/Query/QueryFactoryExtensions.cs
diff --git a/FireBase/Query/SilentQuery.cs b/dsa/FireBase/Query/SilentQuery.cs
index d09d38b..d09d38b 100644
--- a/FireBase/Query/SilentQuery.cs
+++ b/dsa/FireBase/Query/SilentQuery.cs
diff --git a/FireBase/Settings.StyleCop b/dsa/FireBase/Settings.StyleCop
index 833aa39..833aa39 100644
--- a/FireBase/Settings.StyleCop
+++ b/dsa/FireBase/Settings.StyleCop
diff --git a/FireBase/Streaming/FirebaseCache.cs b/dsa/FireBase/Streaming/FirebaseCache.cs
index 66241e0..66241e0 100644
--- a/FireBase/Streaming/FirebaseCache.cs
+++ b/dsa/FireBase/Streaming/FirebaseCache.cs
diff --git a/FireBase/Streaming/FirebaseEvent.cs b/dsa/FireBase/Streaming/FirebaseEvent.cs
index 1761a72..1761a72 100644
--- a/FireBase/Streaming/FirebaseEvent.cs
+++ b/dsa/FireBase/Streaming/FirebaseEvent.cs
diff --git a/FireBase/Streaming/FirebaseEventSource.cs b/dsa/FireBase/Streaming/FirebaseEventSource.cs
index b1385ca..b1385ca 100644
--- a/FireBase/Streaming/FirebaseEventSource.cs
+++ b/dsa/FireBase/Streaming/FirebaseEventSource.cs
diff --git a/FireBase/Streaming/FirebaseEventType.cs b/dsa/FireBase/Streaming/FirebaseEventType.cs
index 7606331..7606331 100644
--- a/FireBase/Streaming/FirebaseEventType.cs
+++ b/dsa/FireBase/Streaming/FirebaseEventType.cs
diff --git a/FireBase/Streaming/FirebaseServerEventType.cs b/dsa/FireBase/Streaming/FirebaseServerEventType.cs
index 79c816d..79c816d 100644
--- a/FireBase/Streaming/FirebaseServerEventType.cs
+++ b/dsa/FireBase/Streaming/FirebaseServerEventType.cs
diff --git a/FireBase/Streaming/FirebaseSubscription.cs b/dsa/FireBase/Streaming/FirebaseSubscription.cs
index fb0f403..fb0f403 100644
--- a/FireBase/Streaming/FirebaseSubscription.cs
+++ b/dsa/FireBase/Streaming/FirebaseSubscription.cs
diff --git a/FireBase/Streaming/NonBlockingStreamReader.cs b/dsa/FireBase/Streaming/NonBlockingStreamReader.cs
index 8228e32..8228e32 100644
--- a/FireBase/Streaming/NonBlockingStreamReader.cs
+++ b/dsa/FireBase/Streaming/NonBlockingStreamReader.cs
diff --git a/NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs b/dsa/NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs
index 3e8dbeb..3e8dbeb 100644
--- a/NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs
+++ b/dsa/NUnitTestProject1/Auxiliary/Calculator/ArgumentTests.cs
diff --git a/NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs b/dsa/NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs
index 998a78b..998a78b 100644
--- a/NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs
+++ b/dsa/NUnitTestProject1/Auxiliary/Calculator/StringSolverTests.cs
diff --git a/NUnitTestProject1/Auxiliary/DiceTests.cs b/dsa/NUnitTestProject1/Auxiliary/DiceTests.cs
index 6b37492..6b37492 100644
--- a/NUnitTestProject1/Auxiliary/DiceTests.cs
+++ b/dsa/NUnitTestProject1/Auxiliary/DiceTests.cs
diff --git a/NUnitTestProject1/NUnitTest.csproj b/dsa/NUnitTestProject1/NUnitTest.csproj
index 7b3b1ea..7b3b1ea 100644
--- a/NUnitTestProject1/NUnitTest.csproj
+++ b/dsa/NUnitTestProject1/NUnitTest.csproj