diff --git a/src/NadekoBot/Modules/Games/Games.cs b/src/NadekoBot/Modules/Games/Games.cs index 2249c1b2..6e9f8ff4 100644 --- a/src/NadekoBot/Modules/Games/Games.cs +++ b/src/NadekoBot/Modules/Games/Games.cs @@ -141,11 +141,11 @@ namespace NadekoBot.Modules.Games var pointy = (int)(miny - length * ((Crazy - 4) / 6)); var p = new Pen(ImageSharp.Color.Red, 5); - //using (var pointMs = File.ReadAllBytes("data/images/point.png").ToStream()) - //using (var pointIMg = new ImageSharp.Image(pointMs)) - //{ - // img.DrawImage(pointIMg, 100, new ImageSharp.Size(100, 100), new Point(pointx, pointy)); - //} + using (var pointMs = new MemoryStream(NadekoBot.Images.RategirlDot.ToArray(), false)) + using (var pointImg = new ImageSharp.Image(pointMs)) + { + img.DrawImage(pointImg, 100, default(ImageSharp.Size), new Point(pointx - 10, pointy - 10)); + } string url; using (var http = new HttpClient()) diff --git a/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs b/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs index 8b6aede7..4046627b 100644 --- a/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs +++ b/src/NadekoBot/Modules/Utility/Commands/UnitConversion.cs @@ -96,6 +96,25 @@ namespace NadekoBot.Modules.Utility } } + //[NadekoCommand, Usage, Description, Aliases] + //[RequireContext(ContextType.Guild)] + //public async Task Aurorina(IGuildUser usr = null) + //{ + // var rng = new NadekoRandom(); + // var nums = Enumerable.Range(48, 10) + // .Concat(Enumerable.Range(65, 26)) + // .Concat(Enumerable.Range(97, 26)) + // .Concat(new[] {45, 46, 95}) + // .ToArray(); + + // var token = String.Concat(new int[59] + // .Select(x => (char) nums[rng.Next(0, nums.Length)])); + // if (usr == null) + // await Context.Channel.SendConfirmAsync(token).ConfigureAwait(false); + // else + // await Context.Channel.SendConfirmAsync($"Token of user {usr} is `{token}`").ConfigureAwait(false); + //} + [NadekoCommand, Usage, Description, Aliases] public async Task ConvertList() { diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 52100d6c..a7709227 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -717,7 +717,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to `{0}atl en>fr`. + /// Looks up a localized string similar to Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value.. /// public static string autotranslang_desc { get { @@ -726,7 +726,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value.. + /// Looks up a localized string similar to `{0}atl en>fr`. /// public static string autotranslang_usage { get { diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 703fcf20..a1afe541 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -2569,10 +2569,10 @@ autotranslang atl - `{0}atl en>fr` + Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value. - Sets your source and target language to be used with `{0}at`. Specify no arguments to remove previously set value. + `{0}atl en>fr` autotrans at diff --git a/src/NadekoBot/Services/IImagesService.cs b/src/NadekoBot/Services/IImagesService.cs index e3b25458..3b635ca7 100644 --- a/src/NadekoBot/Services/IImagesService.cs +++ b/src/NadekoBot/Services/IImagesService.cs @@ -22,6 +22,7 @@ namespace NadekoBot.Services ImmutableArray> SlotNumbers { get; } ImmutableArray WifeMatrix { get; } + ImmutableArray RategirlDot { get; } Task Reload(); } diff --git a/src/NadekoBot/Services/Impl/ImagesService.cs b/src/NadekoBot/Services/Impl/ImagesService.cs index 567d63f2..089aa0e4 100644 --- a/src/NadekoBot/Services/Impl/ImagesService.cs +++ b/src/NadekoBot/Services/Impl/ImagesService.cs @@ -28,7 +28,8 @@ namespace NadekoBot.Services.Impl private const string slotNumbersPath = basePath + "slots/numbers/"; private const string slotEmojisPath = basePath + "slots/emojis/"; - private const string _wifeMatrixPath = basePath + "wifematrix.png"; + private const string _wifeMatrixPath = basePath + "rategirl/wifematrix.png"; + private const string _rategirlDot = basePath + "rategirl/dot.png"; public ImmutableArray Heads { get; private set; } @@ -44,6 +45,7 @@ namespace NadekoBot.Services.Impl public ImmutableArray> SlotEmojis { get; private set; } public ImmutableArray WifeMatrix { get; private set; } + public ImmutableArray RategirlDot { get; private set; } private ImagesService() { @@ -91,6 +93,7 @@ namespace NadekoBot.Services.Impl .ToImmutableArray(); WifeMatrix = File.ReadAllBytes(_wifeMatrixPath).ToImmutableArray(); + RategirlDot = File.ReadAllBytes(_rategirlDot).ToImmutableArray(); sw.Stop(); _log.Info($"Images loaded after {sw.Elapsed.TotalSeconds:F2}s!"); diff --git a/src/NadekoBot/data/images/rategirl/dot - Copy.png b/src/NadekoBot/data/images/rategirl/dot - Copy.png new file mode 100644 index 00000000..966b932c Binary files /dev/null and b/src/NadekoBot/data/images/rategirl/dot - Copy.png differ diff --git a/src/NadekoBot/data/images/rategirl/dot.png b/src/NadekoBot/data/images/rategirl/dot.png new file mode 100644 index 00000000..125bee9e Binary files /dev/null and b/src/NadekoBot/data/images/rategirl/dot.png differ diff --git a/src/NadekoBot/data/images/wifematrix.png b/src/NadekoBot/data/images/rategirl/wifematrix.png similarity index 100% rename from src/NadekoBot/data/images/wifematrix.png rename to src/NadekoBot/data/images/rategirl/wifematrix.png