Fixes to some pokemans, higher delay between questions

This commit is contained in:
Kwoth committed 2017-03-25 09:32:04 +01:00
1 parent 86105df59a
commit 77b6d42d93
4 files changed
+5 -3249

No files matched your search

@@ -136,7 +136,8 @@ namespace NadekoBot.Modules.Games.Trivia
{
await Channel.EmbedAsync(new EmbedBuilder().WithErrorColor()
.WithTitle(GetText("trivia_game"))
.WithDescription(GetText("trivia_times_up", Format.Bold(CurrentQuestion.Answer))))
.WithDescription(GetText("trivia_times_up", Format.Bold(CurrentQuestion.Answer)))
.WithImageUrl(CurrentQuestion.AnswerImageUrl))
.ConfigureAwait(false);
}
catch (Exception ex)
@@ -144,7 +145,7 @@ namespace NadekoBot.Modules.Games.Trivia
_log.Warn(ex);
}
}
await Task.Delay(2000).ConfigureAwait(false);
await Task.Delay(5000).ConfigureAwait(false);
}
}
@@ -21,7 +21,7 @@ namespace NadekoBot.Modules.Games.Trivia
public static TriviaQuestionPool Instance { get; } = _instance ?? (_instance = new TriviaQuestionPool());
private const string questionsFile = "data/trivia_questions.json";
private const string pokemonMapPath = "data/pokemon/name-id_map2.json";
private const string pokemonMapPath = "data/pokemon/name-id_map3.json";
private readonly int maxPokemonId;
private Random rng { get; } = new NadekoRandom();
File diff suppressed because it is too large. Load diff
@@ -0,0 +1 @@
[{"Id":1,"Name":"bulbasaur"},{"Id":2,"Name":"ivysaur"},{"Id":3,"Name":"venusaur"},{"Id":4,"Name":"charmander"},{"Id":5,"Name":"charmeleon"},{"Id":6,"Name":"charizard"},{"Id":7,"Name":"squirtle"},{"Id":8,"Name":"wartortle"},{"Id":9,"Name":"blastoise"},{"Id":10,"Name":"caterpie"},{"Id":11,"Name":"metapod"},{"Id":12,"Name":"butterfree"},{"Id":13,"Name":"weedle"},{"Id":14,"Name":"kakuna"},{"Id":15,"Name":"beedrill"},{"Id":16,"Name":"pidgey"},{"Id":17,"Name":"pidgeotto"},{"Id":18,"Name":"pidgeot"},{"Id":19,"Name":"rattata"},{"Id":20,"Name":"raticate"},{"Id":21,"Name":"spearow"},{"Id":22,"Name":"fearow"},{"Id":23,"Name":"ekans"},{"Id":24,"Name":"arbok"},{"Id":25,"Name":"pikachu"},{"Id":26,"Name":"raichu"},{"Id":27,"Name":"sandshrew"},{"Id":28,"Name":"sandslash"},{"Id":29,"Name":"nidoran"},{"Id":30,"Name":"nidorina"},{"Id":31,"Name":"nidoqueen"},{"Id":32,"Name":"nidoran"},{"Id":33,"Name":"nidorino"},{"Id":34,"Name":"nidoking"},{"Id":35,"Name":"clefairy"},{"Id":36,"Name":"clefable"},{"Id":37,"Name":"vulpix"},{"Id":38,"Name":"ninetales"},{"Id":39,"Name":"jigglypuff"},{"Id":40,"Name":"wigglytuff"},{"Id":41,"Name":"zubat"},{"Id":42,"Name":"golbat"},{"Id":43,"Name":"oddish"},{"Id":44,"Name":"gloom"},{"Id":45,"Name":"vileplume"},{"Id":46,"Name":"paras"},{"Id":47,"Name":"parasect"},{"Id":48,"Name":"venonat"},{"Id":49,"Name":"venomoth"},{"Id":50,"Name":"diglett"},{"Id":51,"Name":"dugtrio"},{"Id":52,"Name":"meowth"},{"Id":53,"Name":"persian"},{"Id":54,"Name":"psyduck"},{"Id":55,"Name":"golduck"},{"Id":56,"Name":"mankey"},{"Id":57,"Name":"primeape"},{"Id":58,"Name":"growlithe"},{"Id":59,"Name":"arcanine"},{"Id":60,"Name":"poliwag"},{"Id":61,"Name":"poliwhirl"},{"Id":62,"Name":"poliwrath"},{"Id":63,"Name":"abra"},{"Id":64,"Name":"kadabra"},{"Id":65,"Name":"alakazam"},{"Id":66,"Name":"machop"},{"Id":67,"Name":"machoke"},{"Id":68,"Name":"machamp"},{"Id":69,"Name":"bellsprout"},{"Id":70,"Name":"weepinbell"},{"Id":71,"Name":"victreebel"},{"Id":72,"Name":"tentacool"},{"Id":73,"Name":"tentacruel"},{"Id":74,"Name":"geodude"},{"Id":75,"Name":"graveler"},{"Id":76,"Name":"golem"},{"Id":77,"Name":"ponyta"},{"Id":78,"Name":"rapidash"},{"Id":79,"Name":"slowpoke"},{"Id":80,"Name":"slowbro"},{"Id":81,"Name":"magnemite"},{"Id":82,"Name":"magneton"},{"Id":83,"Name":"farfetchd"},{"Id":84,"Name":"doduo"},{"Id":85,"Name":"dodrio"},{"Id":86,"Name":"seel"},{"Id":87,"Name":"dewgong"},{"Id":88,"Name":"grimer"},{"Id":89,"Name":"muk"},{"Id":90,"Name":"shellder"},{"Id":91,"Name":"cloyster"},{"Id":92,"Name":"gastly"},{"Id":93,"Name":"haunter"},{"Id":94,"Name":"gengar"},{"Id":95,"Name":"onix"},{"Id":96,"Name":"drowzee"},{"Id":97,"Name":"hypno"},{"Id":98,"Name":"krabby"},{"Id":99,"Name":"kingler"},{"Id":100,"Name":"voltorb"},{"Id":101,"Name":"electrode"},{"Id":102,"Name":"exeggcute"},{"Id":103,"Name":"exeggutor"},{"Id":104,"Name":"cubone"},{"Id":105,"Name":"marowak"},{"Id":106,"Name":"hitmonlee"},{"Id":107,"Name":"hitmonchan"},{"Id":108,"Name":"lickitung"},{"Id":109,"Name":"koffing"},{"Id":110,"Name":"weezing"},{"Id":111,"Name":"rhyhorn"},{"Id":112,"Name":"rhydon"},{"Id":113,"Name":"chansey"},{"Id":114,"Name":"tangela"},{"Id":115,"Name":"kangaskhan"},{"Id":116,"Name":"horsea"},{"Id":117,"Name":"seadra"},{"Id":118,"Name":"goldeen"},{"Id":119,"Name":"seaking"},{"Id":120,"Name":"staryu"},{"Id":121,"Name":"starmie"},{"Id":122,"Name":"mr mime"},{"Id":123,"Name":"scyther"},{"Id":124,"Name":"jynx"},{"Id":125,"Name":"electabuzz"},{"Id":126,"Name":"magmar"},{"Id":127,"Name":"pinsir"},{"Id":128,"Name":"tauros"},{"Id":129,"Name":"magikarp"},{"Id":130,"Name":"gyarados"},{"Id":131,"Name":"lapras"},{"Id":132,"Name":"ditto"},{"Id":133,"Name":"eevee"},{"Id":134,"Name":"vaporeon"},{"Id":135,"Name":"jolteon"},{"Id":136,"Name":"flareon"},{"Id":137,"Name":"porygon"},{"Id":138,"Name":"omanyte"},{"Id":139,"Name":"omastar"},{"Id":140,"Name":"kabuto"},{"Id":141,"Name":"kabutops"},{"Id":142,"Name":"aerodactyl"},{"Id":143,"Name":"snorlax"},{"Id":144,"Name":"articuno"},{"Id":145,"Name":"zapdos"},{"Id":146,"Name":"moltres"},{"Id":147,"Name":"dratini"},{"Id":148,"Name":"dragonair"},{"Id":149,"Name":"dragonite"},{"Id":150,"Name":"mewtwo"},{"Id":151,"Name":"mew"},{"Id":152,"Name":"chikorita"},{"Id":153,"Name":"bayleef"},{"Id":154,"Name":"meganium"},{"Id":155,"Name":"cyndaquil"},{"Id":156,"Name":"quilava"},{"Id":157,"Name":"typhlosion"},{"Id":158,"Name":"totodile"},{"Id":159,"Name":"croconaw"},{"Id":160,"Name":"feraligatr"},{"Id":161,"Name":"sentret"},{"Id":162,"Name":"furret"},{"Id":163,"Name":"hoothoot"},{"Id":164,"Name":"noctowl"},{"Id":165,"Name":"ledyba"},{"Id":166,"Name":"ledian"},{"Id":167,"Name":"spinarak"},{"Id":168,"Name":"ariados"},{"Id":169,"Name":"crobat"},{"Id":170,"Name":"chinchou"},{"Id":171,"Name":"lanturn"},{"Id":172,"Name":"pichu"},{"Id":173,"Name":"cleffa"},{"Id":174,"Name":"igglybuff"},{"Id":175,"Name":"togepi"},{"Id":176,"Name":"togetic"},{"Id":177,"Name":"natu"},{"Id":178,"Name":"xatu"},{"Id":179,"Name":"mareep"},{"Id":180,"Name":"flaaffy"},{"Id":181,"Name":"ampLine truncated