From b411aa2128c2724bec0ecedb8cb4e1ffa59f3b53 Mon Sep 17 00:00:00 2001 From: TrueDoctor Date: Wed, 26 Sep 2018 20:51:37 +0200 Subject: disconnected most vital calles from the Discord Bot --- DSACore/Auxiliary/Calculator/Argument.cs | 38 +++++ DSACore/Auxiliary/Calculator/ISolvable.cs | 10 ++ DSACore/Auxiliary/Calculator/Operator.cs | 51 ++++++ DSACore/Auxiliary/Calculator/Ops.cs | 13 ++ DSACore/Auxiliary/Calculator/StringSolver.cs | 207 +++++++++++++++++++++++++ DSACore/Auxiliary/CommandInfo.cs | 32 ++++ DSACore/Auxiliary/Dice.cs | 48 ++++++ DSACore/Auxiliary/Extensions.cs | 33 ++++ DSACore/Auxiliary/RandomMisc.cs | 52 +++++++ DSACore/Auxiliary/SpellCorrect.cs | 147 ++++++++++++++++++ DSACore/Auxiliary/TalentEnumerableExtension.cs | 84 ++++++++++ 11 files changed, 715 insertions(+) create mode 100644 DSACore/Auxiliary/Calculator/Argument.cs create mode 100644 DSACore/Auxiliary/Calculator/ISolvable.cs create mode 100644 DSACore/Auxiliary/Calculator/Operator.cs create mode 100644 DSACore/Auxiliary/Calculator/Ops.cs create mode 100644 DSACore/Auxiliary/Calculator/StringSolver.cs create mode 100644 DSACore/Auxiliary/CommandInfo.cs create mode 100644 DSACore/Auxiliary/Dice.cs create mode 100644 DSACore/Auxiliary/Extensions.cs create mode 100644 DSACore/Auxiliary/RandomMisc.cs create mode 100644 DSACore/Auxiliary/SpellCorrect.cs create mode 100644 DSACore/Auxiliary/TalentEnumerableExtension.cs (limited to 'DSACore/Auxiliary') diff --git a/DSACore/Auxiliary/Calculator/Argument.cs b/DSACore/Auxiliary/Calculator/Argument.cs new file mode 100644 index 0000000..2379bfe --- /dev/null +++ b/DSACore/Auxiliary/Calculator/Argument.cs @@ -0,0 +1,38 @@ +namespace DiscoBot.Auxiliary.Calculator +{ + using System; + + /// + /// Provides an ISolvable class to save numbers. The class handles Argument checking and conversion from string to int. + /// + public class Argument : ISolvable + { + private readonly int value; + + public Argument(string value) + { + // check whether the value given is an empty string + if (string.IsNullOrEmpty(value)) + { + throw new ArgumentException("Argument kann nicht mit einem leeren string instanziert werden. ", nameof(value)); + } + + if (!int.TryParse(value, out int result)) + { + throw new ArgumentException($"Kann {value} nicht in Integer konvertieren"); + } + + this.value = result; + } + + public int Solve() + { + return this.value; + } + + public override string ToString() + { + return this.value.ToString(); + } + } +} \ No newline at end of file diff --git a/DSACore/Auxiliary/Calculator/ISolvable.cs b/DSACore/Auxiliary/Calculator/ISolvable.cs new file mode 100644 index 0000000..a869bdb --- /dev/null +++ b/DSACore/Auxiliary/Calculator/ISolvable.cs @@ -0,0 +1,10 @@ +namespace DiscoBot.Auxiliary.Calculator +{ + /// + /// Object has to be able to return an integer as it's value + /// + public interface ISolvable + { + int Solve(); + } +} diff --git a/DSACore/Auxiliary/Calculator/Operator.cs b/DSACore/Auxiliary/Calculator/Operator.cs new file mode 100644 index 0000000..703f060 --- /dev/null +++ b/DSACore/Auxiliary/Calculator/Operator.cs @@ -0,0 +1,51 @@ +using System; +using DSACore.Auxiliary; + +namespace DiscoBot.Auxiliary.Calculator +{ + /// + /// The Operator Class represents a binary operator with tow Arguments and an Operation type + /// + public class Operator : ISolvable + { + private readonly ISolvable arg1, arg2; + + public Operator(ISolvable arg1, ISolvable arg2, Ops operatorType) + { + this.arg1 = arg1; + this.arg2 = arg2; + this.OperatorType = operatorType; + } + + public Ops OperatorType { get; set; } + + public int Solve() + { + int result; + switch (this.OperatorType) + { + case Ops.Dice: + result = Dice.Roll(this.arg1.Solve(), this.arg2.Solve()); + break; + case Ops.Multiply: + result = this.arg1.Solve() * this.arg2.Solve(); + break; + case Ops.Add: + result = this.arg1.Solve() + this.arg2.Solve(); + break; + case Ops.Subtract: + result = this.arg1.Solve() - this.arg2.Solve(); + break; + default: + throw new ArgumentOutOfRangeException(); + } + + return result; + } + + public override string ToString() + { + return $"({this.arg1} {this.OperatorType} {this.arg2})"; + } + } +} diff --git a/DSACore/Auxiliary/Calculator/Ops.cs b/DSACore/Auxiliary/Calculator/Ops.cs new file mode 100644 index 0000000..62c1309 --- /dev/null +++ b/DSACore/Auxiliary/Calculator/Ops.cs @@ -0,0 +1,13 @@ +namespace DiscoBot.Auxiliary.Calculator +{ + /// + /// The Different Operations, witch can be performed in execution-order + /// + public enum Ops + { + Dice, + Multiply, + Subtract, + Add + } +} diff --git a/DSACore/Auxiliary/Calculator/StringSolver.cs b/DSACore/Auxiliary/Calculator/StringSolver.cs new file mode 100644 index 0000000..30c2134 --- /dev/null +++ b/DSACore/Auxiliary/Calculator/StringSolver.cs @@ -0,0 +1,207 @@ +namespace DiscoBot.Auxiliary.Calculator +{ + using System; + using System.Collections.Generic; + using System.Linq; + + /// + /// The StringSolver divides the calculation string into operations and SubStringSolvers if the string contains parentheses + /// + public class StringSolver : ISolvable + { + private readonly string input; + private readonly List arguments = new List(); + + public StringSolver(string input) + { + this.input = input; + } + + public override string ToString() + { + return "(0+" + this.input.Replace(" ", string.Empty).ToLower() + ")"; + } + + public int Solve() + { + string workInput = "0+" + this.input.Replace(" ", string.Empty).ToLower(); + workInput = ExpandParentheses(workInput); + + // Create a List of the different parts of the calculation, e.g.:{"0", "+", "(5+6)", "d", "3"}. + this.AtomizeOperations(workInput); + + // traverse the List in order of Operation to Create the binary operation tree . + this.NestOperations(); + + // the List now contains only the top operation node, witch can be solved recursively, + return ((ISolvable)this.arguments.First()).Solve(); + } + + private static string GetInner(ref string input) // extract the inner bracket an remove the section from the input string + { + int depth = 0; + for (var index = 1; index < input.Length; index++) + { + char c = input[index]; + switch (c) + { + case '(': + depth++; + break; + case ')': + if (depth == 0) + { + var split = input.Substring(1, index - 1); + input = input.Substring(index + 1); + return split.Equals(string.Empty) ? "0" : split; + } + else + { + depth--; + } + + break; + } + } + + return string.Empty; + } + + private static Ops GetOps(char c) + { + switch (c) + { + case 'd': + case 'w': + return Ops.Dice; + case '+': + return Ops.Add; + case '-': + return Ops.Subtract; + case '*': + return Ops.Multiply; + default: + return Ops.Multiply; + } + } + + private static string ExpandParentheses(string input) // insert * between Parentheses and digits + { + for (int i = 0; i < input.Length - 1; i++) + { + if (input[i + 1] == '(' && char.IsNumber(input[i])) + { + input = input.Insert(i + 1, "*"); + } + } + + for (int i = 1; i < input.Length; i++) + { + if (input[i - 1] == ')' && char.IsNumber(input[i])) + { + input = input.Insert(i, "*"); + } + } + + return input; + } + + private void AtomizeOperations(string workInput) + { + for (var index = 0; index < workInput.Length; index++) + { + char c = workInput[index]; + + if (char.IsNumber(c)) + { + // if char number, check if at end of string, else continue looping + if (index == workInput.Length - 1) + { + // if at end of string; add remaining number to arguments + this.arguments.Add(new Argument(workInput.Substring(0, index + 1))); + } + + continue; + } + + switch (c) + { + case ')': + throw new ArgumentException($"Unmögliche Anordnung von Klammern"); + case '(': + this.arguments.Add(new StringSolver(GetInner(ref workInput))); + index = -1; + break; + default: + if (index > 0) + { + this.arguments.Add(new Argument(workInput.Substring(0, index))); + } + + this.arguments.Add(GetOps(c)); + workInput = workInput.Remove(0, index + 1); + index = -1; + break; + } + } + } + + private void NestOperations() + { + foreach (Ops currentOp in Enum.GetValues(typeof(Ops))) + { + // cycle through operators in operational order + for (var index = 0; index < this.arguments.Count; index++) + { + var arg = this.arguments[index]; + + if (arg.GetType() != typeof(Ops)) + { + continue; + } + + // arg is of type Ops + var op = (Ops)arg; + + if (op != currentOp) + { + continue; + } + + // arg describes the current operation + this.HandleSpecialFormatting(ref index, op); // Deal with special needs... + + // replace the previous current and next Element in the List with one Operation object + var temp = new Operator((ISolvable)this.arguments[index - 1], (ISolvable)this.arguments[index + 1], op); + this.arguments[index - 1] = temp; + this.arguments.RemoveRange(index, 2); + index--; + } + } + } + + private void HandleSpecialFormatting(ref int index, Ops op) + { + var arg1 = this.arguments[index - 1]; + if (arg1.GetType() == typeof(Ops)) + { + if (op == Ops.Dice) + { + this.arguments.Insert(index++, new Argument("1")); // w6 -> 1w6 + } + + if (op == Ops.Subtract) + { + this.arguments.Insert(index++, new Argument("0")); // +-3 -> +0-3 + } + } + + var arg2 = this.arguments[index + 1]; // 3+-5 -> 3+(0-5) + if (arg2.GetType() == typeof(Ops)) + { + this.arguments[index + 1] = new Operator(new Argument("0"), (ISolvable)this.arguments[index + 2], (Ops)arg2); + this.arguments.RemoveAt(index + 2); + } + } + } +} \ No newline at end of file diff --git a/DSACore/Auxiliary/CommandInfo.cs b/DSACore/Auxiliary/CommandInfo.cs new file mode 100644 index 0000000..a83e30a --- /dev/null +++ b/DSACore/Auxiliary/CommandInfo.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DSACore.Auxiliary +{ + public struct CommandInfo + { + public CommandInfo(string name, string brief, string[] description, string scope) + { + this.Name = name; + this.Scope = scope; + this.Brief = brief; + this.Description = description; + } + + public string Name { get; } + + public string Scope { get; } + + public string Brief { get; } + + public string[] Description { get; } + + public string GetDescription() + { + return this.Description.Aggregate((s, c) => s + c); + } + } +} diff --git a/DSACore/Auxiliary/Dice.cs b/DSACore/Auxiliary/Dice.cs new file mode 100644 index 0000000..2df8aa7 --- /dev/null +++ b/DSACore/Auxiliary/Dice.cs @@ -0,0 +1,48 @@ +using System; +using System.Linq; + +namespace DSACore.Auxiliary +{ + public static class Dice // roll it! + { + private static readonly System.Random Rnd = new System.Random(); + + public static int Roll(int d = 20) + { + return Rnd.Next(d) + 1; + } + + public static int Roll(string input) + { + var strings = input.ToLower().Split(new[] { 'w', 'd' }, 2, StringSplitOptions.RemoveEmptyEntries).ToList(); + int count = Convert.ToInt32(strings[0]); + int d = Convert.ToInt32(strings[0]); + + if (strings.Count != 2) + { + throw new ArgumentException($"{input}: erfüllt nicht die Formatvogaben( Anzahl d Augenzahl)"); + } + + return Roll(count, d); + } + + public static int Roll(int count, int d) + { + if (d <= 0) + { + return 0; + } + + int sum = 0; + for (int i = 0; i < Math.Abs(count); i++) + { + var roll = Dice.Roll(d); + sum += roll; + } + + sum *= Math.Abs(count) / count; + + return sum; + } + } +} diff --git a/DSACore/Auxiliary/Extensions.cs b/DSACore/Auxiliary/Extensions.cs new file mode 100644 index 0000000..8ef6298 --- /dev/null +++ b/DSACore/Auxiliary/Extensions.cs @@ -0,0 +1,33 @@ +namespace DSACore.Auxiliary +{ + public static class StringExtension + { + //This mehod extends string. It adds spaces until a fixed length is reached. + //If the original string is already longer, it is returner unmodified. + public static string AddSpaces(this string str, int length) + { + string temp = str; + for(int i = str.Length; i < length; i++) + { + temp += " "; + } + return temp; + } + + + + //This mehod extends string. + //It adds spaces at the HEAD of a string until a fixed length is reached. + //If the original string is already longer, it is returner unmodified. + public static string AddSpacesAtHead(this string str, int length) + { + string temp = ""; + for (int i = str.Length; i < length; i++) + { + temp += " "; + } + return temp + str; + } + } + +} diff --git a/DSACore/Auxiliary/RandomMisc.cs b/DSACore/Auxiliary/RandomMisc.cs new file mode 100644 index 0000000..1295f02 --- /dev/null +++ b/DSACore/Auxiliary/RandomMisc.cs @@ -0,0 +1,52 @@ +using System; +using System.Linq; +using System.Text; + +namespace DSACore.Auxiliary +{ + public static class RandomMisc + { + private static readonly Random Rand = new Random(); + + // use: 4w6 +4 + public static string Roll(string input) + { + var output = new StringBuilder(); + var strings = input.Split('w', 'd').ToList(); + int count = Convert.ToInt32(strings[0]); + strings = strings[1].Split(' ').ToList(); + int d = Convert.ToInt32(strings[0]); + + if (strings.Count > 0) + { + } + + int sum = 0; + for (int i = 0; i < count; i++) + { + var roll = Dice.Roll(d); + sum += roll; + output.Append("[" + roll + "] "); + } + + if (strings.Count > 1) + { + sum += Convert.ToInt32(strings[1]); + output.Append("sum: " + sum); + } + + return output.ToString(); + } + + public static double Random(double stdDev = 1, double mean = 0) + { + double u1 = Rand.NextDouble(); // uniform(0,1) random doubles + double u2 = Rand.NextDouble(); + double randStdNormal = Math.Sqrt(-2.0 * Math.Log(u1)) * + Math.Sin(2.0 * Math.PI * u2); // random normal(0,1) + double randNormal = + mean + stdDev * randStdNormal; // random normal(mean,stdDev^2) + return randNormal; + } + } +} diff --git a/DSACore/Auxiliary/SpellCorrect.cs b/DSACore/Auxiliary/SpellCorrect.cs new file mode 100644 index 0000000..c9603f6 --- /dev/null +++ b/DSACore/Auxiliary/SpellCorrect.cs @@ -0,0 +1,147 @@ +namespace DSACore.Auxiliary +{ + using System; + using System.Diagnostics; + using System.Linq; + + public class SpellCorrect : StringComparer + { + public const int ErrorThreshold = 94100; + + public override int Compare(string x, string y) + { + return CompareEasy(x, y); + } + + public static int CompareEasy(string x, string y) + { + if (string.IsNullOrEmpty(x)) + { + throw new ArgumentException("message", nameof(x)); + } + + if (string.IsNullOrEmpty(y)) + { + throw new ArgumentException("message", nameof(y)); + } + + if (x.Equals(y)) + { + return 0; + } + + x = x.ToLower(); + y = y.ToLower(); + if (x.Equals(y)) + { + return 1; + } + + var subs = y.Split(' ', '/'); + int score = subs.Count(); + foreach (string s in subs) + { + if (s.Equals(x)) + { + score--; + } + } + + if (score < subs.Count()) + { + return score + 1; + } + + return 100000 - (int)(CompareExact(x, y) * 1000.0); + /*if (y.Contains(x)) + return 6;*/ + } + + public override bool Equals(string x, string y) + { + Debug.Assert(x != null, nameof(x) + " != null"); + return x.Equals(y); + } + + public override int GetHashCode(string obj) + { + throw new NotImplementedException(); + } + + public static double CompareExact(string s, string q) + { + + s = s.ToLower(); + q = q.ToLower(); + + int i, j; + const double Match = 3.0; + const double Gap = -2.0; + const double Mismatch = -2.0; + + double decay; + + double[,] matrix = new double[s.Length + 1, q.Length + 1]; + double max = 0.0; + matrix[0, 0] = 0.0; + + for (i = 1; i < s.Length; i++) + { + // matrix[i, 0] = 0.0; + matrix[i, 0] = i * Gap; + } + + for (i = 1; i < q.Length; i++) + { + matrix[0, i] = 0.0; + } + + + for (i = 1; i <= s.Length; i++) + { + for (j = 1; j <= q.Length; j++) + { + decay = j / (double)(s.Length * 1000); + double add = s[i - 1] == q[j - 1] ? (Match - decay) : Mismatch; + double score = matrix[i - 1, j - 1] + add; + + if (score < (matrix[i - 1, j] + Gap)) + { + score = matrix[i - 1, j] + Gap; + } + + if (score < (matrix[i, j - 1] + Gap)) + { + score = matrix[i, j - 1] + Gap; + } + + if (i > 1 && j > 1) + { + if (s[i - 1] == q[j - 2] && s[i - 2] == q[j - 1]) + { + add = (3 / 2.0) * Match - decay; + if (score < matrix[i - 2, j - 2] + add) + { + score = matrix[i - 2, j - 2] + add; + } + } + } + + // if (score < 0) + // { + // score = 0; + // } + + if (max < score && i == s.Length) + { + max = score; + } + + matrix[i, j] = score; + } + } + + return max; + } + } +} diff --git a/DSACore/Auxiliary/TalentEnumerableExtension.cs b/DSACore/Auxiliary/TalentEnumerableExtension.cs new file mode 100644 index 0000000..d8af015 --- /dev/null +++ b/DSACore/Auxiliary/TalentEnumerableExtension.cs @@ -0,0 +1,84 @@ +using System.Collections.Generic; +using System.Linq; +using System.Text; +using DiscoBot.DSA_Game.Characters; +using DSALib; + +namespace DSACore.Auxiliary +{ + public static class TalentEnumerableExtension + { + public static string ProbenTest(this IEnumerable List, Character c, string talent, int erschwernis = 0) + { + var output = new StringBuilder(); + var sc = new SpellCorrect(); + var tTalent = List.OrderBy(x => sc.Compare(talent, x.Name)).First(); + + if (sc.Compare(talent, tTalent.Name) > SpellCorrect.ErrorThreshold) + { + return $"{c.Name} kann nicht {talent}..."; + } + + var props = tTalent.GetEigenschaften(); // get the required properties + int tap = tTalent.Value; // get taw + var werte = props.Select(p => c.Eigenschaften[c.PropTable[p]]).ToList(); + + output.AppendFormat( + "{0} würfelt: {1} \n{2} - {3} taw:{4} {5} \n", + c.Name, + tTalent.Name, + tTalent.Probe, + string.Join("/", werte), + tTalent.Value, + erschwernis.Equals(0) ? string.Empty : "Erschwernis: " + erschwernis); + + output.Append(" "); + tap -= erschwernis; + int gesamtErschwernis = tap; + if (gesamtErschwernis < 0) + { + tap = 0; + for (int i = 0; i <= 2; i++) + { + // foreach property, dice and tap + int temp = Dice.Roll(); + int eigenschaft = c.Eigenschaften[c.PropTable[props[i]]]; + + if (eigenschaft + gesamtErschwernis < temp) + { + tap -= temp - (eigenschaft + gesamtErschwernis); + } + + output.Append($"[{temp}]"); // add to string + } + + if (tap >= 0) + { + tap = 1; + } + } + else + { + for (int i = 0; i <= 2; i++) + { + // foreach property, dice and tap + int temp = Dice.Roll(); + int eigenschaft = c.Eigenschaften[c.PropTable[props[i]]]; + + if (eigenschaft < temp) + { + tap -= temp - eigenschaft; + } + + output.Append($"[{temp}]"); // add to string + } + } + + tap = (tap == 0) ? 1 : tap; + + output.AppendFormat(" tap: {0,2}", tap); + + return output.ToString(); // return output + } + } +} -- cgit v1.2.3-54-g00ecf