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

More common refactorings like renaming variables, removing empty statements and unused variables, etc

Browse Source
This commit is contained in:
Kwoth
2022-01-09 16:46:08 +01:00
parent 2ce3262d59
commit f07a855912
75 changed files with 447 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NadekoBot/Modules/Gambling/Connect4/Connect4.cs
View File

@@ -59,7 +59,7 @@ public sealed class Connect4Game : IDisposable
private readonly ICurrencyService _cs;
private readonly NadekoRandom _rng;
private Timer _playerTimeoutTimer;
private Timer playerTimeoutTimer;
/* [ ][ ][ ][ ][ ][ ]
* [ ][ ][ ][ ][ ][ ]
@@ -133,7 +133,7 @@ public sealed class Connect4Game : IDisposable
}
CurrentPhase = Phase.P1Move; //start the game
_playerTimeoutTimer = new(async _ =>
playerTimeoutTimer = new(async _ =>
{
await _locker.WaitAsync();
try
@@ -330,7 +330,7 @@ public sealed class Connect4Game : IDisposable
}
private void ResetTimer()
=> _playerTimeoutTimer.Change(TimeSpan.FromSeconds(_options.TurnTimer),
=> playerTimeoutTimer.Change(TimeSpan.FromSeconds(_options.TurnTimer),
TimeSpan.FromSeconds(_options.TurnTimer));
private void EndGame(Result result, ulong? winId)
@@ -369,7 +369,7 @@ public sealed class Connect4Game : IDisposable
OnGameFailedToStart = null;
OnGameStateUpdated = null;
OnGameEnded = null;
_playerTimeoutTimer?.Change(Timeout.Infinite, Timeout.Infinite);
playerTimeoutTimer?.Change(Timeout.Infinite, Timeout.Infinite);
}

30
src/NadekoBot/Modules/Gambling/Connect4/Connect4Commands.cs
View File

@@ -11,19 +11,19 @@ public partial class Gambling
[Group]
public partial class Connect4Commands : GamblingSubmodule<GamblingService>
{
private static readonly string[] numbers =
private static readonly string[] _numbers =
{
":one:", ":two:", ":three:", ":four:", ":five:", ":six:", ":seven:", ":eight:"
};
private int RepostCounter
{
get => _repostCounter;
get => repostCounter;
set
{
if (value is < 0 or > 7)
_repostCounter = 0;
else _repostCounter = value;
repostCounter = 0;
else repostCounter = value;
}
}
@@ -32,7 +32,7 @@ public partial class Gambling
private IUserMessage msg;
private int _repostCounter;
private int repostCounter;
public Connect4Commands(DiscordSocketClient client, ICurrencyService cs, GamblingConfigService gamb)
: base(gamb)
@@ -59,7 +59,7 @@ public partial class Gambling
newGame.Dispose();
//means game already exists, try to join
var joined = await game.Join(ctx.User.Id, ctx.User.ToString(), options.Bet);
await game.Join(ctx.User.Id, ctx.User.ToString(), options.Bet);
return;
}
@@ -73,9 +73,9 @@ public partial class Gambling
}
game.OnGameStateUpdated += Game_OnGameStateUpdated;
game.OnGameFailedToStart += Game_OnGameFailedToStart;
game.OnGameEnded += Game_OnGameEnded;
_client.MessageReceived += _client_MessageReceived;
game.OnGameFailedToStart += GameOnGameFailedToStart;
game.OnGameEnded += GameOnGameEnded;
_client.MessageReceived += ClientMessageReceived;
game.Initialize();
if (options.Bet == 0)
@@ -83,7 +83,7 @@ public partial class Gambling
else
await ReplyErrorLocalizedAsync(strs.connect4_created_bet(options.Bet + CurrencySign));
Task _client_MessageReceived(SocketMessage arg)
Task ClientMessageReceived(SocketMessage arg)
{
if (ctx.Channel.Id != arg.Channel.Id)
return Task.CompletedTask;
@@ -110,22 +110,22 @@ public partial class Gambling
return Task.CompletedTask;
}
Task Game_OnGameFailedToStart(Connect4Game arg)
Task GameOnGameFailedToStart(Connect4Game arg)
{
if (_service.Connect4Games.TryRemove(ctx.Channel.Id, out var toDispose))
{
_client.MessageReceived -= _client_MessageReceived;
_client.MessageReceived -= ClientMessageReceived;
toDispose.Dispose();
}
return ErrorLocalizedAsync(strs.connect4_failed_to_start);
}
Task Game_OnGameEnded(Connect4Game arg, Connect4Game.Result result)
Task GameOnGameEnded(Connect4Game arg, Connect4Game.Result result)
{
if (_service.Connect4Games.TryRemove(ctx.Channel.Id, out var toDispose))
{
_client.MessageReceived -= _client_MessageReceived;
_client.MessageReceived -= ClientMessageReceived;
toDispose.Dispose();
}
@@ -185,7 +185,7 @@ public partial class Gambling
sb.AppendLine();
}
for (var i = 0; i < Connect4Game.NUMBER_OF_COLUMNS; i++) sb.Append(numbers[i]);
for (var i = 0; i < Connect4Game.NUMBER_OF_COLUMNS; i++) sb.Append(_numbers[i]);
return sb.ToString();
}
}