Compare commits

..

No commits in common. "69f45cd5920f0296431a224f4aa9099ac43f39d7" and "4c2b42ab7fd0a6b8f1c767388f12b08c70f4bb17" have entirely different histories.

2 changed files with 26 additions and 39 deletions
src/EllieBot/Modules/Games

View file

@ -20,13 +20,10 @@ public sealed class FishConfigService : ConfigServiceBase<FishConfig>
private void Migrate() private void Migrate()
{ {
if (data.Version < 2) ModifyConfig(c =>
{ {
ModifyConfig(c => c.Version = 2;
{ c.RequireCaptcha = true;
c.Version = 2; });
c.RequireCaptcha = true;
});
}
} }
} }

View file

@ -10,54 +10,44 @@ public partial class Games
[Cmd] [Cmd]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
public async Task Hangmanlist() public async Task Hangmanlist()
=> await Response().Confirm(GetText(strs.hangman_types(prefix)), _service.GetHangmanTypes().Join('\n')) => await Response().Confirm(GetText(strs.hangman_types(prefix)), _service.GetHangmanTypes().Join('\n')).SendAsync();
.SendAsync();
private static string Draw(HangmanGame.State state) private static string Draw(HangmanGame.State state)
{ => $"""
var head = state.Errors >= 1 ? "O" : " "; .
var torso = state.Errors >= 2 ? "|" : " "; ................
var leftArm = state.Errors >= 3 ? "/" : " "; ................
var rightArm = state.Errors >= 4 ? "\\" : " "; .{(state.Errors > 0 ? ".............😲" : "")}
var leftLeg = state.Errors >= 5 ? "/" : " "; .{(state.Errors > 1 ? "............./" : "")} {(state.Errors > 2 ? "|" : "")} {(state.Errors > 3 ? "\\" : "")}
var rightLeg = state.Errors >= 6 ? "\\" : " "; .{(state.Errors > 4 ? "............../" : "")} {(state.Errors > 5 ? "\\" : "")}
/-\
return $""" """;
```
{head}
{leftArm} {torso} {rightArm}
{leftLeg} {rightLeg}
```
""";
}
public static EmbedBuilder GetEmbed(IMessageSenderService sender, HangmanGame.State state) public static EmbedBuilder GetEmbed(IMessageSenderService sender, HangmanGame.State state)
{ {
if (state.Phase == HangmanGame.Phase.Running) if (state.Phase == HangmanGame.Phase.Running)
{ {
return sender.CreateEmbed() return sender.CreateEmbed()
.WithOkColor() .WithOkColor()
.AddField("Hangman", Draw(state)) .AddField("Hangman", Draw(state))
.AddField("Guess", Format.Code(state.Word)) .AddField("Guess", Format.Code(state.Word))
.WithFooter(state.MissedLetters.Join(' ')); .WithFooter(state.MissedLetters.Join(' '));
} }
if (state.Phase == HangmanGame.Phase.Ended && state.Failed) if (state.Phase == HangmanGame.Phase.Ended && state.Failed)
{ {
return sender.CreateEmbed() return sender.CreateEmbed()
.WithErrorColor() .WithErrorColor()
.AddField("Hangman", Draw(state)) .AddField("Hangman", Draw(state))
.AddField("Guess", Format.Code(state.Word)) .AddField("Guess", Format.Code(state.Word))
.WithFooter(state.MissedLetters.Join(' ')); .WithFooter(state.MissedLetters.Join(' '));
} }
return sender.CreateEmbed() return sender.CreateEmbed()
.WithOkColor() .WithOkColor()
.AddField("Hangman", Draw(state)) .AddField("Hangman", Draw(state))
.AddField("Guess", Format.Code(state.Word)) .AddField("Guess", Format.Code(state.Word))
.WithFooter(state.MissedLetters.Join(' ')); .WithFooter(state.MissedLetters.Join(' '));
} }
[Cmd] [Cmd]