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 code cleanup and codestyle updates

Browse Source 
- Fixed some possible nullref exceptions
- Methods signatures now have up to 3 parameters before breakaing down each parameter in a separate line
- Method invocations have the same rule, except the first parameter will be in the same line as the invocation to prevent some ugliness when passing lambas as arguments
- Applied many more codestyles
- Extensions folder fully reformatted
This commit is contained in:
Kwoth
2021-12-26 17:28:39 +01:00
parent b85ba177cd
commit d5fd6aae8e
217 changed files with 1017 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,14 +151,14 @@ public sealed class Connect4Game : IDisposable
try
{
inputCol -= 1;
if (CurrentPhase == Phase.Ended || CurrentPhase == Phase.Joining)
if (CurrentPhase is Phase.Ended or Phase.Joining)
return false;
if (!((_players[0].Value.UserId == userId && CurrentPhase == Phase.P1Move)
|| (_players[1].Value.UserId == userId && CurrentPhase == Phase.P2Move)))
return false;
if (inputCol < 0 || inputCol > NumberOfColumns) //invalid input
if (inputCol is < 0 or > NumberOfColumns) //invalid input
return false;
if (IsColumnFull(inputCol)) //can't play there event?
@@ -259,9 +259,9 @@ public sealed class Connect4Game : IDisposable
var curCol = col - i;
//check if current values are in range
if (curRow >= NumberOfRows || curRow < 0)
if (curRow is >= NumberOfRows or < 0)
break;
if (curCol < 0 || curCol >= NumberOfColumns)
if (curCol is < 0 or >= NumberOfColumns)
break;
var cur = _gameState[curRow + (curCol * NumberOfRows)];
@@ -286,9 +286,9 @@ public sealed class Connect4Game : IDisposable
var curCol = col + i;
//check if current values are in range
if (curRow >= NumberOfRows || curRow < 0)
if (curRow is >= NumberOfRows or < 0)
break;
if (curCol < 0 || curCol >= NumberOfColumns)
if (curCol is < 0 or >= NumberOfColumns)
break;
var cur = _gameState[curRow + (curCol * NumberOfRows)];
@@ -328,9 +328,7 @@ public sealed class Connect4Game : IDisposable
}
private void ResetTimer()
{
_playerTimeoutTimer.Change(TimeSpan.FromSeconds(_options.TurnTimer), TimeSpan.FromSeconds(_options.TurnTimer));
}
=> _playerTimeoutTimer.Change(TimeSpan.FromSeconds(_options.TurnTimer), TimeSpan.FromSeconds(_options.TurnTimer));
private void EndGame(Result result, ulong? winId)
{
@@ -378,7 +376,7 @@ public sealed class Connect4Game : IDisposable
{
public void NormalizeOptions()
{
if (TurnTimer < 5 || TurnTimer > 60)
if (TurnTimer is < 5 or > 60)
TurnTimer = 15;
if (Bet < 0)