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

trivia fix

Browse Source
This commit is contained in:
Master Kwoth 2016-02-08 20:35:43 +01:00
parent 1f56c7c2f9
commit 9beeaf6a0e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NadekoBot/Classes/Trivia/TriviaQuestionPool.cs
View File

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using NadekoBot.Extensions;
namespace NadekoBot.Classes.Trivia { namespace NadekoBot.Classes.Trivia {
public class TriviaQuestionPool { public class TriviaQuestionPool {
@ -19,8 +20,8 @@ namespace NadekoBot.Classes.Trivia {
Reload(); Reload();
} }
public TriviaQuestion GetRandomQuestion(List<TriviaQuestion> exclude) => public TriviaQuestion GetRandomQuestion(List<TriviaQuestion> exclude) =>
pool.Except(exclude).OrderBy(x => _r.Next()).FirstOrDefault(); pool.Except(exclude).FirstOrDefault();
internal void Reload() { internal void Reload() {
JArray arr = JArray.Parse(File.ReadAllText("data/questions.txt")); JArray arr = JArray.Parse(File.ReadAllText("data/questions.txt"));
@ -28,9 +29,10 @@ namespace NadekoBot.Classes.Trivia {
foreach (var item in arr) { foreach (var item in arr) {
TriviaQuestion tq; TriviaQuestion tq;
tq = new TriviaQuestion(item["Question"].ToString(), item["Answer"].ToString(),item["Category"]?.ToString()); tq = new TriviaQuestion(item["Question"].ToString(), item["Answer"].ToString(),item["Category"]?.ToString());
pool.Add(tq); pool.Add(tq);
} }
var r = new Random();
pool = pool.OrderBy(x => r.Next()).ToList();
} }
} }
} }