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

Possible trivia weirdness fix, #1522

Browse Source
This commit is contained in:
Master Kwoth 2017-09-10 23:15:58 +02:00
parent 76249c5b29
commit 531633b018
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/NadekoBot/Modules/Games/Common/Trivia/TriviaQuestion.cs
View File

@ -23,11 +23,13 @@ namespace NadekoBot.Modules.Games.Common.Trivia
public string ImageUrl { get; set; } public string ImageUrl { get; set; }
public string AnswerImageUrl { get; set; } public string AnswerImageUrl { get; set; }
public string Answer { get; set; } public string Answer { get; set; }
public string CleanAnswer { get; }
public TriviaQuestion(string q, string a, string c, string img = null, string answerImage = null) public TriviaQuestion(string q, string a, string c, string img = null, string answerImage = null)
{ {
this.Question = q; this.Question = q;
this.Answer = a; this.Answer = a;
this.CleanAnswer = Clean(a);
this.Category = c; this.Category = c;
this.ImageUrl = img; this.ImageUrl = img;
this.AnswerImageUrl = answerImage ?? img; this.AnswerImageUrl = answerImage ?? img;
@ -37,20 +39,20 @@ namespace NadekoBot.Modules.Games.Common.Trivia
public bool IsAnswerCorrect(string guess) public bool IsAnswerCorrect(string guess)
{ {
guess = CleanGuess(guess);
if (Answer.Equals(guess)) if (Answer.Equals(guess))
{ {
return true; return true;
} }
Answer = CleanGuess(Answer); var cleanGuess = Clean(guess);
guess = CleanGuess(guess); if (CleanAnswer.Equals(cleanGuess))
if (Answer.Equals(guess))
{ {
return true; return true;
} }
int levDistance = Answer.LevenshteinDistance(guess); int levDistanceClean = CleanAnswer.LevenshteinDistance(cleanGuess);
return JudgeGuess(Answer.Length, guess.Length, levDistance); int levDistanceNormal = Answer.LevenshteinDistance(guess);
return JudgeGuess(CleanAnswer.Length, cleanGuess.Length, levDistanceClean)
|| JudgeGuess(Answer.Length, guess.Length, levDistanceNormal);
} }
private bool JudgeGuess(int guessLength, int answerLength, int levDistance) private bool JudgeGuess(int guessLength, int answerLength, int levDistance)
@ -68,7 +70,7 @@ namespace NadekoBot.Modules.Games.Common.Trivia
return false; return false;
} }
private string CleanGuess(string str) private string Clean(string str)
{ {
str = " " + str.ToLower() + " "; str = " " + str.ToLower() + " ";
str = Regex.Replace(str, "\\s+", " "); str = Regex.Replace(str, "\\s+", " ");