minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-12 02:08:27 -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

14
src/NadekoBot/Modules/Games/Hangman/DefaultHangmanSource.cs
View File

@@ -5,7 +5,7 @@ namespace NadekoBot.Modules.Games.Hangman;
public sealed class DefaultHangmanSource : IHangmanSource
{
private IReadOnlyDictionary<string, HangmanTerm[]> _terms = new Dictionary<string, HangmanTerm[]>();
private IReadOnlyDictionary<string, HangmanTerm[]> termsDict = new Dictionary<string, HangmanTerm[]>();
private readonly Random _rng;
public DefaultHangmanSource()
@@ -18,7 +18,7 @@ public sealed class DefaultHangmanSource : IHangmanSource
{
if (!Directory.Exists("data/hangman"))
{
Log.Error("Hangman game won't work. Folder 'data/hangman' is missing.");
Log.Error("Hangman game won't work. Folder 'data/hangman' is missing");
return;
}
@@ -31,16 +31,16 @@ public sealed class DefaultHangmanSource : IHangmanSource
}
catch (Exception ex)
{
Log.Error(ex, "Loading {HangmanFile} failed.", file);
Log.Error(ex, "Loading {HangmanFile} failed", file);
}
_terms = qs;
termsDict = qs;
Log.Information("Loaded {HangmanCategoryCount} hangman categories.", qs.Count);
Log.Information("Loaded {HangmanCategoryCount} hangman categories", qs.Count);
}
public IReadOnlyCollection<string> GetCategories()
=> _terms.Keys.ToList();
=> termsDict.Keys.ToList();
public bool GetTerm(string? category, [NotNullWhen(true)] out HangmanTerm? term)
{
@@ -50,7 +50,7 @@ public sealed class DefaultHangmanSource : IHangmanSource
category = cats.ElementAt(_rng.Next(0, cats.Count));
}
if (_terms.TryGetValue(category, out var terms))
if (termsDict.TryGetValue(category, out var terms))
{
term = terms[_rng.Next(0, terms.Length)];
return true;

6
src/NadekoBot/Modules/Games/Hangman/HangmanCommands.cs
View File

@@ -28,19 +28,19 @@ public partial class Games
.WithOkColor()
.AddField("Hangman", Draw(state))
.AddField("Guess", Format.Code(state.Word))
.WithFooter(state.missedLetters.Join(' '));
.WithFooter(state.MissedLetters.Join(' '));
if (state.Phase == HangmanGame.Phase.Ended && state.Failed)
return eb.Create()
.WithErrorColor()
.AddField("Hangman", Draw(state))
.AddField("Guess", Format.Code(state.Word))
.WithFooter(state.missedLetters.Join(' '));
.WithFooter(state.MissedLetters.Join(' '));
return eb.Create()
.WithOkColor()
.AddField("Hangman", Draw(state))
.AddField("Guess", Format.Code(state.Word))
.WithFooter(state.missedLetters.Join(' '));
.WithFooter(state.MissedLetters.Join(' '));
}
[Cmd]

2
src/NadekoBot/Modules/Games/Hangman/HangmanGame.cs
View File

@@ -104,7 +104,7 @@ public sealed class HangmanGame
Phase Phase,
string Word,
GuessResult GuessResult,
List<char> missedLetters,
List<char> MissedLetters,
string ImageUrl)
{
public bool Failed

2
src/NadekoBot/Modules/Games/Hangman/HangmanService.cs
View File

@@ -54,7 +54,7 @@ public sealed class HangmanService : IHangmanService, ILateExecutor
{
lock (_locker)
{
if (_hangmanGames.TryRemove(channelId, out var game)) return new(true);
if (_hangmanGames.TryRemove(channelId, out _)) return new(true);
}
return new(false);