diff --git a/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/NadekoBot/Modules/Administration/Commands/LogCommand.cs index 2afedc8a..87a0723e 100644 --- a/NadekoBot/Modules/Administration/Commands/LogCommand.cs +++ b/NadekoBot/Modules/Administration/Commands/LogCommand.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; namespace NadekoBot.Modules.Administration.Commands { @@ -52,7 +53,7 @@ namespace NadekoBot.Modules.Administration.Commands catch { } }; }; -#if !NADEKO_RELEASE + // start the userpresence queue NadekoBot.OnReady += () => @@ -85,7 +86,6 @@ namespace NadekoBot.Modules.Administration.Commands } }); }; -#endif } private async void ChannelUpdated(object sender, ChannelUpdatedEventArgs e) diff --git a/NadekoBot/Modules/Games/Commands/TriviaCommand.cs b/NadekoBot/Modules/Games/Commands/TriviaCommand.cs index 94dcb0f6..75481309 100644 --- a/NadekoBot/Modules/Games/Commands/TriviaCommand.cs +++ b/NadekoBot/Modules/Games/Commands/TriviaCommand.cs @@ -1,7 +1,9 @@ using Discord.Commands; using NadekoBot.Classes; using NadekoBot.Modules.Games.Commands.Trivia; +using System; using System.Collections.Concurrent; +using System.Linq; namespace NadekoBot.Modules.Games.Commands { @@ -22,26 +24,25 @@ namespace NadekoBot.Modules.Games.Commands .Parameter("args", ParameterType.Multiple) .Do(async e => { - //TriviaGame trivia; - //if (!RunningTrivias.TryGetValue(e.Server.Id, out trivia)) - //{ - // var showHints = !e.Args.Contains("nohint"); - // var number = e.Args.Select(s => - // { - // int num; - // return new Tuple(int.TryParse(s, out num), num); - // }).Where(t => t.Item1).Select(t => t.Item2).FirstOrDefault(); - // if (number < 0) - // return; - // var triviaGame = new TriviaGame(e, showHints, number == 0 ? 10 : number); - // if (RunningTrivias.TryAdd(e.Server.Id, triviaGame)) - // await e.Channel.SendMessage($"**Trivia game started! {triviaGame.WinRequirement} points needed to win.**").ConfigureAwait(false); - // else - // await triviaGame.StopGame().ConfigureAwait(false); - //} - //else - // await e.Channel.SendMessage("Trivia game is already running on this server.\n" + trivia.CurrentQuestion).ConfigureAwait(false); - await e.Channel.SendMessage("`Trivia game is temporarily disabled.`").ConfigureAwait(false); + TriviaGame trivia; + if (!RunningTrivias.TryGetValue(e.Server.Id, out trivia)) + { + var showHints = !e.Args.Contains("nohint"); + var number = e.Args.Select(s => + { + int num; + return new Tuple(int.TryParse(s, out num), num); + }).Where(t => t.Item1).Select(t => t.Item2).FirstOrDefault(); + if (number < 0) + return; + var triviaGame = new TriviaGame(e, showHints, number == 0 ? 10 : number); + if (RunningTrivias.TryAdd(e.Server.Id, triviaGame)) + await e.Channel.SendMessage($"**Trivia game started! {triviaGame.WinRequirement} points needed to win.**").ConfigureAwait(false); + else + await triviaGame.StopGame().ConfigureAwait(false); + } + else + await e.Channel.SendMessage("Trivia game is already running on this server.\n" + trivia.CurrentQuestion).ConfigureAwait(false); }); cgb.CreateCommand(Module.Prefix + "tl") diff --git a/NadekoBot/bin/Debug/data/currency_images/img1.jpg b/NadekoBot/bin/Debug/data/currency_images/img1.jpg new file mode 100644 index 00000000..4a34ba97 Binary files /dev/null and b/NadekoBot/bin/Debug/data/currency_images/img1.jpg differ diff --git a/NadekoBot/bin/Debug/data/currency_images/img2.jpg b/NadekoBot/bin/Debug/data/currency_images/img2.jpg new file mode 100644 index 00000000..5697f8bb Binary files /dev/null and b/NadekoBot/bin/Debug/data/currency_images/img2.jpg differ diff --git a/NadekoBot/bin/Debug/data/currency_images/img3.jpg b/NadekoBot/bin/Debug/data/currency_images/img3.jpg new file mode 100644 index 00000000..e0019b09 Binary files /dev/null and b/NadekoBot/bin/Debug/data/currency_images/img3.jpg differ