changed charset names

This commit is contained in:
Itamai
2019-07-19 20:49:02 +02:00
parent aa8cb268b0
commit 6f8b551e97
+6 -6
View File
@@ -614,15 +614,15 @@ namespace RuriLib
break; break;
case Function.RandomString: case Function.RandomString:
var reserved = new string[] { "?l", "?u", "?d", "?s", "?h", "?a", "?i", "?m" }; var reserved = new string[] { "?l", "?u", "?d", "?s", "?h", "?a", "?m", "?i" };
var lowercase = "abcdefghijklmnopqrstuvwxyz"; var lowercase = "abcdefghijklmnopqrstuvwxyz";
var uppercase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; var uppercase = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
var digits = "0123456789"; var digits = "0123456789";
var symbols = "\\!\"£$%&/()=?^'{}[]@#,;.:-_*+"; var symbols = "\\!\"£$%&/()=?^'{}[]@#,;.:-_*+";
var hex = digits + "abcdef"; var hex = digits + "abcdef";
var allchars = lowercase + uppercase + digits + symbols; var allchars = lowercase + uppercase + digits + symbols;
var meinchars = uppercase + digits; var udchars = uppercase + digits;
var itachars = lowercase + uppercase + digits; var ludchars = lowercase + uppercase + digits;
outputString = localInputString; outputString = localInputString;
while (reserved.Any(r => outputString.Contains(r))){ while (reserved.Any(r => outputString.Contains(r))){
@@ -638,10 +638,10 @@ namespace RuriLib
outputString = ReplaceFirst(outputString, "?h", hex[data.rand.Next(0, hex.Length)].ToString()); outputString = ReplaceFirst(outputString, "?h", hex[data.rand.Next(0, hex.Length)].ToString());
else if (outputString.Contains("?a")) else if (outputString.Contains("?a"))
outputString = ReplaceFirst(outputString, "?a", allchars[data.rand.Next(0, allchars.Length)].ToString()); outputString = ReplaceFirst(outputString, "?a", allchars[data.rand.Next(0, allchars.Length)].ToString());
else if (outputString.Contains("?i"))
outputString = ReplaceFirst(outputString, "?i", itachars[data.rand.Next(0, itachars.Length)].ToString());
else if (outputString.Contains("?m")) else if (outputString.Contains("?m"))
outputString = ReplaceFirst(outputString, "?m", meinchars[data.rand.Next(0, meinchars.Length)].ToString()); outputString = ReplaceFirst(outputString, "?m", udchars[data.rand.Next(0, udchars.Length)].ToString());
else if (outputString.Contains("?i"))
outputString = ReplaceFirst(outputString, "?i", ludchars[data.rand.Next(0, ludchars.Length)].ToString());
} }
break; break;