minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 09:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4' into v5

Browse Source
This commit is contained in:
Kwoth
2023-07-03 05:02:56 +02:00
parent b34cd534c3 ce5e04b398
commit be1d14d095
11 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nadeko.Bot.Modules.Gambling/Gambling/Gambling.cs
View File

@@ -841,7 +841,7 @@ public partial class Gambling : GamblingModule<GamblingService>
else if (result.Result == RpsResultType.Win)
{
if ((long)result.Won > 0)
embed.AddField(GetText(strs.won), N(amount));
embed.AddField(GetText(strs.won), N((long)result.Won));
msg = GetText(strs.rps_win(ctx.User.Mention,
GetRpsPick(pick),

2
src/Nadeko.Bot.Modules.Gambling/Games/Trivia/Games.cs
View File

@@ -36,7 +36,7 @@ public partial class Games
var (opts, _) = OptionsParser.ParseFrom(new TriviaOptions(), args);
var config = _gamesConfig.Data;
if (config.Trivia.MinimumWinReq > 0 && config.Trivia.MinimumWinReq > opts.WinRequirement)
if (opts.WinRequirement != 0 && config.Trivia.MinimumWinReq > 0 && config.Trivia.MinimumWinReq > opts.WinRequirement)
return;
var trivia = new TriviaGame(opts, _cache);

2
src/Nadeko.Bot.Modules.Gambling/Games/Trivia/TriviaGame.cs
View File

@@ -157,7 +157,7 @@ public sealed class TriviaGame
var isWin = false;
// if user won the game, tell the game to stop
if (val >= _opts.WinRequirement)
if (_opts.WinRequirement != 0 && val >= _opts.WinRequirement)
{
_isStopped = true;
isWin = true;