diff --git a/NadekoBot/Modules/Games/Commands/TriviaCommand.cs b/NadekoBot/Modules/Games/Commands/TriviaCommand.cs index 75481309..3a24eebb 100644 --- a/NadekoBot/Modules/Games/Commands/TriviaCommand.cs +++ b/NadekoBot/Modules/Games/Commands/TriviaCommand.cs @@ -33,8 +33,11 @@ namespace NadekoBot.Modules.Games.Commands int num; return new Tuple(int.TryParse(s, out num), num); }).Where(t => t.Item1).Select(t => t.Item2).FirstOrDefault(); - if (number < 0) + if (number < 3) + { + await e.Channel.SendMessage("Number too small."); 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); diff --git a/NadekoBot/Modules/Permissions/Classes/PermissionHelper.cs b/NadekoBot/Modules/Permissions/Classes/PermissionHelper.cs index c972953e..d4a07e21 100644 --- a/NadekoBot/Modules/Permissions/Classes/PermissionHelper.cs +++ b/NadekoBot/Modules/Permissions/Classes/PermissionHelper.cs @@ -59,7 +59,7 @@ namespace NadekoBot.Modules.Permissions.Classes foreach (var com in NadekoBot.Client.GetService().AllCommands) { - if (com.Text.ToUpperInvariant().Equals(normalizedCmdTxt) || com.Aliases.Select(c=>c.ToUpperInvariant()).Contains(normalizedCmdTxt)) + if (com.Text.ToUpperInvariant().Equals(normalizedCmdTxt) || com.Aliases.Select(c => c.ToUpperInvariant()).Contains(normalizedCmdTxt)) return com.Text; } throw new NullReferenceException("That command does not exist."); diff --git a/NadekoBot/NadekoBot.cs b/NadekoBot/NadekoBot.cs index a66de25d..41bbada1 100644 --- a/NadekoBot/NadekoBot.cs +++ b/NadekoBot/NadekoBot.cs @@ -204,7 +204,7 @@ namespace NadekoBot return; } #if NADEKO_RELEASE - await Task.Delay(220000).ConfigureAwait(false); + await Task.Delay(300000).ConfigureAwait(false); #else await Task.Delay(1000).ConfigureAwait(false); #endif diff --git a/NadekoBot/NadekoBot.csproj b/NadekoBot/NadekoBot.csproj index 223f778f..ae5e378e 100644 --- a/NadekoBot/NadekoBot.csproj +++ b/NadekoBot/NadekoBot.csproj @@ -204,6 +204,11 @@ + + True + True + Resources.resx + @@ -294,11 +299,6 @@ - - True - True - Resources.resx - @@ -324,13 +324,10 @@ PublicResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - - diff --git a/NadekoBot/Properties/Resources.Designer.cs b/NadekoBot/Properties/Resources.Designer.cs index 5ebaee77..7a7bb7a4 100644 --- a/NadekoBot/Properties/Resources.Designer.cs +++ b/NadekoBot/Properties/Resources.Designer.cs @@ -580,16 +580,6 @@ namespace NadekoBot.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap hidden { - get { - object obj = ResourceManager.GetObject("hidden", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/NadekoBot/Properties/Resources.resx b/NadekoBot/Properties/Resources.resx index 98d2c435..b1b62029 100644 --- a/NadekoBot/Properties/Resources.resx +++ b/NadekoBot/Properties/Resources.resx @@ -136,9 +136,6 @@ ..\resources\images\coins\heads.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\images\hidden.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\images\cards\jack_of_clubs.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/NadekoBot/resources/images/hidden.png b/NadekoBot/resources/images/hidden.png deleted file mode 100644 index 11bcc55b..00000000 Binary files a/NadekoBot/resources/images/hidden.png and /dev/null differ diff --git a/NadekoBot/resources/images/rip/rip.png b/NadekoBot/resources/images/rip/rip.png new file mode 100644 index 00000000..6225b171 Binary files /dev/null and b/NadekoBot/resources/images/rip/rip.png differ diff --git a/NadekoBot/resources/images/rip/rose_overlay.png b/NadekoBot/resources/images/rip/rose_overlay.png new file mode 100644 index 00000000..767dcd1a Binary files /dev/null and b/NadekoBot/resources/images/rip/rose_overlay.png differ