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

Fixed around 140 wrong namings and other refactorings which were marked as warnings

Browse Source
This commit is contained in:
Kwoth
2022-01-08 11:51:41 +01:00
parent a6330119e8
commit 2ce3262d59
109 changed files with 698 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/NadekoBot/Modules/Gambling/BlackJack/BlackJackCommands.cs
View File

@@ -18,7 +18,7 @@ public partial class Gambling
private readonly ICurrencyService _cs;
private readonly DbService _db;
private IUserMessage _msg;
private IUserMessage msg;
public BlackJackCommands(ICurrencyService cs, DbService db, GamblingConfigService gamblingConf)
: base(gamblingConf)
@@ -74,12 +74,13 @@ public partial class Gambling
{
try
{
if (_msg is not null)
if (msg is not null)
{
var _ = _msg.DeleteAsync();
_= msg.DeleteAsync();
}
var c = bj.Dealer.Cards.Select(x => x.GetEmojiString());
var c = bj.Dealer.Cards.Select(x => x.GetEmojiString())
.ToList();
var dealerIcon = "❔ ";
if (bj.State == Blackjack.GameState.Ended)
{
@@ -102,7 +103,7 @@ public partial class Gambling
foreach (var p in bj.Players)
{
c = p.Cards.Select(x => x.GetEmojiString());
c = p.Cards.Select(x => x.GetEmojiString()).ToList();
cStr = "-\t" + string.Concat(c.Select(x => x[..^1] + " "));
cStr += "\n-\t" + string.Concat(c.Select(x => x.Last() + " "));
var full = $"{p.DiscordUser.ToString().TrimTo(20)} | Bet: {p.Bet} | Value: {p.GetHandValue()}";
@@ -133,7 +134,7 @@ public partial class Gambling
embed.AddField(full, cStr);
}
_msg = await ctx.Channel.EmbedAsync(embed);
msg = await ctx.Channel.EmbedAsync(embed);
}
catch
{
@@ -146,7 +147,7 @@ public partial class Gambling
? Format.Strikethrough(x.DiscordUser.ToString().TrimTo(30))
: x.DiscordUser.ToString();
var hand = $"{string.Concat(x.Cards.Select(y => "〖" + y.GetEmojiString() + "〗"))}";
// var hand = $"{string.Concat(x.Cards.Select(y => "〖" + y.GetEmojiString() + "〗"))}";
return $"{playerName} | Bet: {x.Bet}\n";

10
src/NadekoBot/Modules/Gambling/BlackJack/Blackjack.cs
View File

@@ -35,9 +35,7 @@ public class Blackjack
}
public void Start()
{
var _ = GameLoop();
}
=> _= GameLoop();
public async Task GameLoop()
{
@@ -89,13 +87,13 @@ public class Blackjack
Log.Information("Dealer moves");
await DealerMoves();
await PrintState();
var _ = GameEnded?.Invoke(this);
_= GameEnded?.Invoke(this);
}
catch (Exception ex)
{
Log.Error(ex, "REPORT THE MESSAGE BELOW IN #NadekoLog SERVER PLEASE");
State = GameState.Ended;
var _ = GameEnded?.Invoke(this);
_= GameEnded?.Invoke(this);
}
}
@@ -127,7 +125,7 @@ public class Blackjack
if (!await _cs.RemoveAsync(user, "BlackJack-gamble", bet, gamble: true)) return false;
Players.Add(new(user, bet));
var _ = PrintState();
_= PrintState();
return true;
}
finally