Merge remote-tracking branch 'origin/dev' into 1.4

This commit is contained in:
Master Kwoth 2017-05-10 11:34:53 +02:00
commit 91e7663e31

View File

@ -52,8 +52,8 @@ namespace NadekoBot.Modules.Games.Trivia
return new TriviaQuestion("Who's That Pokémon?", return new TriviaQuestion("Who's That Pokémon?",
map[num].ToTitleCase(), map[num].ToTitleCase(),
"Pokemon", "Pokemon",
$@"http://nadekobot.xyz/images/pokemon/shadows/{num}.png", $@"http://nadekobot.me/images/pokemon/shadows/{num}.png",
$@"http://nadekobot.xyz/images/pokemon/real/{num}.png"); $@"http://nadekobot.me/images/pokemon/real/{num}.png");
} }
TriviaQuestion randomQuestion; TriviaQuestion randomQuestion;
while (exclude.Contains(randomQuestion = pool[rng.Next(0, pool.Length)])) ; while (exclude.Contains(randomQuestion = pool[rng.Next(0, pool.Length)])) ;