mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improved speed typing logic slightly

Browse Source
This commit is contained in:
Master Kwoth
2016-03-05 13:37:18 +01:00
parent b8dad9a1cd
commit ed0fc7fd9d
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
NadekoBot/Commands/SpeedTyping.cs
View File

@@ -1,21 +1,23 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Discord; using Discord;
using Discord.Commands; using Discord.Commands;
using NadekoBot.Classes;
using NadekoBot.Classes._DataModels;
using NadekoBot.Extensions; using NadekoBot.Extensions;
using System.Diagnostics;
namespace NadekoBot.Commands { namespace NadekoBot.Commands {
public static class SentencesProvider { public static class SentencesProvider {
internal static string GetRandomSentence() { internal static string GetRandomSentence() {
var data = Classes.DbHandler.Instance.GetAllRows<Classes._DataModels.TypingArticle>(); var data = DbHandler.Instance.GetAllRows<TypingArticle>();
try { try {
return data.ToList()[new Random().Next(0, data.Count())].Text; return data.ToList()[new Random().Next(0, data.Count())].Text;
} catch { } catch {
return "Failed retrieving data from parse. Owner didn't add any articles to type using `typeadd`."; return "Failed retrieving data from parse. Owner didn't add any articles to type using `typeadd`.";
} }
} }
@@ -54,7 +56,7 @@ namespace NadekoBot.Commands {
if (IsActive) return; // can't start running game if (IsActive) return; // can't start running game
IsActive = true; IsActive = true;
CurrentSentence = SentencesProvider.GetRandomSentence(); CurrentSentence = SentencesProvider.GetRandomSentence();
var i = (int) (CurrentSentence.Length/WORD_VALUE*1.7f); var i = (int)(CurrentSentence.Length / WORD_VALUE * 1.7f);
await channel.SendMessage($":clock2: Next contest will last for {i} seconds. Type the bolded text as fast as you can."); await channel.SendMessage($":clock2: Next contest will last for {i} seconds. Type the bolded text as fast as you can.");
@@ -93,13 +95,12 @@ namespace NadekoBot.Commands {
var decision = Judge(distance, guess.Length); var decision = Judge(distance, guess.Length);
if (decision && !finishedUserIds.Contains(e.User.Id)) { if (decision && !finishedUserIds.Contains(e.User.Id)) {
finishedUserIds.Add(e.User.Id); finishedUserIds.Add(e.User.Id);
await channel.Send($"{e.User.Mention} finished in **{sw.Elapsed.Seconds}** seconds with { distance } errors, **{ CurrentSentence.Length / TypingGame.WORD_VALUE / sw.Elapsed.Seconds * 60 }** WPM!"); await channel.Send($"{e.User.Mention} finished in **{sw.Elapsed.Seconds}** seconds with { distance } errors, **{ CurrentSentence.Length / WORD_VALUE / sw.Elapsed.Seconds * 60 }** WPM!");
if (finishedUserIds.Count % 2 == 0) { if (finishedUserIds.Count % 2 == 0) {
await e.Channel.SendMessage($":exclamation: `A lot of people finished, here is the text for those still typing:`\n\n:book:**{CurrentSentence}**:book:"); await e.Channel.SendMessage($":exclamation: `A lot of people finished, here is the text for those still typing:`\n\n:book:**{CurrentSentence}**:book:");
} }
} }
} } catch { }
catch { }
} }
private bool Judge(int errors, int textLength) => errors <= textLength / 25; private bool Judge(int errors, int textLength) => errors <= textLength / 25;
@@ -110,31 +111,28 @@ namespace NadekoBot.Commands {
public static ConcurrentDictionary<ulong, TypingGame> RunningContests; public static ConcurrentDictionary<ulong, TypingGame> RunningContests;
public SpeedTyping() { public SpeedTyping() {
RunningContests = new ConcurrentDictionary<ulong, TypingGame>(); RunningContests = new ConcurrentDictionary<ulong, TypingGame>();
} }
public Func<CommandEventArgs, Task> DoFunc() => public Func<CommandEventArgs, Task> DoFunc() =>
async e => { async e => {
if (RunningContests.ContainsKey(e.User.Server.Id) && RunningContests[e.User.Server.Id].IsActive) { var game = RunningContests.GetOrAdd(e.User.Server.Id, id => new TypingGame(e.Channel));
await e.Channel.SendMessage($"Contest already running in { RunningContests[e.User.Server.Id].Channell.Mention } channel.");
return; if (game.IsActive) {
await e.Channel.SendMessage(
$"Contest already running in " +
$"{game.Channell.Mention} channel.");
} else {
await game.Start();
} }
if (RunningContests.ContainsKey(e.User.Server.Id) && !RunningContests[e.User.Server.Id].IsActive) {
await RunningContests[e.User.Server.Id].Start();
return;
}
var tg = new TypingGame(e.Channel);
RunningContests.TryAdd(e.Server.Id, tg);
await tg.Start();
}; };
private Func<CommandEventArgs, Task> QuitFunc() => private Func<CommandEventArgs, Task> QuitFunc() =>
async e => { async e => {
if (RunningContests.ContainsKey(e.User.Server.Id) && TypingGame game;
await RunningContests[e.User.Server.Id].Stop()) { if (RunningContests.TryRemove(e.User.Server.Id, out game)) {
TypingGame throwaway; await game.Stop();
RunningContests.TryRemove(e.User.Server.Id, out throwaway);
return; return;
} }
await e.Channel.SendMessage("No contest to stop on this channel."); await e.Channel.SendMessage("No contest to stop on this channel.");
@@ -155,7 +153,7 @@ namespace NadekoBot.Commands {
.Do(async e => { .Do(async e => {
if (!NadekoBot.IsOwner(e.User.Id) || string.IsNullOrWhiteSpace(e.GetArg("text"))) return; if (!NadekoBot.IsOwner(e.User.Id) || string.IsNullOrWhiteSpace(e.GetArg("text"))) return;
Classes.DbHandler.Instance.InsertData(new Classes._DataModels.TypingArticle { DbHandler.Instance.InsertData(new TypingArticle {
Text = e.GetArg("text"), Text = e.GetArg("text"),
DateAdded = DateTime.Now DateAdded = DateTime.Now
}); });