From ed26623e17e8dfcc036f88cca6de10d5a35697ec Mon Sep 17 00:00:00 2001 From: uzvkl Date: Mon, 20 May 2019 00:54:14 +0200 Subject: Reorganize Code delete ZoBotanica --- DSALib/Commands/CommandHandler.cs | 11 ++++++----- DSALib/Commands/CommandTypes.cs | 2 +- DSALib/Commands/FileHandler.cs | 7 ++++--- DSALib/Commands/Gm.cs | 2 +- DSALib/Commands/HeldList.cs | 8 ++++---- DSALib/Commands/Help.cs | 8 ++++---- DSALib/Commands/LebenUndAstral.cs | 6 +++--- DSALib/Commands/List.cs | 11 ++--------- DSALib/Commands/MiscCommands.cs | 4 ++-- DSALib/Commands/NpcCommands.cs | 18 +++++++++--------- DSALib/Commands/ProbenTest.cs | 2 +- 11 files changed, 37 insertions(+), 42 deletions(-) (limited to 'DSALib/Commands') diff --git a/DSALib/Commands/CommandHandler.cs b/DSALib/Commands/CommandHandler.cs index f74f87f..e63d7b8 100644 --- a/DSALib/Commands/CommandHandler.cs +++ b/DSALib/Commands/CommandHandler.cs @@ -1,10 +1,11 @@ using System; -using DSACore.Auxiliary; -using DSACore.Auxiliary.Calculator; -using DSACore.DSA_Game; -using DSACore.Models.Network; +using DSALib.Auxiliary; +using DSALib.Auxiliary.Calculator; +using DSALib.Commands; +using DSALib.DSA_Game; +using DSALib.Models.Network; -namespace DSACore.Commands +namespace DSALib.Commands { public class CommandHandler { diff --git a/DSALib/Commands/CommandTypes.cs b/DSALib/Commands/CommandTypes.cs index 6838ac2..62b8b0f 100644 --- a/DSALib/Commands/CommandTypes.cs +++ b/DSALib/Commands/CommandTypes.cs @@ -1,4 +1,4 @@ -namespace DSACore.Commands +namespace DSALib.Commands { public enum CommandTypes { diff --git a/DSALib/Commands/FileHandler.cs b/DSALib/Commands/FileHandler.cs index bce7c54..d117040 100644 --- a/DSALib/Commands/FileHandler.cs +++ b/DSALib/Commands/FileHandler.cs @@ -1,11 +1,12 @@ using System; using System.Linq; using System.Net; -using DSACore.DSA_Game; -using DSACore.DSA_Game.Characters; +using DSALib.DSA_Game; +using DSALib.DSA_Game.Characters; using DSALib; +using DSALib.Models.Dsa; -namespace DSACore.Commands +namespace DSALib.Commands { public class FileHandler { diff --git a/DSALib/Commands/Gm.cs b/DSALib/Commands/Gm.cs index 98b62db..74fd673 100644 --- a/DSALib/Commands/Gm.cs +++ b/DSALib/Commands/Gm.cs @@ -1,4 +1,4 @@ -namespace DSACore.Commands +namespace DSALib.Commands { /*public class Iam { diff --git a/DSALib/Commands/HeldList.cs b/DSALib/Commands/HeldList.cs index 370af34..ef29a14 100644 --- a/DSALib/Commands/HeldList.cs +++ b/DSALib/Commands/HeldList.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using DSACore.Auxiliary; -using DSACore.DSA_Game; -using DSACore.DSA_Game.Characters; +using DSALib.Auxiliary; +using DSALib.DSA_Game; +using DSALib.DSA_Game.Characters; -namespace DSACore.Commands +namespace DSALib.Commands { public class HeldList { diff --git a/DSALib/Commands/Help.cs b/DSALib/Commands/Help.cs index 974c44c..4506821 100644 --- a/DSALib/Commands/Help.cs +++ b/DSALib/Commands/Help.cs @@ -1,8 +1,8 @@ using System.Linq; -using DSACore.Auxiliary; -using DSACore.DSA_Game.Save; +using DSALib.Auxiliary; +using DSALib.DSA_Game.Save; -namespace DSACore.Commands +namespace DSALib.Commands { public class Help { @@ -13,7 +13,7 @@ namespace DSACore.Commands { // return command specific help var com = Properties.CommandInfos - .OrderBy(x => SpellCorrect.CompareEasy(x.Name, command.ToLower())).First(); // get best fit command + .OrderBy(x => SpellCorrect.Compare(x.Name, command.ToLower())).Last(); // get best fit command return com.GetDescription(); } diff --git a/DSALib/Commands/LebenUndAstral.cs b/DSALib/Commands/LebenUndAstral.cs index a671296..ac11c91 100644 --- a/DSALib/Commands/LebenUndAstral.cs +++ b/DSALib/Commands/LebenUndAstral.cs @@ -1,9 +1,9 @@ using System; -using DSACore.Auxiliary; -using DSACore.DSA_Game; +using DSALib.Auxiliary; +using DSALib.DSA_Game; using DSALib.Characters; -namespace DSACore.Commands +namespace DSALib.Commands { public class LE { diff --git a/DSALib/Commands/List.cs b/DSALib/Commands/List.cs index 7fc682f..1213f85 100644 --- a/DSALib/Commands/List.cs +++ b/DSALib/Commands/List.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using DSACore.Audio; -using DSACore.DSA_Game; +using DSALib.DSA_Game; -namespace DSACore.Commands +namespace DSALib.Commands { public class List { @@ -27,12 +26,6 @@ namespace DSACore.Commands // res.AddRange(Help.Commands.Select(x => x.Name)); res.Add(Help.Get_Generic_Help()); break; - case "play": - case "sound": - case "sounds": - res.AddRange( - Enum.GetNames(typeof(Sound))); - break; default: res.Add($"Kommando {prop} nicht gefunden"); diff --git a/DSALib/Commands/MiscCommands.cs b/DSALib/Commands/MiscCommands.cs index ebd1598..69b2ffe 100644 --- a/DSALib/Commands/MiscCommands.cs +++ b/DSALib/Commands/MiscCommands.cs @@ -1,4 +1,4 @@ -namespace DSACore.Commands +namespace DSALib.Commands { public class MiscCommands { @@ -13,7 +13,7 @@ [Command("rd"), Summary("Würfel Dennis ")] public Task RollDennisAsync([Remainder, Summary("Weapon")] string roll) { - return this.ReplyAsync("```xl\n" + new DSACore.Auxiliary.Calculator.StringSolver(roll).Solve() + "\n```"); + return this.ReplyAsync("```xl\n" + new DSALib.Auxiliary.Calculator.StringSolver(roll).Solve() + "\n```"); }*/ /* diff --git a/DSALib/Commands/NpcCommands.cs b/DSALib/Commands/NpcCommands.cs index 95243ca..510b78b 100644 --- a/DSALib/Commands/NpcCommands.cs +++ b/DSALib/Commands/NpcCommands.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using DSACore.Characters; -using DSACore.DSA_Game; -using DSACore.DSA_Game.Characters; +using DSALib.Characters; +using DSALib.DSA_Game; +using DSALib.DSA_Game.Characters; -namespace DSACore.Commands +namespace DSALib.Commands { public class NpcCommands { @@ -19,17 +19,17 @@ namespace DSACore.Commands private static string Random(ulong id, string npcName, int mean = 9, int stDv = 1) { throw new NotImplementedException(); - Dsa.Chars.Add(new Npc(npcName, mean, stDv)); - return $"{npcName} wurde zufällig generiert"; + //Dsa.Chars.Add(new Npc(npcName, mean, stDv)); + //return $"{npcName} wurde zufällig generiert"; } private static string Copy(ulong id, string npcName, string source, int stDv = 1) { if (Dsa.Chars.Exists(x => x.Name.Equals(npcName))) throw new Exception("Char gibt es schon"); throw new NotImplementedException(); - var chr = Dsa.GetCharacter(id); - Dsa.Chars.Add(new Character(chr as Character, npcName, stDv)); - return $"{npcName} wurde als variierte Kopie von {source} erstellt"; + //var chr = Dsa.GetCharacter(id); + //Dsa.Chars.Add(new Character(chr as Character, npcName, stDv)); + //return $"{npcName} wurde als variierte Kopie von {source} erstellt"; } } } \ No newline at end of file diff --git a/DSALib/Commands/ProbenTest.cs b/DSALib/Commands/ProbenTest.cs index d0800d6..7c88480 100644 --- a/DSALib/Commands/ProbenTest.cs +++ b/DSALib/Commands/ProbenTest.cs @@ -1,4 +1,4 @@ -namespace DSACore.Commands +namespace DSALib.Commands { public class ProbenTest { -- cgit v1.2.3-54-g00ecf