From 64c52f1cd08c717b1e57885448733b55be36c353 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Thu, 23 Mar 2017 12:09:15 +0100 Subject: [PATCH 01/42] >trivia pokemon added --- global.json | 5 +- .../Games/Commands/Trivia/TriviaGame.cs | 39 +- .../Games/Commands/Trivia/TriviaQuestion.cs | 6 +- .../Commands/Trivia/TriviaQuestionPool.cs | 28 +- .../Modules/Games/Commands/TriviaCommands.cs | 14 +- src/NadekoBot/data/pokemon/name-id_map.json | 3246 +++++++++++++++++ 6 files changed, 3319 insertions(+), 19 deletions(-) create mode 100644 src/NadekoBot/data/pokemon/name-id_map.json diff --git a/global.json b/global.json index ae345495..2c5832ca 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,6 @@ { - "projects": [ "Discord.Net/src", "src" ] + "projects": [ "Discord.Net/src", "src" ], + "sdk": { + "version": "1.0.0-preview2-1-003177" + } } diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs index 18e46fa5..3bfb8b1a 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs @@ -25,6 +25,7 @@ namespace NadekoBot.Modules.Games.Trivia private int questionDurationMiliseconds { get; } = 30000; private int hintTimeoutMiliseconds { get; } = 6000; public bool ShowHints { get; } + public bool IsPokemon { get; } private CancellationTokenSource triviaCancelSource { get; set; } public TriviaQuestion CurrentQuestion { get; private set; } @@ -37,7 +38,7 @@ namespace NadekoBot.Modules.Games.Trivia public int WinRequirement { get; } - public TriviaGame(IGuild guild, ITextChannel channel, bool showHints, int winReq) + public TriviaGame(IGuild guild, ITextChannel channel, bool showHints, int winReq, bool isPokemon) { _log = LogManager.GetCurrentClassLogger(); @@ -45,6 +46,7 @@ namespace NadekoBot.Modules.Games.Trivia Guild = guild; Channel = channel; WinRequirement = winReq; + IsPokemon = isPokemon; } private string GetText(string key, params object[] replacements) => @@ -61,7 +63,7 @@ namespace NadekoBot.Modules.Games.Trivia triviaCancelSource = new CancellationTokenSource(); // load question - CurrentQuestion = TriviaQuestionPool.Instance.GetRandomQuestion(OldQuestions); + CurrentQuestion = TriviaQuestionPool.Instance.GetRandomQuestion(OldQuestions, IsPokemon); if (string.IsNullOrWhiteSpace(CurrentQuestion?.Answer) || string.IsNullOrWhiteSpace(CurrentQuestion.Question)) { await Channel.SendErrorAsync(GetText("trivia_game"), GetText("failed_loading_question")).ConfigureAwait(false); @@ -76,7 +78,8 @@ namespace NadekoBot.Modules.Games.Trivia questionEmbed = new EmbedBuilder().WithOkColor() .WithTitle(GetText("trivia_game")) .AddField(eab => eab.WithName(GetText("category")).WithValue(CurrentQuestion.Category)) - .AddField(eab => eab.WithName(GetText("question")).WithValue(CurrentQuestion.Question)); + .AddField(eab => eab.WithName(GetText("question")).WithValue(CurrentQuestion.Question)) + .WithImageUrl(CurrentQuestion.ImageUrl); questionMessage = await Channel.EmbedAsync(questionEmbed).ConfigureAwait(false); } @@ -128,7 +131,19 @@ namespace NadekoBot.Modules.Games.Trivia NadekoBot.Client.MessageReceived -= PotentialGuess; } if (!triviaCancelSource.IsCancellationRequested) - try { await Channel.SendErrorAsync(GetText("trivia_game"), GetText("trivia_times_up", Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } + { + try + { + await Channel.EmbedAsync(new EmbedBuilder().WithErrorColor() + .WithTitle(GetText("trivia_game")) + .WithDescription(GetText("trivia_times_up", Format.Bold(CurrentQuestion.Answer)))) + .ConfigureAwait(false); + } + catch (Exception ex) + { + _log.Warn(ex); + } + } await Task.Delay(2000).ConfigureAwait(false); } } @@ -186,10 +201,13 @@ namespace NadekoBot.Modules.Games.Trivia ShouldStopGame = true; try { - await Channel.SendConfirmAsync(GetText("trivia_game"), - GetText("trivia_win", + await Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("trivia_game")) + .WithDescription(GetText("trivia_win", guildUser.Mention, - Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); + Format.Bold(CurrentQuestion.Answer))) + .WithImageUrl(CurrentQuestion.AnswerImageUrl)) + .ConfigureAwait(false); } catch { @@ -200,9 +218,12 @@ namespace NadekoBot.Modules.Games.Trivia await CurrencyHandler.AddCurrencyAsync(guildUser, "Won trivia", reward, true).ConfigureAwait(false); return; } - await Channel.SendConfirmAsync(GetText("trivia_game"), - GetText("trivia_guess", guildUser.Mention, Format.Bold(CurrentQuestion.Answer))).ConfigureAwait(false); + await Channel.EmbedAsync(new EmbedBuilder().WithOkColor() + .WithTitle(GetText("trivia_game")) + .WithDescription(GetText("trivia_guess", guildUser.Mention, Format.Bold(CurrentQuestion.Answer))) + .WithImageUrl(CurrentQuestion.AnswerImageUrl)) + .ConfigureAwait(false); } catch (Exception ex) { _log.Warn(ex); } } diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs index d9c908a8..01e676fd 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs @@ -20,13 +20,17 @@ namespace NadekoBot.Modules.Games.Trivia public string Category { get; set; } public string Question { get; set; } + public string ImageUrl { get; set; } + public string AnswerImageUrl { get; set; } public string Answer { get; set; } - public TriviaQuestion(string q, string a, string c) + public TriviaQuestion(string q, string a, string c, string img = null, string answerImage = null) { this.Question = q; this.Answer = a; this.Category = c; + this.ImageUrl = img; + this.AnswerImageUrl = answerImage ?? img; } public string GetHint() => Scramble(Answer); diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs index d85a15c1..854db99d 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs @@ -1,10 +1,9 @@ using NadekoBot.Extensions; using NadekoBot.Services; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; using System; -using System.Collections.Concurrent; using System.Collections.Generic; +using System.Collections.Immutable; using System.IO; using System.Linq; @@ -12,27 +11,50 @@ namespace NadekoBot.Modules.Games.Trivia { public class TriviaQuestionPool { + public class PokemonNameId + { + public int Id { get; set; } + public string Name { get; set; } + } + private static TriviaQuestionPool _instance; 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_map.json"; + private readonly int maxPokemonId; private Random rng { get; } = new NadekoRandom(); private TriviaQuestion[] pool { get; } + private ImmutableDictionary map { get; } static TriviaQuestionPool() { } private TriviaQuestionPool() { pool = JsonConvert.DeserializeObject(File.ReadAllText(questionsFile)); + map = JsonConvert.DeserializeObject(File.ReadAllText(pokemonMapPath)) + .ToDictionary(x => x.Id, x => x.Name) + .ToImmutableDictionary(); + + maxPokemonId = 721; //xd } - public TriviaQuestion GetRandomQuestion(HashSet exclude) + public TriviaQuestion GetRandomQuestion(HashSet exclude, bool isPokemon) { if (pool.Length == 0) return null; + if (isPokemon) + { + var num = rng.Next(1, maxPokemonId + 1); + return new TriviaQuestion("Who's That Pokémon?", + map[num].ToTitleCase(), + "Pokemon", + $@"http://nadekobot.xyz/images/pokemon/shadows/{num}.png", + $@"http://nadekobot.xyz/images/pokemon/real/{num}.png"); + } TriviaQuestion randomQuestion; while (exclude.Contains(randomQuestion = pool[rng.Next(0, pool.Length)])) ; diff --git a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs index 60dc4216..c8bd3e73 100644 --- a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs @@ -19,17 +19,21 @@ namespace NadekoBot.Modules.Games [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] public Task Trivia([Remainder] string additionalArgs = "") - => Trivia(10, additionalArgs); + => InternalTrivia(10, additionalArgs); [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - public async Task Trivia(int winReq = 10, [Remainder] string additionalArgs = "") + public Task Trivia(int winReq = 10, [Remainder] string additionalArgs = "") + => InternalTrivia(winReq, additionalArgs); + + public async Task InternalTrivia(int winReq, string additionalArgs = "") { var channel = (ITextChannel)Context.Channel; var showHints = !additionalArgs.Contains("nohint"); + var isPokemon = additionalArgs.Contains("pokemon"); - var trivia = new TriviaGame(channel.Guild, channel, showHints, winReq); + var trivia = new TriviaGame(channel.Guild, channel, showHints, winReq, isPokemon); if (RunningTrivias.TryAdd(channel.Guild.Id, trivia)) { try @@ -41,9 +45,9 @@ namespace NadekoBot.Modules.Games RunningTrivias.TryRemove(channel.Guild.Id, out trivia); await trivia.EnsureStopped().ConfigureAwait(false); } - return; + return; } - + await Context.Channel.SendErrorAsync(GetText("trivia_already_running") + "\n" + trivia.CurrentQuestion) .ConfigureAwait(false); } diff --git a/src/NadekoBot/data/pokemon/name-id_map.json b/src/NadekoBot/data/pokemon/name-id_map.json new file mode 100644 index 00000000..334a2380 --- /dev/null +++ b/src/NadekoBot/data/pokemon/name-id_map.json @@ -0,0 +1,3246 @@ +[ + { + "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" + }, + { + "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": "ampharos" + }, + { + "Id": 182, + "Name": "bellossom" + }, + { + "Id": 183, + "Name": "marill" + }, + { + "Id": 184, + "Name": "azumarill" + }, + { + "Id": 185, + "Name": "sudowoodo" + }, + { + "Id": 186, + "Name": "politoed" + }, + { + "Id": 187, + "Name": "hoppip" + }, + { + "Id": 188, + "Name": "skiploom" + }, + { + "Id": 189, + "Name": "jumpluff" + }, + { + "Id": 190, + "Name": "aipom" + }, + { + "Id": 191, + "Name": "sunkern" + }, + { + "Id": 192, + "Name": "sunflora" + }, + { + "Id": 193, + "Name": "yanma" + }, + { + "Id": 194, + "Name": "wooper" + }, + { + "Id": 195, + "Name": "quagsire" + }, + { + "Id": 196, + "Name": "espeon" + }, + { + "Id": 197, + "Name": "umbreon" + }, + { + "Id": 198, + "Name": "murkrow" + }, + { + "Id": 199, + "Name": "slowking" + }, + { + "Id": 200, + "Name": "misdreavus" + }, + { + "Id": 201, + "Name": "unown" + }, + { + "Id": 202, + "Name": "wobbuffet" + }, + { + "Id": 203, + "Name": "girafarig" + }, + { + "Id": 204, + "Name": "pineco" + }, + { + "Id": 205, + "Name": "forretress" + }, + { + "Id": 206, + "Name": "dunsparce" + }, + { + "Id": 207, + "Name": "gligar" + }, + { + "Id": 208, + "Name": "steelix" + }, + { + "Id": 209, + "Name": "snubbull" + }, + { + "Id": 210, + "Name": "granbull" + }, + { + "Id": 211, + "Name": "qwilfish" + }, + { + "Id": 212, + "Name": "scizor" + }, + { + "Id": 213, + "Name": "shuckle" + }, + { + "Id": 214, + "Name": "heracross" + }, + { + "Id": 215, + "Name": "sneasel" + }, + { + "Id": 216, + "Name": "teddiursa" + }, + { + "Id": 217, + "Name": "ursaring" + }, + { + "Id": 218, + "Name": "slugma" + }, + { + "Id": 219, + "Name": "magcargo" + }, + { + "Id": 220, + "Name": "swinub" + }, + { + "Id": 221, + "Name": "piloswine" + }, + { + "Id": 222, + "Name": "corsola" + }, + { + "Id": 223, + "Name": "remoraid" + }, + { + "Id": 224, + "Name": "octillery" + }, + { + "Id": 225, + "Name": "delibird" + }, + { + "Id": 226, + "Name": "mantine" + }, + { + "Id": 227, + "Name": "skarmory" + }, + { + "Id": 228, + "Name": "houndour" + }, + { + "Id": 229, + "Name": "houndoom" + }, + { + "Id": 230, + "Name": "kingdra" + }, + { + "Id": 231, + "Name": "phanpy" + }, + { + "Id": 232, + "Name": "donphan" + }, + { + "Id": 233, + "Name": "porygon2" + }, + { + "Id": 234, + "Name": "stantler" + }, + { + "Id": 235, + "Name": "smeargle" + }, + { + "Id": 236, + "Name": "tyrogue" + }, + { + "Id": 237, + "Name": "hitmontop" + }, + { + "Id": 238, + "Name": "smoochum" + }, + { + "Id": 239, + "Name": "elekid" + }, + { + "Id": 240, + "Name": "magby" + }, + { + "Id": 241, + "Name": "miltank" + }, + { + "Id": 242, + "Name": "blissey" + }, + { + "Id": 243, + "Name": "raikou" + }, + { + "Id": 244, + "Name": "entei" + }, + { + "Id": 245, + "Name": "suicune" + }, + { + "Id": 246, + "Name": "larvitar" + }, + { + "Id": 247, + "Name": "pupitar" + }, + { + "Id": 248, + "Name": "tyranitar" + }, + { + "Id": 249, + "Name": "lugia" + }, + { + "Id": 250, + "Name": "ho" + }, + { + "Id": 251, + "Name": "celebi" + }, + { + "Id": 252, + "Name": "treecko" + }, + { + "Id": 253, + "Name": "grovyle" + }, + { + "Id": 254, + "Name": "sceptile" + }, + { + "Id": 255, + "Name": "torchic" + }, + { + "Id": 256, + "Name": "combusken" + }, + { + "Id": 257, + "Name": "blaziken" + }, + { + "Id": 258, + "Name": "mudkip" + }, + { + "Id": 259, + "Name": "marshtomp" + }, + { + "Id": 260, + "Name": "swampert" + }, + { + "Id": 261, + "Name": "poochyena" + }, + { + "Id": 262, + "Name": "mightyena" + }, + { + "Id": 263, + "Name": "zigzagoon" + }, + { + "Id": 264, + "Name": "linoone" + }, + { + "Id": 265, + "Name": "wurmple" + }, + { + "Id": 266, + "Name": "silcoon" + }, + { + "Id": 267, + "Name": "beautifly" + }, + { + "Id": 268, + "Name": "cascoon" + }, + { + "Id": 269, + "Name": "dustox" + }, + { + "Id": 270, + "Name": "lotad" + }, + { + "Id": 271, + "Name": "lombre" + }, + { + "Id": 272, + "Name": "ludicolo" + }, + { + "Id": 273, + "Name": "seedot" + }, + { + "Id": 274, + "Name": "nuzleaf" + }, + { + "Id": 275, + "Name": "shiftry" + }, + { + "Id": 276, + "Name": "taillow" + }, + { + "Id": 277, + "Name": "swellow" + }, + { + "Id": 278, + "Name": "wingull" + }, + { + "Id": 279, + "Name": "pelipper" + }, + { + "Id": 280, + "Name": "ralts" + }, + { + "Id": 281, + "Name": "kirlia" + }, + { + "Id": 282, + "Name": "gardevoir" + }, + { + "Id": 283, + "Name": "surskit" + }, + { + "Id": 284, + "Name": "masquerain" + }, + { + "Id": 285, + "Name": "shroomish" + }, + { + "Id": 286, + "Name": "breloom" + }, + { + "Id": 287, + "Name": "slakoth" + }, + { + "Id": 288, + "Name": "vigoroth" + }, + { + "Id": 289, + "Name": "slaking" + }, + { + "Id": 290, + "Name": "nincada" + }, + { + "Id": 291, + "Name": "ninjask" + }, + { + "Id": 292, + "Name": "shedinja" + }, + { + "Id": 293, + "Name": "whismur" + }, + { + "Id": 294, + "Name": "loudred" + }, + { + "Id": 295, + "Name": "exploud" + }, + { + "Id": 296, + "Name": "makuhita" + }, + { + "Id": 297, + "Name": "hariyama" + }, + { + "Id": 298, + "Name": "azurill" + }, + { + "Id": 299, + "Name": "nosepass" + }, + { + "Id": 300, + "Name": "skitty" + }, + { + "Id": 301, + "Name": "delcatty" + }, + { + "Id": 302, + "Name": "sableye" + }, + { + "Id": 303, + "Name": "mawile" + }, + { + "Id": 304, + "Name": "aron" + }, + { + "Id": 305, + "Name": "lairon" + }, + { + "Id": 306, + "Name": "aggron" + }, + { + "Id": 307, + "Name": "meditite" + }, + { + "Id": 308, + "Name": "medicham" + }, + { + "Id": 309, + "Name": "electrike" + }, + { + "Id": 310, + "Name": "manectric" + }, + { + "Id": 311, + "Name": "plusle" + }, + { + "Id": 312, + "Name": "minun" + }, + { + "Id": 313, + "Name": "volbeat" + }, + { + "Id": 314, + "Name": "illumise" + }, + { + "Id": 315, + "Name": "roselia" + }, + { + "Id": 316, + "Name": "gulpin" + }, + { + "Id": 317, + "Name": "swalot" + }, + { + "Id": 318, + "Name": "carvanha" + }, + { + "Id": 319, + "Name": "sharpedo" + }, + { + "Id": 320, + "Name": "wailmer" + }, + { + "Id": 321, + "Name": "wailord" + }, + { + "Id": 322, + "Name": "numel" + }, + { + "Id": 323, + "Name": "camerupt" + }, + { + "Id": 324, + "Name": "torkoal" + }, + { + "Id": 325, + "Name": "spoink" + }, + { + "Id": 326, + "Name": "grumpig" + }, + { + "Id": 327, + "Name": "spinda" + }, + { + "Id": 328, + "Name": "trapinch" + }, + { + "Id": 329, + "Name": "vibrava" + }, + { + "Id": 330, + "Name": "flygon" + }, + { + "Id": 331, + "Name": "cacnea" + }, + { + "Id": 332, + "Name": "cacturne" + }, + { + "Id": 333, + "Name": "swablu" + }, + { + "Id": 334, + "Name": "altaria" + }, + { + "Id": 335, + "Name": "zangoose" + }, + { + "Id": 336, + "Name": "seviper" + }, + { + "Id": 337, + "Name": "lunatone" + }, + { + "Id": 338, + "Name": "solrock" + }, + { + "Id": 339, + "Name": "barboach" + }, + { + "Id": 340, + "Name": "whiscash" + }, + { + "Id": 341, + "Name": "corphish" + }, + { + "Id": 342, + "Name": "crawdaunt" + }, + { + "Id": 343, + "Name": "baltoy" + }, + { + "Id": 344, + "Name": "claydol" + }, + { + "Id": 345, + "Name": "lileep" + }, + { + "Id": 346, + "Name": "cradily" + }, + { + "Id": 347, + "Name": "anorith" + }, + { + "Id": 348, + "Name": "armaldo" + }, + { + "Id": 349, + "Name": "feebas" + }, + { + "Id": 350, + "Name": "milotic" + }, + { + "Id": 351, + "Name": "castform" + }, + { + "Id": 352, + "Name": "kecleon" + }, + { + "Id": 353, + "Name": "shuppet" + }, + { + "Id": 354, + "Name": "banette" + }, + { + "Id": 355, + "Name": "duskull" + }, + { + "Id": 356, + "Name": "dusclops" + }, + { + "Id": 357, + "Name": "tropius" + }, + { + "Id": 358, + "Name": "chimecho" + }, + { + "Id": 359, + "Name": "absol" + }, + { + "Id": 360, + "Name": "wynaut" + }, + { + "Id": 361, + "Name": "snorunt" + }, + { + "Id": 362, + "Name": "glalie" + }, + { + "Id": 363, + "Name": "spheal" + }, + { + "Id": 364, + "Name": "sealeo" + }, + { + "Id": 365, + "Name": "walrein" + }, + { + "Id": 366, + "Name": "clamperl" + }, + { + "Id": 367, + "Name": "huntail" + }, + { + "Id": 368, + "Name": "gorebyss" + }, + { + "Id": 369, + "Name": "relicanth" + }, + { + "Id": 370, + "Name": "luvdisc" + }, + { + "Id": 371, + "Name": "bagon" + }, + { + "Id": 372, + "Name": "shelgon" + }, + { + "Id": 373, + "Name": "salamence" + }, + { + "Id": 374, + "Name": "beldum" + }, + { + "Id": 375, + "Name": "metang" + }, + { + "Id": 376, + "Name": "metagross" + }, + { + "Id": 377, + "Name": "regirock" + }, + { + "Id": 378, + "Name": "regice" + }, + { + "Id": 379, + "Name": "registeel" + }, + { + "Id": 380, + "Name": "latias" + }, + { + "Id": 381, + "Name": "latios" + }, + { + "Id": 382, + "Name": "kyogre" + }, + { + "Id": 383, + "Name": "groudon" + }, + { + "Id": 384, + "Name": "rayquaza" + }, + { + "Id": 385, + "Name": "jirachi" + }, + { + "Id": 386, + "Name": "deoxys" + }, + { + "Id": 387, + "Name": "turtwig" + }, + { + "Id": 388, + "Name": "grotle" + }, + { + "Id": 389, + "Name": "torterra" + }, + { + "Id": 390, + "Name": "chimchar" + }, + { + "Id": 391, + "Name": "monferno" + }, + { + "Id": 392, + "Name": "infernape" + }, + { + "Id": 393, + "Name": "piplup" + }, + { + "Id": 394, + "Name": "prinplup" + }, + { + "Id": 395, + "Name": "empoleon" + }, + { + "Id": 396, + "Name": "starly" + }, + { + "Id": 397, + "Name": "staravia" + }, + { + "Id": 398, + "Name": "staraptor" + }, + { + "Id": 399, + "Name": "bidoof" + }, + { + "Id": 400, + "Name": "bibarel" + }, + { + "Id": 401, + "Name": "kricketot" + }, + { + "Id": 402, + "Name": "kricketune" + }, + { + "Id": 403, + "Name": "shinx" + }, + { + "Id": 404, + "Name": "luxio" + }, + { + "Id": 405, + "Name": "luxray" + }, + { + "Id": 406, + "Name": "budew" + }, + { + "Id": 407, + "Name": "roserade" + }, + { + "Id": 408, + "Name": "cranidos" + }, + { + "Id": 409, + "Name": "rampardos" + }, + { + "Id": 410, + "Name": "shieldon" + }, + { + "Id": 411, + "Name": "bastiodon" + }, + { + "Id": 412, + "Name": "burmy" + }, + { + "Id": 413, + "Name": "wormadam" + }, + { + "Id": 414, + "Name": "mothim" + }, + { + "Id": 415, + "Name": "combee" + }, + { + "Id": 416, + "Name": "vespiquen" + }, + { + "Id": 417, + "Name": "pachirisu" + }, + { + "Id": 418, + "Name": "buizel" + }, + { + "Id": 419, + "Name": "floatzel" + }, + { + "Id": 420, + "Name": "cherubi" + }, + { + "Id": 421, + "Name": "cherrim" + }, + { + "Id": 422, + "Name": "shellos" + }, + { + "Id": 423, + "Name": "gastrodon" + }, + { + "Id": 424, + "Name": "ambipom" + }, + { + "Id": 425, + "Name": "drifloon" + }, + { + "Id": 426, + "Name": "drifblim" + }, + { + "Id": 427, + "Name": "buneary" + }, + { + "Id": 428, + "Name": "lopunny" + }, + { + "Id": 429, + "Name": "mismagius" + }, + { + "Id": 430, + "Name": "honchkrow" + }, + { + "Id": 431, + "Name": "glameow" + }, + { + "Id": 432, + "Name": "purugly" + }, + { + "Id": 433, + "Name": "chingling" + }, + { + "Id": 434, + "Name": "stunky" + }, + { + "Id": 435, + "Name": "skuntank" + }, + { + "Id": 436, + "Name": "bronzor" + }, + { + "Id": 437, + "Name": "bronzong" + }, + { + "Id": 438, + "Name": "bonsly" + }, + { + "Id": 439, + "Name": "mime" + }, + { + "Id": 440, + "Name": "happiny" + }, + { + "Id": 441, + "Name": "chatot" + }, + { + "Id": 442, + "Name": "spiritomb" + }, + { + "Id": 443, + "Name": "gible" + }, + { + "Id": 444, + "Name": "gabite" + }, + { + "Id": 445, + "Name": "garchomp" + }, + { + "Id": 446, + "Name": "munchlax" + }, + { + "Id": 447, + "Name": "riolu" + }, + { + "Id": 448, + "Name": "lucario" + }, + { + "Id": 449, + "Name": "hippopotas" + }, + { + "Id": 450, + "Name": "hippowdon" + }, + { + "Id": 451, + "Name": "skorupi" + }, + { + "Id": 452, + "Name": "drapion" + }, + { + "Id": 453, + "Name": "croagunk" + }, + { + "Id": 454, + "Name": "toxicroak" + }, + { + "Id": 455, + "Name": "carnivine" + }, + { + "Id": 456, + "Name": "finneon" + }, + { + "Id": 457, + "Name": "lumineon" + }, + { + "Id": 458, + "Name": "mantyke" + }, + { + "Id": 459, + "Name": "snover" + }, + { + "Id": 460, + "Name": "abomasnow" + }, + { + "Id": 461, + "Name": "weavile" + }, + { + "Id": 462, + "Name": "magnezone" + }, + { + "Id": 463, + "Name": "lickilicky" + }, + { + "Id": 464, + "Name": "rhyperior" + }, + { + "Id": 465, + "Name": "tangrowth" + }, + { + "Id": 466, + "Name": "electivire" + }, + { + "Id": 467, + "Name": "magmortar" + }, + { + "Id": 468, + "Name": "togekiss" + }, + { + "Id": 469, + "Name": "yanmega" + }, + { + "Id": 470, + "Name": "leafeon" + }, + { + "Id": 471, + "Name": "glaceon" + }, + { + "Id": 472, + "Name": "gliscor" + }, + { + "Id": 473, + "Name": "mamoswine" + }, + { + "Id": 474, + "Name": "porygon" + }, + { + "Id": 475, + "Name": "gallade" + }, + { + "Id": 476, + "Name": "probopass" + }, + { + "Id": 477, + "Name": "dusknoir" + }, + { + "Id": 478, + "Name": "froslass" + }, + { + "Id": 479, + "Name": "rotom" + }, + { + "Id": 480, + "Name": "uxie" + }, + { + "Id": 481, + "Name": "mesprit" + }, + { + "Id": 482, + "Name": "azelf" + }, + { + "Id": 483, + "Name": "dialga" + }, + { + "Id": 484, + "Name": "palkia" + }, + { + "Id": 485, + "Name": "heatran" + }, + { + "Id": 486, + "Name": "regigigas" + }, + { + "Id": 487, + "Name": "giratina" + }, + { + "Id": 488, + "Name": "cresselia" + }, + { + "Id": 489, + "Name": "phione" + }, + { + "Id": 490, + "Name": "manaphy" + }, + { + "Id": 491, + "Name": "darkrai" + }, + { + "Id": 492, + "Name": "shaymin" + }, + { + "Id": 493, + "Name": "arceus" + }, + { + "Id": 494, + "Name": "victini" + }, + { + "Id": 495, + "Name": "snivy" + }, + { + "Id": 496, + "Name": "servine" + }, + { + "Id": 497, + "Name": "serperior" + }, + { + "Id": 498, + "Name": "tepig" + }, + { + "Id": 499, + "Name": "pignite" + }, + { + "Id": 500, + "Name": "emboar" + }, + { + "Id": 501, + "Name": "oshawott" + }, + { + "Id": 502, + "Name": "dewott" + }, + { + "Id": 503, + "Name": "samurott" + }, + { + "Id": 504, + "Name": "patrat" + }, + { + "Id": 505, + "Name": "watchog" + }, + { + "Id": 506, + "Name": "lillipup" + }, + { + "Id": 507, + "Name": "herdier" + }, + { + "Id": 508, + "Name": "stoutland" + }, + { + "Id": 509, + "Name": "purrloin" + }, + { + "Id": 510, + "Name": "liepard" + }, + { + "Id": 511, + "Name": "pansage" + }, + { + "Id": 512, + "Name": "simisage" + }, + { + "Id": 513, + "Name": "pansear" + }, + { + "Id": 514, + "Name": "simisear" + }, + { + "Id": 515, + "Name": "panpour" + }, + { + "Id": 516, + "Name": "simipour" + }, + { + "Id": 517, + "Name": "munna" + }, + { + "Id": 518, + "Name": "musharna" + }, + { + "Id": 519, + "Name": "pidove" + }, + { + "Id": 520, + "Name": "tranquill" + }, + { + "Id": 521, + "Name": "unfezant" + }, + { + "Id": 522, + "Name": "blitzle" + }, + { + "Id": 523, + "Name": "zebstrika" + }, + { + "Id": 524, + "Name": "roggenrola" + }, + { + "Id": 525, + "Name": "boldore" + }, + { + "Id": 526, + "Name": "gigalith" + }, + { + "Id": 527, + "Name": "woobat" + }, + { + "Id": 528, + "Name": "swoobat" + }, + { + "Id": 529, + "Name": "drilbur" + }, + { + "Id": 530, + "Name": "excadrill" + }, + { + "Id": 531, + "Name": "audino" + }, + { + "Id": 532, + "Name": "timburr" + }, + { + "Id": 533, + "Name": "gurdurr" + }, + { + "Id": 534, + "Name": "conkeldurr" + }, + { + "Id": 535, + "Name": "tympole" + }, + { + "Id": 536, + "Name": "palpitoad" + }, + { + "Id": 537, + "Name": "seismitoad" + }, + { + "Id": 538, + "Name": "throh" + }, + { + "Id": 539, + "Name": "sawk" + }, + { + "Id": 540, + "Name": "sewaddle" + }, + { + "Id": 541, + "Name": "swadloon" + }, + { + "Id": 542, + "Name": "leavanny" + }, + { + "Id": 543, + "Name": "venipede" + }, + { + "Id": 544, + "Name": "whirlipede" + }, + { + "Id": 545, + "Name": "scolipede" + }, + { + "Id": 546, + "Name": "cottonee" + }, + { + "Id": 547, + "Name": "whimsicott" + }, + { + "Id": 548, + "Name": "petilil" + }, + { + "Id": 549, + "Name": "lilligant" + }, + { + "Id": 550, + "Name": "basculin" + }, + { + "Id": 551, + "Name": "sandile" + }, + { + "Id": 552, + "Name": "krokorok" + }, + { + "Id": 553, + "Name": "krookodile" + }, + { + "Id": 554, + "Name": "darumaka" + }, + { + "Id": 555, + "Name": "darmanitan" + }, + { + "Id": 556, + "Name": "maractus" + }, + { + "Id": 557, + "Name": "dwebble" + }, + { + "Id": 558, + "Name": "crustle" + }, + { + "Id": 559, + "Name": "scraggy" + }, + { + "Id": 560, + "Name": "scrafty" + }, + { + "Id": 561, + "Name": "sigilyph" + }, + { + "Id": 562, + "Name": "yamask" + }, + { + "Id": 563, + "Name": "cofagrigus" + }, + { + "Id": 564, + "Name": "tirtouga" + }, + { + "Id": 565, + "Name": "carracosta" + }, + { + "Id": 566, + "Name": "archen" + }, + { + "Id": 567, + "Name": "archeops" + }, + { + "Id": 568, + "Name": "trubbish" + }, + { + "Id": 569, + "Name": "garbodor" + }, + { + "Id": 570, + "Name": "zorua" + }, + { + "Id": 571, + "Name": "zoroark" + }, + { + "Id": 572, + "Name": "minccino" + }, + { + "Id": 573, + "Name": "cinccino" + }, + { + "Id": 574, + "Name": "gothita" + }, + { + "Id": 575, + "Name": "gothorita" + }, + { + "Id": 576, + "Name": "gothitelle" + }, + { + "Id": 577, + "Name": "solosis" + }, + { + "Id": 578, + "Name": "duosion" + }, + { + "Id": 579, + "Name": "reuniclus" + }, + { + "Id": 580, + "Name": "ducklett" + }, + { + "Id": 581, + "Name": "swanna" + }, + { + "Id": 582, + "Name": "vanillite" + }, + { + "Id": 583, + "Name": "vanillish" + }, + { + "Id": 584, + "Name": "vanilluxe" + }, + { + "Id": 585, + "Name": "deerling" + }, + { + "Id": 586, + "Name": "sawsbuck" + }, + { + "Id": 587, + "Name": "emolga" + }, + { + "Id": 588, + "Name": "karrablast" + }, + { + "Id": 589, + "Name": "escavalier" + }, + { + "Id": 590, + "Name": "foongus" + }, + { + "Id": 591, + "Name": "amoonguss" + }, + { + "Id": 592, + "Name": "frillish" + }, + { + "Id": 593, + "Name": "jellicent" + }, + { + "Id": 594, + "Name": "alomomola" + }, + { + "Id": 595, + "Name": "joltik" + }, + { + "Id": 596, + "Name": "galvantula" + }, + { + "Id": 597, + "Name": "ferroseed" + }, + { + "Id": 598, + "Name": "ferrothorn" + }, + { + "Id": 599, + "Name": "klink" + }, + { + "Id": 600, + "Name": "klang" + }, + { + "Id": 601, + "Name": "klinklang" + }, + { + "Id": 602, + "Name": "tynamo" + }, + { + "Id": 603, + "Name": "eelektrik" + }, + { + "Id": 604, + "Name": "eelektross" + }, + { + "Id": 605, + "Name": "elgyem" + }, + { + "Id": 606, + "Name": "beheeyem" + }, + { + "Id": 607, + "Name": "litwick" + }, + { + "Id": 608, + "Name": "lampent" + }, + { + "Id": 609, + "Name": "chandelure" + }, + { + "Id": 610, + "Name": "axew" + }, + { + "Id": 611, + "Name": "fraxure" + }, + { + "Id": 612, + "Name": "haxorus" + }, + { + "Id": 613, + "Name": "cubchoo" + }, + { + "Id": 614, + "Name": "beartic" + }, + { + "Id": 615, + "Name": "cryogonal" + }, + { + "Id": 616, + "Name": "shelmet" + }, + { + "Id": 617, + "Name": "accelgor" + }, + { + "Id": 618, + "Name": "stunfisk" + }, + { + "Id": 619, + "Name": "mienfoo" + }, + { + "Id": 620, + "Name": "mienshao" + }, + { + "Id": 621, + "Name": "druddigon" + }, + { + "Id": 622, + "Name": "golett" + }, + { + "Id": 623, + "Name": "golurk" + }, + { + "Id": 624, + "Name": "pawniard" + }, + { + "Id": 625, + "Name": "bisharp" + }, + { + "Id": 626, + "Name": "bouffalant" + }, + { + "Id": 627, + "Name": "rufflet" + }, + { + "Id": 628, + "Name": "braviary" + }, + { + "Id": 629, + "Name": "vullaby" + }, + { + "Id": 630, + "Name": "mandibuzz" + }, + { + "Id": 631, + "Name": "heatmor" + }, + { + "Id": 632, + "Name": "durant" + }, + { + "Id": 633, + "Name": "deino" + }, + { + "Id": 634, + "Name": "zweilous" + }, + { + "Id": 635, + "Name": "hydreigon" + }, + { + "Id": 636, + "Name": "larvesta" + }, + { + "Id": 637, + "Name": "volcarona" + }, + { + "Id": 638, + "Name": "cobalion" + }, + { + "Id": 639, + "Name": "terrakion" + }, + { + "Id": 640, + "Name": "virizion" + }, + { + "Id": 641, + "Name": "tornadus" + }, + { + "Id": 642, + "Name": "thundurus" + }, + { + "Id": 643, + "Name": "reshiram" + }, + { + "Id": 644, + "Name": "zekrom" + }, + { + "Id": 645, + "Name": "landorus" + }, + { + "Id": 646, + "Name": "kyurem" + }, + { + "Id": 647, + "Name": "keldeo" + }, + { + "Id": 648, + "Name": "meloetta" + }, + { + "Id": 649, + "Name": "genesect" + }, + { + "Id": 650, + "Name": "chespin" + }, + { + "Id": 651, + "Name": "quilladin" + }, + { + "Id": 652, + "Name": "chesnaught" + }, + { + "Id": 653, + "Name": "fennekin" + }, + { + "Id": 654, + "Name": "braixen" + }, + { + "Id": 655, + "Name": "delphox" + }, + { + "Id": 656, + "Name": "froakie" + }, + { + "Id": 657, + "Name": "frogadier" + }, + { + "Id": 658, + "Name": "greninja" + }, + { + "Id": 659, + "Name": "bunnelby" + }, + { + "Id": 660, + "Name": "diggersby" + }, + { + "Id": 661, + "Name": "fletchling" + }, + { + "Id": 662, + "Name": "fletchinder" + }, + { + "Id": 663, + "Name": "talonflame" + }, + { + "Id": 664, + "Name": "scatterbug" + }, + { + "Id": 665, + "Name": "spewpa" + }, + { + "Id": 666, + "Name": "vivillon" + }, + { + "Id": 667, + "Name": "litleo" + }, + { + "Id": 668, + "Name": "pyroar" + }, + { + "Id": 669, + "Name": "flabebe" + }, + { + "Id": 670, + "Name": "floette" + }, + { + "Id": 671, + "Name": "florges" + }, + { + "Id": 672, + "Name": "skiddo" + }, + { + "Id": 673, + "Name": "gogoat" + }, + { + "Id": 674, + "Name": "pancham" + }, + { + "Id": 675, + "Name": "pangoro" + }, + { + "Id": 676, + "Name": "furfrou" + }, + { + "Id": 677, + "Name": "espurr" + }, + { + "Id": 678, + "Name": "meowstic" + }, + { + "Id": 679, + "Name": "honedge" + }, + { + "Id": 680, + "Name": "doublade" + }, + { + "Id": 681, + "Name": "aegislash" + }, + { + "Id": 682, + "Name": "spritzee" + }, + { + "Id": 683, + "Name": "aromatisse" + }, + { + "Id": 684, + "Name": "swirlix" + }, + { + "Id": 685, + "Name": "slurpuff" + }, + { + "Id": 686, + "Name": "inkay" + }, + { + "Id": 687, + "Name": "malamar" + }, + { + "Id": 688, + "Name": "binacle" + }, + { + "Id": 689, + "Name": "barbaracle" + }, + { + "Id": 690, + "Name": "skrelp" + }, + { + "Id": 691, + "Name": "dragalge" + }, + { + "Id": 692, + "Name": "clauncher" + }, + { + "Id": 693, + "Name": "clawitzer" + }, + { + "Id": 694, + "Name": "helioptile" + }, + { + "Id": 695, + "Name": "heliolisk" + }, + { + "Id": 696, + "Name": "tyrunt" + }, + { + "Id": 697, + "Name": "tyrantrum" + }, + { + "Id": 698, + "Name": "amaura" + }, + { + "Id": 699, + "Name": "aurorus" + }, + { + "Id": 700, + "Name": "sylveon" + }, + { + "Id": 701, + "Name": "hawlucha" + }, + { + "Id": 702, + "Name": "dedenne" + }, + { + "Id": 703, + "Name": "carbink" + }, + { + "Id": 704, + "Name": "goomy" + }, + { + "Id": 705, + "Name": "sliggoo" + }, + { + "Id": 706, + "Name": "goodra" + }, + { + "Id": 707, + "Name": "klefki" + }, + { + "Id": 708, + "Name": "phantump" + }, + { + "Id": 709, + "Name": "trevenant" + }, + { + "Id": 710, + "Name": "pumpkaboo" + }, + { + "Id": 711, + "Name": "gourgeist" + }, + { + "Id": 712, + "Name": "bergmite" + }, + { + "Id": 713, + "Name": "avalugg" + }, + { + "Id": 714, + "Name": "noibat" + }, + { + "Id": 715, + "Name": "noivern" + }, + { + "Id": 716, + "Name": "xerneas" + }, + { + "Id": 717, + "Name": "yveltal" + }, + { + "Id": 718, + "Name": "zygarde" + }, + { + "Id": 719, + "Name": "diancie" + }, + { + "Id": 720, + "Name": "hoopa" + }, + { + "Id": 721, + "Name": "volcanion" + }, + { + "Id": 10001, + "Name": "deoxys" + }, + { + "Id": 10002, + "Name": "deoxys" + }, + { + "Id": 10003, + "Name": "deoxys" + }, + { + "Id": 10004, + "Name": "wormadam" + }, + { + "Id": 10005, + "Name": "wormadam" + }, + { + "Id": 10006, + "Name": "shaymin" + }, + { + "Id": 10007, + "Name": "giratina" + }, + { + "Id": 10008, + "Name": "rotom" + }, + { + "Id": 10009, + "Name": "rotom" + }, + { + "Id": 10010, + "Name": "rotom" + }, + { + "Id": 10011, + "Name": "rotom" + }, + { + "Id": 10012, + "Name": "rotom" + }, + { + "Id": 10013, + "Name": "castform" + }, + { + "Id": 10014, + "Name": "castform" + }, + { + "Id": 10015, + "Name": "castform" + }, + { + "Id": 10016, + "Name": "basculin" + }, + { + "Id": 10017, + "Name": "darmanitan" + }, + { + "Id": 10018, + "Name": "meloetta" + }, + { + "Id": 10019, + "Name": "tornadus" + }, + { + "Id": 10020, + "Name": "thundurus" + }, + { + "Id": 10021, + "Name": "landorus" + }, + { + "Id": 10022, + "Name": "kyurem" + }, + { + "Id": 10023, + "Name": "kyurem" + }, + { + "Id": 10024, + "Name": "keldeo" + }, + { + "Id": 10025, + "Name": "meowstic" + }, + { + "Id": 10026, + "Name": "aegislash" + }, + { + "Id": 10027, + "Name": "pumpkaboo" + }, + { + "Id": 10028, + "Name": "pumpkaboo" + }, + { + "Id": 10029, + "Name": "pumpkaboo" + }, + { + "Id": 10030, + "Name": "gourgeist" + }, + { + "Id": 10031, + "Name": "gourgeist" + }, + { + "Id": 10032, + "Name": "gourgeist" + }, + { + "Id": 10033, + "Name": "venusaur" + }, + { + "Id": 10034, + "Name": "charizard" + }, + { + "Id": 10035, + "Name": "charizard" + }, + { + "Id": 10036, + "Name": "blastoise" + }, + { + "Id": 10037, + "Name": "alakazam" + }, + { + "Id": 10038, + "Name": "gengar" + }, + { + "Id": 10039, + "Name": "kangaskhan" + }, + { + "Id": 10040, + "Name": "pinsir" + }, + { + "Id": 10041, + "Name": "gyarados" + }, + { + "Id": 10042, + "Name": "aerodactyl" + }, + { + "Id": 10043, + "Name": "mewtwo" + }, + { + "Id": 10044, + "Name": "mewtwo" + }, + { + "Id": 10045, + "Name": "ampharos" + }, + { + "Id": 10046, + "Name": "scizor" + }, + { + "Id": 10047, + "Name": "heracross" + }, + { + "Id": 10048, + "Name": "houndoom" + }, + { + "Id": 10049, + "Name": "tyranitar" + }, + { + "Id": 10050, + "Name": "blaziken" + }, + { + "Id": 10051, + "Name": "gardevoir" + }, + { + "Id": 10052, + "Name": "mawile" + }, + { + "Id": 10053, + "Name": "aggron" + }, + { + "Id": 10054, + "Name": "medicham" + }, + { + "Id": 10055, + "Name": "manectric" + }, + { + "Id": 10056, + "Name": "banette" + }, + { + "Id": 10057, + "Name": "absol" + }, + { + "Id": 10058, + "Name": "garchomp" + }, + { + "Id": 10059, + "Name": "lucario" + }, + { + "Id": 10060, + "Name": "abomasnow" + }, + { + "Id": 10061, + "Name": "floette" + }, + { + "Id": 10062, + "Name": "latias" + }, + { + "Id": 10063, + "Name": "latios" + }, + { + "Id": 10064, + "Name": "swampert" + }, + { + "Id": 10065, + "Name": "sceptile" + }, + { + "Id": 10066, + "Name": "sableye" + }, + { + "Id": 10067, + "Name": "altaria" + }, + { + "Id": 10068, + "Name": "gallade" + }, + { + "Id": 10069, + "Name": "audino" + }, + { + "Id": 10070, + "Name": "sharpedo" + }, + { + "Id": 10071, + "Name": "slowbro" + }, + { + "Id": 10072, + "Name": "steelix" + }, + { + "Id": 10073, + "Name": "pidgeot" + }, + { + "Id": 10074, + "Name": "glalie" + }, + { + "Id": 10075, + "Name": "diancie" + }, + { + "Id": 10076, + "Name": "metagross" + }, + { + "Id": 10077, + "Name": "kyogre" + }, + { + "Id": 10078, + "Name": "groudon" + }, + { + "Id": 10079, + "Name": "rayquaza" + }, + { + "Id": 10080, + "Name": "pikachu" + }, + { + "Id": 10081, + "Name": "pikachu" + }, + { + "Id": 10082, + "Name": "pikachu" + }, + { + "Id": 10083, + "Name": "pikachu" + }, + { + "Id": 10084, + "Name": "pikachu" + }, + { + "Id": 10085, + "Name": "pikachu" + }, + { + "Id": 10086, + "Name": "hoopa" + }, + { + "Id": 10087, + "Name": "camerupt" + }, + { + "Id": 10088, + "Name": "lopunny" + }, + { + "Id": 10089, + "Name": "salamence" + }, + { + "Id": 10090, + "Name": "beedrill" + } +] \ No newline at end of file From dfbef6d16147d566708b61c4391234ddb4363e93 Mon Sep 17 00:00:00 2001 From: samvaio Date: Thu, 23 Mar 2017 23:29:22 +0530 Subject: [PATCH 02/42] Update README.md Markdown header needed some space :D --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb00cdc9..ae4aa579 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [![nadeko1](https://cdn.discordapp.com/attachments/266240393639755778/281920134967328768/part2.png)](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303) [![nadeko2](https://cdn.discordapp.com/attachments/266240393639755778/281920161311883264/part3.png)](http://nadekobot.readthedocs.io/en/latest/Commands%20List/) -##For Update, Help and Guidelines +## For Updates, Help and Guidelines | [![twitter](https://cdn.discordapp.com/attachments/155726317222887425/252192520094613504/twiter_banner.JPG)](https://twitter.com/TheNadekoBot) | [![discord](https://cdn.discordapp.com/attachments/266240393639755778/281920766490968064/discord.png)](https://discord.gg/nadekobot) | [![Wiki](https://cdn.discordapp.com/attachments/266240393639755778/281920793330581506/datcord.png)](http://nadekobot.readthedocs.io/en/latest/) | --- | --- | --- | -| Follow me on Twitter for updates. | Join my Discord server if you need help. | Read the Docs for hosting guides. | \ No newline at end of file +| **Follow me on Twitter.** | **Join my Discord server for help.** | **Read the Docs for self-hosting.** | From a2ed4ac49bee66106d0cf5791014ac36655ccf52 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Mar 2017 11:15:31 +0100 Subject: [PATCH 03/42] Fixed ;lp, thanks manuel --- src/NadekoBot/Modules/Permissions/Permissions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index 2d21630d..ec0e1016 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -203,7 +203,7 @@ namespace NadekoBot.Modules.Permissions [RequireContext(ContextType.Guild)] public async Task ListPerms(int page = 1) { - if (page < 1 || page > 4) + if (page < 1) return; PermissionCache permCache; From 921725005c46c51e4412f2df62265ed9966da49b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Mar 2017 11:29:17 +0100 Subject: [PATCH 04/42] mr mime fix --- .../Commands/Trivia/TriviaQuestionPool.cs | 2 +- src/NadekoBot/data/pokemon/name-id_map2.json | 3246 +++++++++++++++++ 2 files changed, 3247 insertions(+), 1 deletion(-) create mode 100644 src/NadekoBot/data/pokemon/name-id_map2.json diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs index 854db99d..cbad9815 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs @@ -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_map.json"; + private const string pokemonMapPath = "data/pokemon/name-id_map2.json"; private readonly int maxPokemonId; private Random rng { get; } = new NadekoRandom(); diff --git a/src/NadekoBot/data/pokemon/name-id_map2.json b/src/NadekoBot/data/pokemon/name-id_map2.json new file mode 100644 index 00000000..1de578a0 --- /dev/null +++ b/src/NadekoBot/data/pokemon/name-id_map2.json @@ -0,0 +1,3246 @@ +[ + { + "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": "ampharos" + }, + { + "Id": 182, + "Name": "bellossom" + }, + { + "Id": 183, + "Name": "marill" + }, + { + "Id": 184, + "Name": "azumarill" + }, + { + "Id": 185, + "Name": "sudowoodo" + }, + { + "Id": 186, + "Name": "politoed" + }, + { + "Id": 187, + "Name": "hoppip" + }, + { + "Id": 188, + "Name": "skiploom" + }, + { + "Id": 189, + "Name": "jumpluff" + }, + { + "Id": 190, + "Name": "aipom" + }, + { + "Id": 191, + "Name": "sunkern" + }, + { + "Id": 192, + "Name": "sunflora" + }, + { + "Id": 193, + "Name": "yanma" + }, + { + "Id": 194, + "Name": "wooper" + }, + { + "Id": 195, + "Name": "quagsire" + }, + { + "Id": 196, + "Name": "espeon" + }, + { + "Id": 197, + "Name": "umbreon" + }, + { + "Id": 198, + "Name": "murkrow" + }, + { + "Id": 199, + "Name": "slowking" + }, + { + "Id": 200, + "Name": "misdreavus" + }, + { + "Id": 201, + "Name": "unown" + }, + { + "Id": 202, + "Name": "wobbuffet" + }, + { + "Id": 203, + "Name": "girafarig" + }, + { + "Id": 204, + "Name": "pineco" + }, + { + "Id": 205, + "Name": "forretress" + }, + { + "Id": 206, + "Name": "dunsparce" + }, + { + "Id": 207, + "Name": "gligar" + }, + { + "Id": 208, + "Name": "steelix" + }, + { + "Id": 209, + "Name": "snubbull" + }, + { + "Id": 210, + "Name": "granbull" + }, + { + "Id": 211, + "Name": "qwilfish" + }, + { + "Id": 212, + "Name": "scizor" + }, + { + "Id": 213, + "Name": "shuckle" + }, + { + "Id": 214, + "Name": "heracross" + }, + { + "Id": 215, + "Name": "sneasel" + }, + { + "Id": 216, + "Name": "teddiursa" + }, + { + "Id": 217, + "Name": "ursaring" + }, + { + "Id": 218, + "Name": "slugma" + }, + { + "Id": 219, + "Name": "magcargo" + }, + { + "Id": 220, + "Name": "swinub" + }, + { + "Id": 221, + "Name": "piloswine" + }, + { + "Id": 222, + "Name": "corsola" + }, + { + "Id": 223, + "Name": "remoraid" + }, + { + "Id": 224, + "Name": "octillery" + }, + { + "Id": 225, + "Name": "delibird" + }, + { + "Id": 226, + "Name": "mantine" + }, + { + "Id": 227, + "Name": "skarmory" + }, + { + "Id": 228, + "Name": "houndour" + }, + { + "Id": 229, + "Name": "houndoom" + }, + { + "Id": 230, + "Name": "kingdra" + }, + { + "Id": 231, + "Name": "phanpy" + }, + { + "Id": 232, + "Name": "donphan" + }, + { + "Id": 233, + "Name": "porygon2" + }, + { + "Id": 234, + "Name": "stantler" + }, + { + "Id": 235, + "Name": "smeargle" + }, + { + "Id": 236, + "Name": "tyrogue" + }, + { + "Id": 237, + "Name": "hitmontop" + }, + { + "Id": 238, + "Name": "smoochum" + }, + { + "Id": 239, + "Name": "elekid" + }, + { + "Id": 240, + "Name": "magby" + }, + { + "Id": 241, + "Name": "miltank" + }, + { + "Id": 242, + "Name": "blissey" + }, + { + "Id": 243, + "Name": "raikou" + }, + { + "Id": 244, + "Name": "entei" + }, + { + "Id": 245, + "Name": "suicune" + }, + { + "Id": 246, + "Name": "larvitar" + }, + { + "Id": 247, + "Name": "pupitar" + }, + { + "Id": 248, + "Name": "tyranitar" + }, + { + "Id": 249, + "Name": "lugia" + }, + { + "Id": 250, + "Name": "ho" + }, + { + "Id": 251, + "Name": "celebi" + }, + { + "Id": 252, + "Name": "treecko" + }, + { + "Id": 253, + "Name": "grovyle" + }, + { + "Id": 254, + "Name": "sceptile" + }, + { + "Id": 255, + "Name": "torchic" + }, + { + "Id": 256, + "Name": "combusken" + }, + { + "Id": 257, + "Name": "blaziken" + }, + { + "Id": 258, + "Name": "mudkip" + }, + { + "Id": 259, + "Name": "marshtomp" + }, + { + "Id": 260, + "Name": "swampert" + }, + { + "Id": 261, + "Name": "poochyena" + }, + { + "Id": 262, + "Name": "mightyena" + }, + { + "Id": 263, + "Name": "zigzagoon" + }, + { + "Id": 264, + "Name": "linoone" + }, + { + "Id": 265, + "Name": "wurmple" + }, + { + "Id": 266, + "Name": "silcoon" + }, + { + "Id": 267, + "Name": "beautifly" + }, + { + "Id": 268, + "Name": "cascoon" + }, + { + "Id": 269, + "Name": "dustox" + }, + { + "Id": 270, + "Name": "lotad" + }, + { + "Id": 271, + "Name": "lombre" + }, + { + "Id": 272, + "Name": "ludicolo" + }, + { + "Id": 273, + "Name": "seedot" + }, + { + "Id": 274, + "Name": "nuzleaf" + }, + { + "Id": 275, + "Name": "shiftry" + }, + { + "Id": 276, + "Name": "taillow" + }, + { + "Id": 277, + "Name": "swellow" + }, + { + "Id": 278, + "Name": "wingull" + }, + { + "Id": 279, + "Name": "pelipper" + }, + { + "Id": 280, + "Name": "ralts" + }, + { + "Id": 281, + "Name": "kirlia" + }, + { + "Id": 282, + "Name": "gardevoir" + }, + { + "Id": 283, + "Name": "surskit" + }, + { + "Id": 284, + "Name": "masquerain" + }, + { + "Id": 285, + "Name": "shroomish" + }, + { + "Id": 286, + "Name": "breloom" + }, + { + "Id": 287, + "Name": "slakoth" + }, + { + "Id": 288, + "Name": "vigoroth" + }, + { + "Id": 289, + "Name": "slaking" + }, + { + "Id": 290, + "Name": "nincada" + }, + { + "Id": 291, + "Name": "ninjask" + }, + { + "Id": 292, + "Name": "shedinja" + }, + { + "Id": 293, + "Name": "whismur" + }, + { + "Id": 294, + "Name": "loudred" + }, + { + "Id": 295, + "Name": "exploud" + }, + { + "Id": 296, + "Name": "makuhita" + }, + { + "Id": 297, + "Name": "hariyama" + }, + { + "Id": 298, + "Name": "azurill" + }, + { + "Id": 299, + "Name": "nosepass" + }, + { + "Id": 300, + "Name": "skitty" + }, + { + "Id": 301, + "Name": "delcatty" + }, + { + "Id": 302, + "Name": "sableye" + }, + { + "Id": 303, + "Name": "mawile" + }, + { + "Id": 304, + "Name": "aron" + }, + { + "Id": 305, + "Name": "lairon" + }, + { + "Id": 306, + "Name": "aggron" + }, + { + "Id": 307, + "Name": "meditite" + }, + { + "Id": 308, + "Name": "medicham" + }, + { + "Id": 309, + "Name": "electrike" + }, + { + "Id": 310, + "Name": "manectric" + }, + { + "Id": 311, + "Name": "plusle" + }, + { + "Id": 312, + "Name": "minun" + }, + { + "Id": 313, + "Name": "volbeat" + }, + { + "Id": 314, + "Name": "illumise" + }, + { + "Id": 315, + "Name": "roselia" + }, + { + "Id": 316, + "Name": "gulpin" + }, + { + "Id": 317, + "Name": "swalot" + }, + { + "Id": 318, + "Name": "carvanha" + }, + { + "Id": 319, + "Name": "sharpedo" + }, + { + "Id": 320, + "Name": "wailmer" + }, + { + "Id": 321, + "Name": "wailord" + }, + { + "Id": 322, + "Name": "numel" + }, + { + "Id": 323, + "Name": "camerupt" + }, + { + "Id": 324, + "Name": "torkoal" + }, + { + "Id": 325, + "Name": "spoink" + }, + { + "Id": 326, + "Name": "grumpig" + }, + { + "Id": 327, + "Name": "spinda" + }, + { + "Id": 328, + "Name": "trapinch" + }, + { + "Id": 329, + "Name": "vibrava" + }, + { + "Id": 330, + "Name": "flygon" + }, + { + "Id": 331, + "Name": "cacnea" + }, + { + "Id": 332, + "Name": "cacturne" + }, + { + "Id": 333, + "Name": "swablu" + }, + { + "Id": 334, + "Name": "altaria" + }, + { + "Id": 335, + "Name": "zangoose" + }, + { + "Id": 336, + "Name": "seviper" + }, + { + "Id": 337, + "Name": "lunatone" + }, + { + "Id": 338, + "Name": "solrock" + }, + { + "Id": 339, + "Name": "barboach" + }, + { + "Id": 340, + "Name": "whiscash" + }, + { + "Id": 341, + "Name": "corphish" + }, + { + "Id": 342, + "Name": "crawdaunt" + }, + { + "Id": 343, + "Name": "baltoy" + }, + { + "Id": 344, + "Name": "claydol" + }, + { + "Id": 345, + "Name": "lileep" + }, + { + "Id": 346, + "Name": "cradily" + }, + { + "Id": 347, + "Name": "anorith" + }, + { + "Id": 348, + "Name": "armaldo" + }, + { + "Id": 349, + "Name": "feebas" + }, + { + "Id": 350, + "Name": "milotic" + }, + { + "Id": 351, + "Name": "castform" + }, + { + "Id": 352, + "Name": "kecleon" + }, + { + "Id": 353, + "Name": "shuppet" + }, + { + "Id": 354, + "Name": "banette" + }, + { + "Id": 355, + "Name": "duskull" + }, + { + "Id": 356, + "Name": "dusclops" + }, + { + "Id": 357, + "Name": "tropius" + }, + { + "Id": 358, + "Name": "chimecho" + }, + { + "Id": 359, + "Name": "absol" + }, + { + "Id": 360, + "Name": "wynaut" + }, + { + "Id": 361, + "Name": "snorunt" + }, + { + "Id": 362, + "Name": "glalie" + }, + { + "Id": 363, + "Name": "spheal" + }, + { + "Id": 364, + "Name": "sealeo" + }, + { + "Id": 365, + "Name": "walrein" + }, + { + "Id": 366, + "Name": "clamperl" + }, + { + "Id": 367, + "Name": "huntail" + }, + { + "Id": 368, + "Name": "gorebyss" + }, + { + "Id": 369, + "Name": "relicanth" + }, + { + "Id": 370, + "Name": "luvdisc" + }, + { + "Id": 371, + "Name": "bagon" + }, + { + "Id": 372, + "Name": "shelgon" + }, + { + "Id": 373, + "Name": "salamence" + }, + { + "Id": 374, + "Name": "beldum" + }, + { + "Id": 375, + "Name": "metang" + }, + { + "Id": 376, + "Name": "metagross" + }, + { + "Id": 377, + "Name": "regirock" + }, + { + "Id": 378, + "Name": "regice" + }, + { + "Id": 379, + "Name": "registeel" + }, + { + "Id": 380, + "Name": "latias" + }, + { + "Id": 381, + "Name": "latios" + }, + { + "Id": 382, + "Name": "kyogre" + }, + { + "Id": 383, + "Name": "groudon" + }, + { + "Id": 384, + "Name": "rayquaza" + }, + { + "Id": 385, + "Name": "jirachi" + }, + { + "Id": 386, + "Name": "deoxys" + }, + { + "Id": 387, + "Name": "turtwig" + }, + { + "Id": 388, + "Name": "grotle" + }, + { + "Id": 389, + "Name": "torterra" + }, + { + "Id": 390, + "Name": "chimchar" + }, + { + "Id": 391, + "Name": "monferno" + }, + { + "Id": 392, + "Name": "infernape" + }, + { + "Id": 393, + "Name": "piplup" + }, + { + "Id": 394, + "Name": "prinplup" + }, + { + "Id": 395, + "Name": "empoleon" + }, + { + "Id": 396, + "Name": "starly" + }, + { + "Id": 397, + "Name": "staravia" + }, + { + "Id": 398, + "Name": "staraptor" + }, + { + "Id": 399, + "Name": "bidoof" + }, + { + "Id": 400, + "Name": "bibarel" + }, + { + "Id": 401, + "Name": "kricketot" + }, + { + "Id": 402, + "Name": "kricketune" + }, + { + "Id": 403, + "Name": "shinx" + }, + { + "Id": 404, + "Name": "luxio" + }, + { + "Id": 405, + "Name": "luxray" + }, + { + "Id": 406, + "Name": "budew" + }, + { + "Id": 407, + "Name": "roserade" + }, + { + "Id": 408, + "Name": "cranidos" + }, + { + "Id": 409, + "Name": "rampardos" + }, + { + "Id": 410, + "Name": "shieldon" + }, + { + "Id": 411, + "Name": "bastiodon" + }, + { + "Id": 412, + "Name": "burmy" + }, + { + "Id": 413, + "Name": "wormadam" + }, + { + "Id": 414, + "Name": "mothim" + }, + { + "Id": 415, + "Name": "combee" + }, + { + "Id": 416, + "Name": "vespiquen" + }, + { + "Id": 417, + "Name": "pachirisu" + }, + { + "Id": 418, + "Name": "buizel" + }, + { + "Id": 419, + "Name": "floatzel" + }, + { + "Id": 420, + "Name": "cherubi" + }, + { + "Id": 421, + "Name": "cherrim" + }, + { + "Id": 422, + "Name": "shellos" + }, + { + "Id": 423, + "Name": "gastrodon" + }, + { + "Id": 424, + "Name": "ambipom" + }, + { + "Id": 425, + "Name": "drifloon" + }, + { + "Id": 426, + "Name": "drifblim" + }, + { + "Id": 427, + "Name": "buneary" + }, + { + "Id": 428, + "Name": "lopunny" + }, + { + "Id": 429, + "Name": "mismagius" + }, + { + "Id": 430, + "Name": "honchkrow" + }, + { + "Id": 431, + "Name": "glameow" + }, + { + "Id": 432, + "Name": "purugly" + }, + { + "Id": 433, + "Name": "chingling" + }, + { + "Id": 434, + "Name": "stunky" + }, + { + "Id": 435, + "Name": "skuntank" + }, + { + "Id": 436, + "Name": "bronzor" + }, + { + "Id": 437, + "Name": "bronzong" + }, + { + "Id": 438, + "Name": "bonsly" + }, + { + "Id": 439, + "Name": "mime" + }, + { + "Id": 440, + "Name": "happiny" + }, + { + "Id": 441, + "Name": "chatot" + }, + { + "Id": 442, + "Name": "spiritomb" + }, + { + "Id": 443, + "Name": "gible" + }, + { + "Id": 444, + "Name": "gabite" + }, + { + "Id": 445, + "Name": "garchomp" + }, + { + "Id": 446, + "Name": "munchlax" + }, + { + "Id": 447, + "Name": "riolu" + }, + { + "Id": 448, + "Name": "lucario" + }, + { + "Id": 449, + "Name": "hippopotas" + }, + { + "Id": 450, + "Name": "hippowdon" + }, + { + "Id": 451, + "Name": "skorupi" + }, + { + "Id": 452, + "Name": "drapion" + }, + { + "Id": 453, + "Name": "croagunk" + }, + { + "Id": 454, + "Name": "toxicroak" + }, + { + "Id": 455, + "Name": "carnivine" + }, + { + "Id": 456, + "Name": "finneon" + }, + { + "Id": 457, + "Name": "lumineon" + }, + { + "Id": 458, + "Name": "mantyke" + }, + { + "Id": 459, + "Name": "snover" + }, + { + "Id": 460, + "Name": "abomasnow" + }, + { + "Id": 461, + "Name": "weavile" + }, + { + "Id": 462, + "Name": "magnezone" + }, + { + "Id": 463, + "Name": "lickilicky" + }, + { + "Id": 464, + "Name": "rhyperior" + }, + { + "Id": 465, + "Name": "tangrowth" + }, + { + "Id": 466, + "Name": "electivire" + }, + { + "Id": 467, + "Name": "magmortar" + }, + { + "Id": 468, + "Name": "togekiss" + }, + { + "Id": 469, + "Name": "yanmega" + }, + { + "Id": 470, + "Name": "leafeon" + }, + { + "Id": 471, + "Name": "glaceon" + }, + { + "Id": 472, + "Name": "gliscor" + }, + { + "Id": 473, + "Name": "mamoswine" + }, + { + "Id": 474, + "Name": "porygon" + }, + { + "Id": 475, + "Name": "gallade" + }, + { + "Id": 476, + "Name": "probopass" + }, + { + "Id": 477, + "Name": "dusknoir" + }, + { + "Id": 478, + "Name": "froslass" + }, + { + "Id": 479, + "Name": "rotom" + }, + { + "Id": 480, + "Name": "uxie" + }, + { + "Id": 481, + "Name": "mesprit" + }, + { + "Id": 482, + "Name": "azelf" + }, + { + "Id": 483, + "Name": "dialga" + }, + { + "Id": 484, + "Name": "palkia" + }, + { + "Id": 485, + "Name": "heatran" + }, + { + "Id": 486, + "Name": "regigigas" + }, + { + "Id": 487, + "Name": "giratina" + }, + { + "Id": 488, + "Name": "cresselia" + }, + { + "Id": 489, + "Name": "phione" + }, + { + "Id": 490, + "Name": "manaphy" + }, + { + "Id": 491, + "Name": "darkrai" + }, + { + "Id": 492, + "Name": "shaymin" + }, + { + "Id": 493, + "Name": "arceus" + }, + { + "Id": 494, + "Name": "victini" + }, + { + "Id": 495, + "Name": "snivy" + }, + { + "Id": 496, + "Name": "servine" + }, + { + "Id": 497, + "Name": "serperior" + }, + { + "Id": 498, + "Name": "tepig" + }, + { + "Id": 499, + "Name": "pignite" + }, + { + "Id": 500, + "Name": "emboar" + }, + { + "Id": 501, + "Name": "oshawott" + }, + { + "Id": 502, + "Name": "dewott" + }, + { + "Id": 503, + "Name": "samurott" + }, + { + "Id": 504, + "Name": "patrat" + }, + { + "Id": 505, + "Name": "watchog" + }, + { + "Id": 506, + "Name": "lillipup" + }, + { + "Id": 507, + "Name": "herdier" + }, + { + "Id": 508, + "Name": "stoutland" + }, + { + "Id": 509, + "Name": "purrloin" + }, + { + "Id": 510, + "Name": "liepard" + }, + { + "Id": 511, + "Name": "pansage" + }, + { + "Id": 512, + "Name": "simisage" + }, + { + "Id": 513, + "Name": "pansear" + }, + { + "Id": 514, + "Name": "simisear" + }, + { + "Id": 515, + "Name": "panpour" + }, + { + "Id": 516, + "Name": "simipour" + }, + { + "Id": 517, + "Name": "munna" + }, + { + "Id": 518, + "Name": "musharna" + }, + { + "Id": 519, + "Name": "pidove" + }, + { + "Id": 520, + "Name": "tranquill" + }, + { + "Id": 521, + "Name": "unfezant" + }, + { + "Id": 522, + "Name": "blitzle" + }, + { + "Id": 523, + "Name": "zebstrika" + }, + { + "Id": 524, + "Name": "roggenrola" + }, + { + "Id": 525, + "Name": "boldore" + }, + { + "Id": 526, + "Name": "gigalith" + }, + { + "Id": 527, + "Name": "woobat" + }, + { + "Id": 528, + "Name": "swoobat" + }, + { + "Id": 529, + "Name": "drilbur" + }, + { + "Id": 530, + "Name": "excadrill" + }, + { + "Id": 531, + "Name": "audino" + }, + { + "Id": 532, + "Name": "timburr" + }, + { + "Id": 533, + "Name": "gurdurr" + }, + { + "Id": 534, + "Name": "conkeldurr" + }, + { + "Id": 535, + "Name": "tympole" + }, + { + "Id": 536, + "Name": "palpitoad" + }, + { + "Id": 537, + "Name": "seismitoad" + }, + { + "Id": 538, + "Name": "throh" + }, + { + "Id": 539, + "Name": "sawk" + }, + { + "Id": 540, + "Name": "sewaddle" + }, + { + "Id": 541, + "Name": "swadloon" + }, + { + "Id": 542, + "Name": "leavanny" + }, + { + "Id": 543, + "Name": "venipede" + }, + { + "Id": 544, + "Name": "whirlipede" + }, + { + "Id": 545, + "Name": "scolipede" + }, + { + "Id": 546, + "Name": "cottonee" + }, + { + "Id": 547, + "Name": "whimsicott" + }, + { + "Id": 548, + "Name": "petilil" + }, + { + "Id": 549, + "Name": "lilligant" + }, + { + "Id": 550, + "Name": "basculin" + }, + { + "Id": 551, + "Name": "sandile" + }, + { + "Id": 552, + "Name": "krokorok" + }, + { + "Id": 553, + "Name": "krookodile" + }, + { + "Id": 554, + "Name": "darumaka" + }, + { + "Id": 555, + "Name": "darmanitan" + }, + { + "Id": 556, + "Name": "maractus" + }, + { + "Id": 557, + "Name": "dwebble" + }, + { + "Id": 558, + "Name": "crustle" + }, + { + "Id": 559, + "Name": "scraggy" + }, + { + "Id": 560, + "Name": "scrafty" + }, + { + "Id": 561, + "Name": "sigilyph" + }, + { + "Id": 562, + "Name": "yamask" + }, + { + "Id": 563, + "Name": "cofagrigus" + }, + { + "Id": 564, + "Name": "tirtouga" + }, + { + "Id": 565, + "Name": "carracosta" + }, + { + "Id": 566, + "Name": "archen" + }, + { + "Id": 567, + "Name": "archeops" + }, + { + "Id": 568, + "Name": "trubbish" + }, + { + "Id": 569, + "Name": "garbodor" + }, + { + "Id": 570, + "Name": "zorua" + }, + { + "Id": 571, + "Name": "zoroark" + }, + { + "Id": 572, + "Name": "minccino" + }, + { + "Id": 573, + "Name": "cinccino" + }, + { + "Id": 574, + "Name": "gothita" + }, + { + "Id": 575, + "Name": "gothorita" + }, + { + "Id": 576, + "Name": "gothitelle" + }, + { + "Id": 577, + "Name": "solosis" + }, + { + "Id": 578, + "Name": "duosion" + }, + { + "Id": 579, + "Name": "reuniclus" + }, + { + "Id": 580, + "Name": "ducklett" + }, + { + "Id": 581, + "Name": "swanna" + }, + { + "Id": 582, + "Name": "vanillite" + }, + { + "Id": 583, + "Name": "vanillish" + }, + { + "Id": 584, + "Name": "vanilluxe" + }, + { + "Id": 585, + "Name": "deerling" + }, + { + "Id": 586, + "Name": "sawsbuck" + }, + { + "Id": 587, + "Name": "emolga" + }, + { + "Id": 588, + "Name": "karrablast" + }, + { + "Id": 589, + "Name": "escavalier" + }, + { + "Id": 590, + "Name": "foongus" + }, + { + "Id": 591, + "Name": "amoonguss" + }, + { + "Id": 592, + "Name": "frillish" + }, + { + "Id": 593, + "Name": "jellicent" + }, + { + "Id": 594, + "Name": "alomomola" + }, + { + "Id": 595, + "Name": "joltik" + }, + { + "Id": 596, + "Name": "galvantula" + }, + { + "Id": 597, + "Name": "ferroseed" + }, + { + "Id": 598, + "Name": "ferrothorn" + }, + { + "Id": 599, + "Name": "klink" + }, + { + "Id": 600, + "Name": "klang" + }, + { + "Id": 601, + "Name": "klinklang" + }, + { + "Id": 602, + "Name": "tynamo" + }, + { + "Id": 603, + "Name": "eelektrik" + }, + { + "Id": 604, + "Name": "eelektross" + }, + { + "Id": 605, + "Name": "elgyem" + }, + { + "Id": 606, + "Name": "beheeyem" + }, + { + "Id": 607, + "Name": "litwick" + }, + { + "Id": 608, + "Name": "lampent" + }, + { + "Id": 609, + "Name": "chandelure" + }, + { + "Id": 610, + "Name": "axew" + }, + { + "Id": 611, + "Name": "fraxure" + }, + { + "Id": 612, + "Name": "haxorus" + }, + { + "Id": 613, + "Name": "cubchoo" + }, + { + "Id": 614, + "Name": "beartic" + }, + { + "Id": 615, + "Name": "cryogonal" + }, + { + "Id": 616, + "Name": "shelmet" + }, + { + "Id": 617, + "Name": "accelgor" + }, + { + "Id": 618, + "Name": "stunfisk" + }, + { + "Id": 619, + "Name": "mienfoo" + }, + { + "Id": 620, + "Name": "mienshao" + }, + { + "Id": 621, + "Name": "druddigon" + }, + { + "Id": 622, + "Name": "golett" + }, + { + "Id": 623, + "Name": "golurk" + }, + { + "Id": 624, + "Name": "pawniard" + }, + { + "Id": 625, + "Name": "bisharp" + }, + { + "Id": 626, + "Name": "bouffalant" + }, + { + "Id": 627, + "Name": "rufflet" + }, + { + "Id": 628, + "Name": "braviary" + }, + { + "Id": 629, + "Name": "vullaby" + }, + { + "Id": 630, + "Name": "mandibuzz" + }, + { + "Id": 631, + "Name": "heatmor" + }, + { + "Id": 632, + "Name": "durant" + }, + { + "Id": 633, + "Name": "deino" + }, + { + "Id": 634, + "Name": "zweilous" + }, + { + "Id": 635, + "Name": "hydreigon" + }, + { + "Id": 636, + "Name": "larvesta" + }, + { + "Id": 637, + "Name": "volcarona" + }, + { + "Id": 638, + "Name": "cobalion" + }, + { + "Id": 639, + "Name": "terrakion" + }, + { + "Id": 640, + "Name": "virizion" + }, + { + "Id": 641, + "Name": "tornadus" + }, + { + "Id": 642, + "Name": "thundurus" + }, + { + "Id": 643, + "Name": "reshiram" + }, + { + "Id": 644, + "Name": "zekrom" + }, + { + "Id": 645, + "Name": "landorus" + }, + { + "Id": 646, + "Name": "kyurem" + }, + { + "Id": 647, + "Name": "keldeo" + }, + { + "Id": 648, + "Name": "meloetta" + }, + { + "Id": 649, + "Name": "genesect" + }, + { + "Id": 650, + "Name": "chespin" + }, + { + "Id": 651, + "Name": "quilladin" + }, + { + "Id": 652, + "Name": "chesnaught" + }, + { + "Id": 653, + "Name": "fennekin" + }, + { + "Id": 654, + "Name": "braixen" + }, + { + "Id": 655, + "Name": "delphox" + }, + { + "Id": 656, + "Name": "froakie" + }, + { + "Id": 657, + "Name": "frogadier" + }, + { + "Id": 658, + "Name": "greninja" + }, + { + "Id": 659, + "Name": "bunnelby" + }, + { + "Id": 660, + "Name": "diggersby" + }, + { + "Id": 661, + "Name": "fletchling" + }, + { + "Id": 662, + "Name": "fletchinder" + }, + { + "Id": 663, + "Name": "talonflame" + }, + { + "Id": 664, + "Name": "scatterbug" + }, + { + "Id": 665, + "Name": "spewpa" + }, + { + "Id": 666, + "Name": "vivillon" + }, + { + "Id": 667, + "Name": "litleo" + }, + { + "Id": 668, + "Name": "pyroar" + }, + { + "Id": 669, + "Name": "flabebe" + }, + { + "Id": 670, + "Name": "floette" + }, + { + "Id": 671, + "Name": "florges" + }, + { + "Id": 672, + "Name": "skiddo" + }, + { + "Id": 673, + "Name": "gogoat" + }, + { + "Id": 674, + "Name": "pancham" + }, + { + "Id": 675, + "Name": "pangoro" + }, + { + "Id": 676, + "Name": "furfrou" + }, + { + "Id": 677, + "Name": "espurr" + }, + { + "Id": 678, + "Name": "meowstic" + }, + { + "Id": 679, + "Name": "honedge" + }, + { + "Id": 680, + "Name": "doublade" + }, + { + "Id": 681, + "Name": "aegislash" + }, + { + "Id": 682, + "Name": "spritzee" + }, + { + "Id": 683, + "Name": "aromatisse" + }, + { + "Id": 684, + "Name": "swirlix" + }, + { + "Id": 685, + "Name": "slurpuff" + }, + { + "Id": 686, + "Name": "inkay" + }, + { + "Id": 687, + "Name": "malamar" + }, + { + "Id": 688, + "Name": "binacle" + }, + { + "Id": 689, + "Name": "barbaracle" + }, + { + "Id": 690, + "Name": "skrelp" + }, + { + "Id": 691, + "Name": "dragalge" + }, + { + "Id": 692, + "Name": "clauncher" + }, + { + "Id": 693, + "Name": "clawitzer" + }, + { + "Id": 694, + "Name": "helioptile" + }, + { + "Id": 695, + "Name": "heliolisk" + }, + { + "Id": 696, + "Name": "tyrunt" + }, + { + "Id": 697, + "Name": "tyrantrum" + }, + { + "Id": 698, + "Name": "amaura" + }, + { + "Id": 699, + "Name": "aurorus" + }, + { + "Id": 700, + "Name": "sylveon" + }, + { + "Id": 701, + "Name": "hawlucha" + }, + { + "Id": 702, + "Name": "dedenne" + }, + { + "Id": 703, + "Name": "carbink" + }, + { + "Id": 704, + "Name": "goomy" + }, + { + "Id": 705, + "Name": "sliggoo" + }, + { + "Id": 706, + "Name": "goodra" + }, + { + "Id": 707, + "Name": "klefki" + }, + { + "Id": 708, + "Name": "phantump" + }, + { + "Id": 709, + "Name": "trevenant" + }, + { + "Id": 710, + "Name": "pumpkaboo" + }, + { + "Id": 711, + "Name": "gourgeist" + }, + { + "Id": 712, + "Name": "bergmite" + }, + { + "Id": 713, + "Name": "avalugg" + }, + { + "Id": 714, + "Name": "noibat" + }, + { + "Id": 715, + "Name": "noivern" + }, + { + "Id": 716, + "Name": "xerneas" + }, + { + "Id": 717, + "Name": "yveltal" + }, + { + "Id": 718, + "Name": "zygarde" + }, + { + "Id": 719, + "Name": "diancie" + }, + { + "Id": 720, + "Name": "hoopa" + }, + { + "Id": 721, + "Name": "volcanion" + }, + { + "Id": 10001, + "Name": "deoxys" + }, + { + "Id": 10002, + "Name": "deoxys" + }, + { + "Id": 10003, + "Name": "deoxys" + }, + { + "Id": 10004, + "Name": "wormadam" + }, + { + "Id": 10005, + "Name": "wormadam" + }, + { + "Id": 10006, + "Name": "shaymin" + }, + { + "Id": 10007, + "Name": "giratina" + }, + { + "Id": 10008, + "Name": "rotom" + }, + { + "Id": 10009, + "Name": "rotom" + }, + { + "Id": 10010, + "Name": "rotom" + }, + { + "Id": 10011, + "Name": "rotom" + }, + { + "Id": 10012, + "Name": "rotom" + }, + { + "Id": 10013, + "Name": "castform" + }, + { + "Id": 10014, + "Name": "castform" + }, + { + "Id": 10015, + "Name": "castform" + }, + { + "Id": 10016, + "Name": "basculin" + }, + { + "Id": 10017, + "Name": "darmanitan" + }, + { + "Id": 10018, + "Name": "meloetta" + }, + { + "Id": 10019, + "Name": "tornadus" + }, + { + "Id": 10020, + "Name": "thundurus" + }, + { + "Id": 10021, + "Name": "landorus" + }, + { + "Id": 10022, + "Name": "kyurem" + }, + { + "Id": 10023, + "Name": "kyurem" + }, + { + "Id": 10024, + "Name": "keldeo" + }, + { + "Id": 10025, + "Name": "meowstic" + }, + { + "Id": 10026, + "Name": "aegislash" + }, + { + "Id": 10027, + "Name": "pumpkaboo" + }, + { + "Id": 10028, + "Name": "pumpkaboo" + }, + { + "Id": 10029, + "Name": "pumpkaboo" + }, + { + "Id": 10030, + "Name": "gourgeist" + }, + { + "Id": 10031, + "Name": "gourgeist" + }, + { + "Id": 10032, + "Name": "gourgeist" + }, + { + "Id": 10033, + "Name": "venusaur" + }, + { + "Id": 10034, + "Name": "charizard" + }, + { + "Id": 10035, + "Name": "charizard" + }, + { + "Id": 10036, + "Name": "blastoise" + }, + { + "Id": 10037, + "Name": "alakazam" + }, + { + "Id": 10038, + "Name": "gengar" + }, + { + "Id": 10039, + "Name": "kangaskhan" + }, + { + "Id": 10040, + "Name": "pinsir" + }, + { + "Id": 10041, + "Name": "gyarados" + }, + { + "Id": 10042, + "Name": "aerodactyl" + }, + { + "Id": 10043, + "Name": "mewtwo" + }, + { + "Id": 10044, + "Name": "mewtwo" + }, + { + "Id": 10045, + "Name": "ampharos" + }, + { + "Id": 10046, + "Name": "scizor" + }, + { + "Id": 10047, + "Name": "heracross" + }, + { + "Id": 10048, + "Name": "houndoom" + }, + { + "Id": 10049, + "Name": "tyranitar" + }, + { + "Id": 10050, + "Name": "blaziken" + }, + { + "Id": 10051, + "Name": "gardevoir" + }, + { + "Id": 10052, + "Name": "mawile" + }, + { + "Id": 10053, + "Name": "aggron" + }, + { + "Id": 10054, + "Name": "medicham" + }, + { + "Id": 10055, + "Name": "manectric" + }, + { + "Id": 10056, + "Name": "banette" + }, + { + "Id": 10057, + "Name": "absol" + }, + { + "Id": 10058, + "Name": "garchomp" + }, + { + "Id": 10059, + "Name": "lucario" + }, + { + "Id": 10060, + "Name": "abomasnow" + }, + { + "Id": 10061, + "Name": "floette" + }, + { + "Id": 10062, + "Name": "latias" + }, + { + "Id": 10063, + "Name": "latios" + }, + { + "Id": 10064, + "Name": "swampert" + }, + { + "Id": 10065, + "Name": "sceptile" + }, + { + "Id": 10066, + "Name": "sableye" + }, + { + "Id": 10067, + "Name": "altaria" + }, + { + "Id": 10068, + "Name": "gallade" + }, + { + "Id": 10069, + "Name": "audino" + }, + { + "Id": 10070, + "Name": "sharpedo" + }, + { + "Id": 10071, + "Name": "slowbro" + }, + { + "Id": 10072, + "Name": "steelix" + }, + { + "Id": 10073, + "Name": "pidgeot" + }, + { + "Id": 10074, + "Name": "glalie" + }, + { + "Id": 10075, + "Name": "diancie" + }, + { + "Id": 10076, + "Name": "metagross" + }, + { + "Id": 10077, + "Name": "kyogre" + }, + { + "Id": 10078, + "Name": "groudon" + }, + { + "Id": 10079, + "Name": "rayquaza" + }, + { + "Id": 10080, + "Name": "pikachu" + }, + { + "Id": 10081, + "Name": "pikachu" + }, + { + "Id": 10082, + "Name": "pikachu" + }, + { + "Id": 10083, + "Name": "pikachu" + }, + { + "Id": 10084, + "Name": "pikachu" + }, + { + "Id": 10085, + "Name": "pikachu" + }, + { + "Id": 10086, + "Name": "hoopa" + }, + { + "Id": 10087, + "Name": "camerupt" + }, + { + "Id": 10088, + "Name": "lopunny" + }, + { + "Id": 10089, + "Name": "salamence" + }, + { + "Id": 10090, + "Name": "beedrill" + } +] \ No newline at end of file From 0cc3102f2b0d286f05f2675ff3c414c90d864649 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Mar 2017 11:56:42 +0100 Subject: [PATCH 05/42] mime jr fix --- src/NadekoBot/data/pokemon/name-id_map.json | 3246 ------------------ src/NadekoBot/data/pokemon/name-id_map2.json | 2 +- 2 files changed, 1 insertion(+), 3247 deletions(-) delete mode 100644 src/NadekoBot/data/pokemon/name-id_map.json diff --git a/src/NadekoBot/data/pokemon/name-id_map.json b/src/NadekoBot/data/pokemon/name-id_map.json deleted file mode 100644 index 334a2380..00000000 --- a/src/NadekoBot/data/pokemon/name-id_map.json +++ /dev/null @@ -1,3246 +0,0 @@ -[ - { - "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" - }, - { - "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": "ampharos" - }, - { - "Id": 182, - "Name": "bellossom" - }, - { - "Id": 183, - "Name": "marill" - }, - { - "Id": 184, - "Name": "azumarill" - }, - { - "Id": 185, - "Name": "sudowoodo" - }, - { - "Id": 186, - "Name": "politoed" - }, - { - "Id": 187, - "Name": "hoppip" - }, - { - "Id": 188, - "Name": "skiploom" - }, - { - "Id": 189, - "Name": "jumpluff" - }, - { - "Id": 190, - "Name": "aipom" - }, - { - "Id": 191, - "Name": "sunkern" - }, - { - "Id": 192, - "Name": "sunflora" - }, - { - "Id": 193, - "Name": "yanma" - }, - { - "Id": 194, - "Name": "wooper" - }, - { - "Id": 195, - "Name": "quagsire" - }, - { - "Id": 196, - "Name": "espeon" - }, - { - "Id": 197, - "Name": "umbreon" - }, - { - "Id": 198, - "Name": "murkrow" - }, - { - "Id": 199, - "Name": "slowking" - }, - { - "Id": 200, - "Name": "misdreavus" - }, - { - "Id": 201, - "Name": "unown" - }, - { - "Id": 202, - "Name": "wobbuffet" - }, - { - "Id": 203, - "Name": "girafarig" - }, - { - "Id": 204, - "Name": "pineco" - }, - { - "Id": 205, - "Name": "forretress" - }, - { - "Id": 206, - "Name": "dunsparce" - }, - { - "Id": 207, - "Name": "gligar" - }, - { - "Id": 208, - "Name": "steelix" - }, - { - "Id": 209, - "Name": "snubbull" - }, - { - "Id": 210, - "Name": "granbull" - }, - { - "Id": 211, - "Name": "qwilfish" - }, - { - "Id": 212, - "Name": "scizor" - }, - { - "Id": 213, - "Name": "shuckle" - }, - { - "Id": 214, - "Name": "heracross" - }, - { - "Id": 215, - "Name": "sneasel" - }, - { - "Id": 216, - "Name": "teddiursa" - }, - { - "Id": 217, - "Name": "ursaring" - }, - { - "Id": 218, - "Name": "slugma" - }, - { - "Id": 219, - "Name": "magcargo" - }, - { - "Id": 220, - "Name": "swinub" - }, - { - "Id": 221, - "Name": "piloswine" - }, - { - "Id": 222, - "Name": "corsola" - }, - { - "Id": 223, - "Name": "remoraid" - }, - { - "Id": 224, - "Name": "octillery" - }, - { - "Id": 225, - "Name": "delibird" - }, - { - "Id": 226, - "Name": "mantine" - }, - { - "Id": 227, - "Name": "skarmory" - }, - { - "Id": 228, - "Name": "houndour" - }, - { - "Id": 229, - "Name": "houndoom" - }, - { - "Id": 230, - "Name": "kingdra" - }, - { - "Id": 231, - "Name": "phanpy" - }, - { - "Id": 232, - "Name": "donphan" - }, - { - "Id": 233, - "Name": "porygon2" - }, - { - "Id": 234, - "Name": "stantler" - }, - { - "Id": 235, - "Name": "smeargle" - }, - { - "Id": 236, - "Name": "tyrogue" - }, - { - "Id": 237, - "Name": "hitmontop" - }, - { - "Id": 238, - "Name": "smoochum" - }, - { - "Id": 239, - "Name": "elekid" - }, - { - "Id": 240, - "Name": "magby" - }, - { - "Id": 241, - "Name": "miltank" - }, - { - "Id": 242, - "Name": "blissey" - }, - { - "Id": 243, - "Name": "raikou" - }, - { - "Id": 244, - "Name": "entei" - }, - { - "Id": 245, - "Name": "suicune" - }, - { - "Id": 246, - "Name": "larvitar" - }, - { - "Id": 247, - "Name": "pupitar" - }, - { - "Id": 248, - "Name": "tyranitar" - }, - { - "Id": 249, - "Name": "lugia" - }, - { - "Id": 250, - "Name": "ho" - }, - { - "Id": 251, - "Name": "celebi" - }, - { - "Id": 252, - "Name": "treecko" - }, - { - "Id": 253, - "Name": "grovyle" - }, - { - "Id": 254, - "Name": "sceptile" - }, - { - "Id": 255, - "Name": "torchic" - }, - { - "Id": 256, - "Name": "combusken" - }, - { - "Id": 257, - "Name": "blaziken" - }, - { - "Id": 258, - "Name": "mudkip" - }, - { - "Id": 259, - "Name": "marshtomp" - }, - { - "Id": 260, - "Name": "swampert" - }, - { - "Id": 261, - "Name": "poochyena" - }, - { - "Id": 262, - "Name": "mightyena" - }, - { - "Id": 263, - "Name": "zigzagoon" - }, - { - "Id": 264, - "Name": "linoone" - }, - { - "Id": 265, - "Name": "wurmple" - }, - { - "Id": 266, - "Name": "silcoon" - }, - { - "Id": 267, - "Name": "beautifly" - }, - { - "Id": 268, - "Name": "cascoon" - }, - { - "Id": 269, - "Name": "dustox" - }, - { - "Id": 270, - "Name": "lotad" - }, - { - "Id": 271, - "Name": "lombre" - }, - { - "Id": 272, - "Name": "ludicolo" - }, - { - "Id": 273, - "Name": "seedot" - }, - { - "Id": 274, - "Name": "nuzleaf" - }, - { - "Id": 275, - "Name": "shiftry" - }, - { - "Id": 276, - "Name": "taillow" - }, - { - "Id": 277, - "Name": "swellow" - }, - { - "Id": 278, - "Name": "wingull" - }, - { - "Id": 279, - "Name": "pelipper" - }, - { - "Id": 280, - "Name": "ralts" - }, - { - "Id": 281, - "Name": "kirlia" - }, - { - "Id": 282, - "Name": "gardevoir" - }, - { - "Id": 283, - "Name": "surskit" - }, - { - "Id": 284, - "Name": "masquerain" - }, - { - "Id": 285, - "Name": "shroomish" - }, - { - "Id": 286, - "Name": "breloom" - }, - { - "Id": 287, - "Name": "slakoth" - }, - { - "Id": 288, - "Name": "vigoroth" - }, - { - "Id": 289, - "Name": "slaking" - }, - { - "Id": 290, - "Name": "nincada" - }, - { - "Id": 291, - "Name": "ninjask" - }, - { - "Id": 292, - "Name": "shedinja" - }, - { - "Id": 293, - "Name": "whismur" - }, - { - "Id": 294, - "Name": "loudred" - }, - { - "Id": 295, - "Name": "exploud" - }, - { - "Id": 296, - "Name": "makuhita" - }, - { - "Id": 297, - "Name": "hariyama" - }, - { - "Id": 298, - "Name": "azurill" - }, - { - "Id": 299, - "Name": "nosepass" - }, - { - "Id": 300, - "Name": "skitty" - }, - { - "Id": 301, - "Name": "delcatty" - }, - { - "Id": 302, - "Name": "sableye" - }, - { - "Id": 303, - "Name": "mawile" - }, - { - "Id": 304, - "Name": "aron" - }, - { - "Id": 305, - "Name": "lairon" - }, - { - "Id": 306, - "Name": "aggron" - }, - { - "Id": 307, - "Name": "meditite" - }, - { - "Id": 308, - "Name": "medicham" - }, - { - "Id": 309, - "Name": "electrike" - }, - { - "Id": 310, - "Name": "manectric" - }, - { - "Id": 311, - "Name": "plusle" - }, - { - "Id": 312, - "Name": "minun" - }, - { - "Id": 313, - "Name": "volbeat" - }, - { - "Id": 314, - "Name": "illumise" - }, - { - "Id": 315, - "Name": "roselia" - }, - { - "Id": 316, - "Name": "gulpin" - }, - { - "Id": 317, - "Name": "swalot" - }, - { - "Id": 318, - "Name": "carvanha" - }, - { - "Id": 319, - "Name": "sharpedo" - }, - { - "Id": 320, - "Name": "wailmer" - }, - { - "Id": 321, - "Name": "wailord" - }, - { - "Id": 322, - "Name": "numel" - }, - { - "Id": 323, - "Name": "camerupt" - }, - { - "Id": 324, - "Name": "torkoal" - }, - { - "Id": 325, - "Name": "spoink" - }, - { - "Id": 326, - "Name": "grumpig" - }, - { - "Id": 327, - "Name": "spinda" - }, - { - "Id": 328, - "Name": "trapinch" - }, - { - "Id": 329, - "Name": "vibrava" - }, - { - "Id": 330, - "Name": "flygon" - }, - { - "Id": 331, - "Name": "cacnea" - }, - { - "Id": 332, - "Name": "cacturne" - }, - { - "Id": 333, - "Name": "swablu" - }, - { - "Id": 334, - "Name": "altaria" - }, - { - "Id": 335, - "Name": "zangoose" - }, - { - "Id": 336, - "Name": "seviper" - }, - { - "Id": 337, - "Name": "lunatone" - }, - { - "Id": 338, - "Name": "solrock" - }, - { - "Id": 339, - "Name": "barboach" - }, - { - "Id": 340, - "Name": "whiscash" - }, - { - "Id": 341, - "Name": "corphish" - }, - { - "Id": 342, - "Name": "crawdaunt" - }, - { - "Id": 343, - "Name": "baltoy" - }, - { - "Id": 344, - "Name": "claydol" - }, - { - "Id": 345, - "Name": "lileep" - }, - { - "Id": 346, - "Name": "cradily" - }, - { - "Id": 347, - "Name": "anorith" - }, - { - "Id": 348, - "Name": "armaldo" - }, - { - "Id": 349, - "Name": "feebas" - }, - { - "Id": 350, - "Name": "milotic" - }, - { - "Id": 351, - "Name": "castform" - }, - { - "Id": 352, - "Name": "kecleon" - }, - { - "Id": 353, - "Name": "shuppet" - }, - { - "Id": 354, - "Name": "banette" - }, - { - "Id": 355, - "Name": "duskull" - }, - { - "Id": 356, - "Name": "dusclops" - }, - { - "Id": 357, - "Name": "tropius" - }, - { - "Id": 358, - "Name": "chimecho" - }, - { - "Id": 359, - "Name": "absol" - }, - { - "Id": 360, - "Name": "wynaut" - }, - { - "Id": 361, - "Name": "snorunt" - }, - { - "Id": 362, - "Name": "glalie" - }, - { - "Id": 363, - "Name": "spheal" - }, - { - "Id": 364, - "Name": "sealeo" - }, - { - "Id": 365, - "Name": "walrein" - }, - { - "Id": 366, - "Name": "clamperl" - }, - { - "Id": 367, - "Name": "huntail" - }, - { - "Id": 368, - "Name": "gorebyss" - }, - { - "Id": 369, - "Name": "relicanth" - }, - { - "Id": 370, - "Name": "luvdisc" - }, - { - "Id": 371, - "Name": "bagon" - }, - { - "Id": 372, - "Name": "shelgon" - }, - { - "Id": 373, - "Name": "salamence" - }, - { - "Id": 374, - "Name": "beldum" - }, - { - "Id": 375, - "Name": "metang" - }, - { - "Id": 376, - "Name": "metagross" - }, - { - "Id": 377, - "Name": "regirock" - }, - { - "Id": 378, - "Name": "regice" - }, - { - "Id": 379, - "Name": "registeel" - }, - { - "Id": 380, - "Name": "latias" - }, - { - "Id": 381, - "Name": "latios" - }, - { - "Id": 382, - "Name": "kyogre" - }, - { - "Id": 383, - "Name": "groudon" - }, - { - "Id": 384, - "Name": "rayquaza" - }, - { - "Id": 385, - "Name": "jirachi" - }, - { - "Id": 386, - "Name": "deoxys" - }, - { - "Id": 387, - "Name": "turtwig" - }, - { - "Id": 388, - "Name": "grotle" - }, - { - "Id": 389, - "Name": "torterra" - }, - { - "Id": 390, - "Name": "chimchar" - }, - { - "Id": 391, - "Name": "monferno" - }, - { - "Id": 392, - "Name": "infernape" - }, - { - "Id": 393, - "Name": "piplup" - }, - { - "Id": 394, - "Name": "prinplup" - }, - { - "Id": 395, - "Name": "empoleon" - }, - { - "Id": 396, - "Name": "starly" - }, - { - "Id": 397, - "Name": "staravia" - }, - { - "Id": 398, - "Name": "staraptor" - }, - { - "Id": 399, - "Name": "bidoof" - }, - { - "Id": 400, - "Name": "bibarel" - }, - { - "Id": 401, - "Name": "kricketot" - }, - { - "Id": 402, - "Name": "kricketune" - }, - { - "Id": 403, - "Name": "shinx" - }, - { - "Id": 404, - "Name": "luxio" - }, - { - "Id": 405, - "Name": "luxray" - }, - { - "Id": 406, - "Name": "budew" - }, - { - "Id": 407, - "Name": "roserade" - }, - { - "Id": 408, - "Name": "cranidos" - }, - { - "Id": 409, - "Name": "rampardos" - }, - { - "Id": 410, - "Name": "shieldon" - }, - { - "Id": 411, - "Name": "bastiodon" - }, - { - "Id": 412, - "Name": "burmy" - }, - { - "Id": 413, - "Name": "wormadam" - }, - { - "Id": 414, - "Name": "mothim" - }, - { - "Id": 415, - "Name": "combee" - }, - { - "Id": 416, - "Name": "vespiquen" - }, - { - "Id": 417, - "Name": "pachirisu" - }, - { - "Id": 418, - "Name": "buizel" - }, - { - "Id": 419, - "Name": "floatzel" - }, - { - "Id": 420, - "Name": "cherubi" - }, - { - "Id": 421, - "Name": "cherrim" - }, - { - "Id": 422, - "Name": "shellos" - }, - { - "Id": 423, - "Name": "gastrodon" - }, - { - "Id": 424, - "Name": "ambipom" - }, - { - "Id": 425, - "Name": "drifloon" - }, - { - "Id": 426, - "Name": "drifblim" - }, - { - "Id": 427, - "Name": "buneary" - }, - { - "Id": 428, - "Name": "lopunny" - }, - { - "Id": 429, - "Name": "mismagius" - }, - { - "Id": 430, - "Name": "honchkrow" - }, - { - "Id": 431, - "Name": "glameow" - }, - { - "Id": 432, - "Name": "purugly" - }, - { - "Id": 433, - "Name": "chingling" - }, - { - "Id": 434, - "Name": "stunky" - }, - { - "Id": 435, - "Name": "skuntank" - }, - { - "Id": 436, - "Name": "bronzor" - }, - { - "Id": 437, - "Name": "bronzong" - }, - { - "Id": 438, - "Name": "bonsly" - }, - { - "Id": 439, - "Name": "mime" - }, - { - "Id": 440, - "Name": "happiny" - }, - { - "Id": 441, - "Name": "chatot" - }, - { - "Id": 442, - "Name": "spiritomb" - }, - { - "Id": 443, - "Name": "gible" - }, - { - "Id": 444, - "Name": "gabite" - }, - { - "Id": 445, - "Name": "garchomp" - }, - { - "Id": 446, - "Name": "munchlax" - }, - { - "Id": 447, - "Name": "riolu" - }, - { - "Id": 448, - "Name": "lucario" - }, - { - "Id": 449, - "Name": "hippopotas" - }, - { - "Id": 450, - "Name": "hippowdon" - }, - { - "Id": 451, - "Name": "skorupi" - }, - { - "Id": 452, - "Name": "drapion" - }, - { - "Id": 453, - "Name": "croagunk" - }, - { - "Id": 454, - "Name": "toxicroak" - }, - { - "Id": 455, - "Name": "carnivine" - }, - { - "Id": 456, - "Name": "finneon" - }, - { - "Id": 457, - "Name": "lumineon" - }, - { - "Id": 458, - "Name": "mantyke" - }, - { - "Id": 459, - "Name": "snover" - }, - { - "Id": 460, - "Name": "abomasnow" - }, - { - "Id": 461, - "Name": "weavile" - }, - { - "Id": 462, - "Name": "magnezone" - }, - { - "Id": 463, - "Name": "lickilicky" - }, - { - "Id": 464, - "Name": "rhyperior" - }, - { - "Id": 465, - "Name": "tangrowth" - }, - { - "Id": 466, - "Name": "electivire" - }, - { - "Id": 467, - "Name": "magmortar" - }, - { - "Id": 468, - "Name": "togekiss" - }, - { - "Id": 469, - "Name": "yanmega" - }, - { - "Id": 470, - "Name": "leafeon" - }, - { - "Id": 471, - "Name": "glaceon" - }, - { - "Id": 472, - "Name": "gliscor" - }, - { - "Id": 473, - "Name": "mamoswine" - }, - { - "Id": 474, - "Name": "porygon" - }, - { - "Id": 475, - "Name": "gallade" - }, - { - "Id": 476, - "Name": "probopass" - }, - { - "Id": 477, - "Name": "dusknoir" - }, - { - "Id": 478, - "Name": "froslass" - }, - { - "Id": 479, - "Name": "rotom" - }, - { - "Id": 480, - "Name": "uxie" - }, - { - "Id": 481, - "Name": "mesprit" - }, - { - "Id": 482, - "Name": "azelf" - }, - { - "Id": 483, - "Name": "dialga" - }, - { - "Id": 484, - "Name": "palkia" - }, - { - "Id": 485, - "Name": "heatran" - }, - { - "Id": 486, - "Name": "regigigas" - }, - { - "Id": 487, - "Name": "giratina" - }, - { - "Id": 488, - "Name": "cresselia" - }, - { - "Id": 489, - "Name": "phione" - }, - { - "Id": 490, - "Name": "manaphy" - }, - { - "Id": 491, - "Name": "darkrai" - }, - { - "Id": 492, - "Name": "shaymin" - }, - { - "Id": 493, - "Name": "arceus" - }, - { - "Id": 494, - "Name": "victini" - }, - { - "Id": 495, - "Name": "snivy" - }, - { - "Id": 496, - "Name": "servine" - }, - { - "Id": 497, - "Name": "serperior" - }, - { - "Id": 498, - "Name": "tepig" - }, - { - "Id": 499, - "Name": "pignite" - }, - { - "Id": 500, - "Name": "emboar" - }, - { - "Id": 501, - "Name": "oshawott" - }, - { - "Id": 502, - "Name": "dewott" - }, - { - "Id": 503, - "Name": "samurott" - }, - { - "Id": 504, - "Name": "patrat" - }, - { - "Id": 505, - "Name": "watchog" - }, - { - "Id": 506, - "Name": "lillipup" - }, - { - "Id": 507, - "Name": "herdier" - }, - { - "Id": 508, - "Name": "stoutland" - }, - { - "Id": 509, - "Name": "purrloin" - }, - { - "Id": 510, - "Name": "liepard" - }, - { - "Id": 511, - "Name": "pansage" - }, - { - "Id": 512, - "Name": "simisage" - }, - { - "Id": 513, - "Name": "pansear" - }, - { - "Id": 514, - "Name": "simisear" - }, - { - "Id": 515, - "Name": "panpour" - }, - { - "Id": 516, - "Name": "simipour" - }, - { - "Id": 517, - "Name": "munna" - }, - { - "Id": 518, - "Name": "musharna" - }, - { - "Id": 519, - "Name": "pidove" - }, - { - "Id": 520, - "Name": "tranquill" - }, - { - "Id": 521, - "Name": "unfezant" - }, - { - "Id": 522, - "Name": "blitzle" - }, - { - "Id": 523, - "Name": "zebstrika" - }, - { - "Id": 524, - "Name": "roggenrola" - }, - { - "Id": 525, - "Name": "boldore" - }, - { - "Id": 526, - "Name": "gigalith" - }, - { - "Id": 527, - "Name": "woobat" - }, - { - "Id": 528, - "Name": "swoobat" - }, - { - "Id": 529, - "Name": "drilbur" - }, - { - "Id": 530, - "Name": "excadrill" - }, - { - "Id": 531, - "Name": "audino" - }, - { - "Id": 532, - "Name": "timburr" - }, - { - "Id": 533, - "Name": "gurdurr" - }, - { - "Id": 534, - "Name": "conkeldurr" - }, - { - "Id": 535, - "Name": "tympole" - }, - { - "Id": 536, - "Name": "palpitoad" - }, - { - "Id": 537, - "Name": "seismitoad" - }, - { - "Id": 538, - "Name": "throh" - }, - { - "Id": 539, - "Name": "sawk" - }, - { - "Id": 540, - "Name": "sewaddle" - }, - { - "Id": 541, - "Name": "swadloon" - }, - { - "Id": 542, - "Name": "leavanny" - }, - { - "Id": 543, - "Name": "venipede" - }, - { - "Id": 544, - "Name": "whirlipede" - }, - { - "Id": 545, - "Name": "scolipede" - }, - { - "Id": 546, - "Name": "cottonee" - }, - { - "Id": 547, - "Name": "whimsicott" - }, - { - "Id": 548, - "Name": "petilil" - }, - { - "Id": 549, - "Name": "lilligant" - }, - { - "Id": 550, - "Name": "basculin" - }, - { - "Id": 551, - "Name": "sandile" - }, - { - "Id": 552, - "Name": "krokorok" - }, - { - "Id": 553, - "Name": "krookodile" - }, - { - "Id": 554, - "Name": "darumaka" - }, - { - "Id": 555, - "Name": "darmanitan" - }, - { - "Id": 556, - "Name": "maractus" - }, - { - "Id": 557, - "Name": "dwebble" - }, - { - "Id": 558, - "Name": "crustle" - }, - { - "Id": 559, - "Name": "scraggy" - }, - { - "Id": 560, - "Name": "scrafty" - }, - { - "Id": 561, - "Name": "sigilyph" - }, - { - "Id": 562, - "Name": "yamask" - }, - { - "Id": 563, - "Name": "cofagrigus" - }, - { - "Id": 564, - "Name": "tirtouga" - }, - { - "Id": 565, - "Name": "carracosta" - }, - { - "Id": 566, - "Name": "archen" - }, - { - "Id": 567, - "Name": "archeops" - }, - { - "Id": 568, - "Name": "trubbish" - }, - { - "Id": 569, - "Name": "garbodor" - }, - { - "Id": 570, - "Name": "zorua" - }, - { - "Id": 571, - "Name": "zoroark" - }, - { - "Id": 572, - "Name": "minccino" - }, - { - "Id": 573, - "Name": "cinccino" - }, - { - "Id": 574, - "Name": "gothita" - }, - { - "Id": 575, - "Name": "gothorita" - }, - { - "Id": 576, - "Name": "gothitelle" - }, - { - "Id": 577, - "Name": "solosis" - }, - { - "Id": 578, - "Name": "duosion" - }, - { - "Id": 579, - "Name": "reuniclus" - }, - { - "Id": 580, - "Name": "ducklett" - }, - { - "Id": 581, - "Name": "swanna" - }, - { - "Id": 582, - "Name": "vanillite" - }, - { - "Id": 583, - "Name": "vanillish" - }, - { - "Id": 584, - "Name": "vanilluxe" - }, - { - "Id": 585, - "Name": "deerling" - }, - { - "Id": 586, - "Name": "sawsbuck" - }, - { - "Id": 587, - "Name": "emolga" - }, - { - "Id": 588, - "Name": "karrablast" - }, - { - "Id": 589, - "Name": "escavalier" - }, - { - "Id": 590, - "Name": "foongus" - }, - { - "Id": 591, - "Name": "amoonguss" - }, - { - "Id": 592, - "Name": "frillish" - }, - { - "Id": 593, - "Name": "jellicent" - }, - { - "Id": 594, - "Name": "alomomola" - }, - { - "Id": 595, - "Name": "joltik" - }, - { - "Id": 596, - "Name": "galvantula" - }, - { - "Id": 597, - "Name": "ferroseed" - }, - { - "Id": 598, - "Name": "ferrothorn" - }, - { - "Id": 599, - "Name": "klink" - }, - { - "Id": 600, - "Name": "klang" - }, - { - "Id": 601, - "Name": "klinklang" - }, - { - "Id": 602, - "Name": "tynamo" - }, - { - "Id": 603, - "Name": "eelektrik" - }, - { - "Id": 604, - "Name": "eelektross" - }, - { - "Id": 605, - "Name": "elgyem" - }, - { - "Id": 606, - "Name": "beheeyem" - }, - { - "Id": 607, - "Name": "litwick" - }, - { - "Id": 608, - "Name": "lampent" - }, - { - "Id": 609, - "Name": "chandelure" - }, - { - "Id": 610, - "Name": "axew" - }, - { - "Id": 611, - "Name": "fraxure" - }, - { - "Id": 612, - "Name": "haxorus" - }, - { - "Id": 613, - "Name": "cubchoo" - }, - { - "Id": 614, - "Name": "beartic" - }, - { - "Id": 615, - "Name": "cryogonal" - }, - { - "Id": 616, - "Name": "shelmet" - }, - { - "Id": 617, - "Name": "accelgor" - }, - { - "Id": 618, - "Name": "stunfisk" - }, - { - "Id": 619, - "Name": "mienfoo" - }, - { - "Id": 620, - "Name": "mienshao" - }, - { - "Id": 621, - "Name": "druddigon" - }, - { - "Id": 622, - "Name": "golett" - }, - { - "Id": 623, - "Name": "golurk" - }, - { - "Id": 624, - "Name": "pawniard" - }, - { - "Id": 625, - "Name": "bisharp" - }, - { - "Id": 626, - "Name": "bouffalant" - }, - { - "Id": 627, - "Name": "rufflet" - }, - { - "Id": 628, - "Name": "braviary" - }, - { - "Id": 629, - "Name": "vullaby" - }, - { - "Id": 630, - "Name": "mandibuzz" - }, - { - "Id": 631, - "Name": "heatmor" - }, - { - "Id": 632, - "Name": "durant" - }, - { - "Id": 633, - "Name": "deino" - }, - { - "Id": 634, - "Name": "zweilous" - }, - { - "Id": 635, - "Name": "hydreigon" - }, - { - "Id": 636, - "Name": "larvesta" - }, - { - "Id": 637, - "Name": "volcarona" - }, - { - "Id": 638, - "Name": "cobalion" - }, - { - "Id": 639, - "Name": "terrakion" - }, - { - "Id": 640, - "Name": "virizion" - }, - { - "Id": 641, - "Name": "tornadus" - }, - { - "Id": 642, - "Name": "thundurus" - }, - { - "Id": 643, - "Name": "reshiram" - }, - { - "Id": 644, - "Name": "zekrom" - }, - { - "Id": 645, - "Name": "landorus" - }, - { - "Id": 646, - "Name": "kyurem" - }, - { - "Id": 647, - "Name": "keldeo" - }, - { - "Id": 648, - "Name": "meloetta" - }, - { - "Id": 649, - "Name": "genesect" - }, - { - "Id": 650, - "Name": "chespin" - }, - { - "Id": 651, - "Name": "quilladin" - }, - { - "Id": 652, - "Name": "chesnaught" - }, - { - "Id": 653, - "Name": "fennekin" - }, - { - "Id": 654, - "Name": "braixen" - }, - { - "Id": 655, - "Name": "delphox" - }, - { - "Id": 656, - "Name": "froakie" - }, - { - "Id": 657, - "Name": "frogadier" - }, - { - "Id": 658, - "Name": "greninja" - }, - { - "Id": 659, - "Name": "bunnelby" - }, - { - "Id": 660, - "Name": "diggersby" - }, - { - "Id": 661, - "Name": "fletchling" - }, - { - "Id": 662, - "Name": "fletchinder" - }, - { - "Id": 663, - "Name": "talonflame" - }, - { - "Id": 664, - "Name": "scatterbug" - }, - { - "Id": 665, - "Name": "spewpa" - }, - { - "Id": 666, - "Name": "vivillon" - }, - { - "Id": 667, - "Name": "litleo" - }, - { - "Id": 668, - "Name": "pyroar" - }, - { - "Id": 669, - "Name": "flabebe" - }, - { - "Id": 670, - "Name": "floette" - }, - { - "Id": 671, - "Name": "florges" - }, - { - "Id": 672, - "Name": "skiddo" - }, - { - "Id": 673, - "Name": "gogoat" - }, - { - "Id": 674, - "Name": "pancham" - }, - { - "Id": 675, - "Name": "pangoro" - }, - { - "Id": 676, - "Name": "furfrou" - }, - { - "Id": 677, - "Name": "espurr" - }, - { - "Id": 678, - "Name": "meowstic" - }, - { - "Id": 679, - "Name": "honedge" - }, - { - "Id": 680, - "Name": "doublade" - }, - { - "Id": 681, - "Name": "aegislash" - }, - { - "Id": 682, - "Name": "spritzee" - }, - { - "Id": 683, - "Name": "aromatisse" - }, - { - "Id": 684, - "Name": "swirlix" - }, - { - "Id": 685, - "Name": "slurpuff" - }, - { - "Id": 686, - "Name": "inkay" - }, - { - "Id": 687, - "Name": "malamar" - }, - { - "Id": 688, - "Name": "binacle" - }, - { - "Id": 689, - "Name": "barbaracle" - }, - { - "Id": 690, - "Name": "skrelp" - }, - { - "Id": 691, - "Name": "dragalge" - }, - { - "Id": 692, - "Name": "clauncher" - }, - { - "Id": 693, - "Name": "clawitzer" - }, - { - "Id": 694, - "Name": "helioptile" - }, - { - "Id": 695, - "Name": "heliolisk" - }, - { - "Id": 696, - "Name": "tyrunt" - }, - { - "Id": 697, - "Name": "tyrantrum" - }, - { - "Id": 698, - "Name": "amaura" - }, - { - "Id": 699, - "Name": "aurorus" - }, - { - "Id": 700, - "Name": "sylveon" - }, - { - "Id": 701, - "Name": "hawlucha" - }, - { - "Id": 702, - "Name": "dedenne" - }, - { - "Id": 703, - "Name": "carbink" - }, - { - "Id": 704, - "Name": "goomy" - }, - { - "Id": 705, - "Name": "sliggoo" - }, - { - "Id": 706, - "Name": "goodra" - }, - { - "Id": 707, - "Name": "klefki" - }, - { - "Id": 708, - "Name": "phantump" - }, - { - "Id": 709, - "Name": "trevenant" - }, - { - "Id": 710, - "Name": "pumpkaboo" - }, - { - "Id": 711, - "Name": "gourgeist" - }, - { - "Id": 712, - "Name": "bergmite" - }, - { - "Id": 713, - "Name": "avalugg" - }, - { - "Id": 714, - "Name": "noibat" - }, - { - "Id": 715, - "Name": "noivern" - }, - { - "Id": 716, - "Name": "xerneas" - }, - { - "Id": 717, - "Name": "yveltal" - }, - { - "Id": 718, - "Name": "zygarde" - }, - { - "Id": 719, - "Name": "diancie" - }, - { - "Id": 720, - "Name": "hoopa" - }, - { - "Id": 721, - "Name": "volcanion" - }, - { - "Id": 10001, - "Name": "deoxys" - }, - { - "Id": 10002, - "Name": "deoxys" - }, - { - "Id": 10003, - "Name": "deoxys" - }, - { - "Id": 10004, - "Name": "wormadam" - }, - { - "Id": 10005, - "Name": "wormadam" - }, - { - "Id": 10006, - "Name": "shaymin" - }, - { - "Id": 10007, - "Name": "giratina" - }, - { - "Id": 10008, - "Name": "rotom" - }, - { - "Id": 10009, - "Name": "rotom" - }, - { - "Id": 10010, - "Name": "rotom" - }, - { - "Id": 10011, - "Name": "rotom" - }, - { - "Id": 10012, - "Name": "rotom" - }, - { - "Id": 10013, - "Name": "castform" - }, - { - "Id": 10014, - "Name": "castform" - }, - { - "Id": 10015, - "Name": "castform" - }, - { - "Id": 10016, - "Name": "basculin" - }, - { - "Id": 10017, - "Name": "darmanitan" - }, - { - "Id": 10018, - "Name": "meloetta" - }, - { - "Id": 10019, - "Name": "tornadus" - }, - { - "Id": 10020, - "Name": "thundurus" - }, - { - "Id": 10021, - "Name": "landorus" - }, - { - "Id": 10022, - "Name": "kyurem" - }, - { - "Id": 10023, - "Name": "kyurem" - }, - { - "Id": 10024, - "Name": "keldeo" - }, - { - "Id": 10025, - "Name": "meowstic" - }, - { - "Id": 10026, - "Name": "aegislash" - }, - { - "Id": 10027, - "Name": "pumpkaboo" - }, - { - "Id": 10028, - "Name": "pumpkaboo" - }, - { - "Id": 10029, - "Name": "pumpkaboo" - }, - { - "Id": 10030, - "Name": "gourgeist" - }, - { - "Id": 10031, - "Name": "gourgeist" - }, - { - "Id": 10032, - "Name": "gourgeist" - }, - { - "Id": 10033, - "Name": "venusaur" - }, - { - "Id": 10034, - "Name": "charizard" - }, - { - "Id": 10035, - "Name": "charizard" - }, - { - "Id": 10036, - "Name": "blastoise" - }, - { - "Id": 10037, - "Name": "alakazam" - }, - { - "Id": 10038, - "Name": "gengar" - }, - { - "Id": 10039, - "Name": "kangaskhan" - }, - { - "Id": 10040, - "Name": "pinsir" - }, - { - "Id": 10041, - "Name": "gyarados" - }, - { - "Id": 10042, - "Name": "aerodactyl" - }, - { - "Id": 10043, - "Name": "mewtwo" - }, - { - "Id": 10044, - "Name": "mewtwo" - }, - { - "Id": 10045, - "Name": "ampharos" - }, - { - "Id": 10046, - "Name": "scizor" - }, - { - "Id": 10047, - "Name": "heracross" - }, - { - "Id": 10048, - "Name": "houndoom" - }, - { - "Id": 10049, - "Name": "tyranitar" - }, - { - "Id": 10050, - "Name": "blaziken" - }, - { - "Id": 10051, - "Name": "gardevoir" - }, - { - "Id": 10052, - "Name": "mawile" - }, - { - "Id": 10053, - "Name": "aggron" - }, - { - "Id": 10054, - "Name": "medicham" - }, - { - "Id": 10055, - "Name": "manectric" - }, - { - "Id": 10056, - "Name": "banette" - }, - { - "Id": 10057, - "Name": "absol" - }, - { - "Id": 10058, - "Name": "garchomp" - }, - { - "Id": 10059, - "Name": "lucario" - }, - { - "Id": 10060, - "Name": "abomasnow" - }, - { - "Id": 10061, - "Name": "floette" - }, - { - "Id": 10062, - "Name": "latias" - }, - { - "Id": 10063, - "Name": "latios" - }, - { - "Id": 10064, - "Name": "swampert" - }, - { - "Id": 10065, - "Name": "sceptile" - }, - { - "Id": 10066, - "Name": "sableye" - }, - { - "Id": 10067, - "Name": "altaria" - }, - { - "Id": 10068, - "Name": "gallade" - }, - { - "Id": 10069, - "Name": "audino" - }, - { - "Id": 10070, - "Name": "sharpedo" - }, - { - "Id": 10071, - "Name": "slowbro" - }, - { - "Id": 10072, - "Name": "steelix" - }, - { - "Id": 10073, - "Name": "pidgeot" - }, - { - "Id": 10074, - "Name": "glalie" - }, - { - "Id": 10075, - "Name": "diancie" - }, - { - "Id": 10076, - "Name": "metagross" - }, - { - "Id": 10077, - "Name": "kyogre" - }, - { - "Id": 10078, - "Name": "groudon" - }, - { - "Id": 10079, - "Name": "rayquaza" - }, - { - "Id": 10080, - "Name": "pikachu" - }, - { - "Id": 10081, - "Name": "pikachu" - }, - { - "Id": 10082, - "Name": "pikachu" - }, - { - "Id": 10083, - "Name": "pikachu" - }, - { - "Id": 10084, - "Name": "pikachu" - }, - { - "Id": 10085, - "Name": "pikachu" - }, - { - "Id": 10086, - "Name": "hoopa" - }, - { - "Id": 10087, - "Name": "camerupt" - }, - { - "Id": 10088, - "Name": "lopunny" - }, - { - "Id": 10089, - "Name": "salamence" - }, - { - "Id": 10090, - "Name": "beedrill" - } -] \ No newline at end of file diff --git a/src/NadekoBot/data/pokemon/name-id_map2.json b/src/NadekoBot/data/pokemon/name-id_map2.json index 1de578a0..eb6cf559 100644 --- a/src/NadekoBot/data/pokemon/name-id_map2.json +++ b/src/NadekoBot/data/pokemon/name-id_map2.json @@ -1753,7 +1753,7 @@ }, { "Id": 439, - "Name": "mime" + "Name": "mime jr" }, { "Id": 440, From c8179cdf2a170cb10393102216bbe0032ef5724f Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 24 Mar 2017 12:15:50 +0100 Subject: [PATCH 06/42] .lcr will now indicate autodeleting and dming custom reactions with emojis before the id --- .../Modules/CustomReactions/CustomReactions.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs index 024e79b5..f28a7bc9 100644 --- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -188,7 +188,19 @@ namespace NadekoBot.Modules.CustomReactions .WithDescription(string.Join("\n", customReactions.OrderBy(cr => cr.Trigger) .Skip((curPage - 1) * 20) .Take(20) - .Select(cr => $"`#{cr.Id}` `{GetText("trigger")}:` {cr.Trigger}"))), lastPage) + .Select(cr => + { + var str = $"`#{cr.Id}` {cr.Trigger}"; + if (cr.AutoDeleteTrigger) + { + str = "🗑" + str; + } + if (cr.DmResponse) + { + str = "📪" + str; + } + return str; + }))), lastPage) .ConfigureAwait(false); } From 86105df59acce318dbdb0737770d8c704a71de88 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Mar 2017 07:39:50 +0100 Subject: [PATCH 07/42] pokemon and nohint trivia args are now case-insensitive --- src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs index c8bd3e73..a18763c1 100644 --- a/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/TriviaCommands.cs @@ -30,6 +30,8 @@ namespace NadekoBot.Modules.Games { var channel = (ITextChannel)Context.Channel; + additionalArgs = additionalArgs?.Trim()?.ToLowerInvariant(); + var showHints = !additionalArgs.Contains("nohint"); var isPokemon = additionalArgs.Contains("pokemon"); From 77b6d42d9358d01d702b381cc5f000e9b2f7eaec Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Mar 2017 09:32:04 +0100 Subject: [PATCH 08/42] Fixes to some pokemans, higher delay between questions --- .../Games/Commands/Trivia/TriviaGame.cs | 5 +- .../Commands/Trivia/TriviaQuestionPool.cs | 2 +- src/NadekoBot/data/pokemon/name-id_map2.json | 3246 ----------------- src/NadekoBot/data/pokemon/name-id_map3.json | 1 + 4 files changed, 5 insertions(+), 3249 deletions(-) delete mode 100644 src/NadekoBot/data/pokemon/name-id_map2.json create mode 100644 src/NadekoBot/data/pokemon/name-id_map3.json diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs index 3bfb8b1a..0fba8200 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs @@ -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); } } diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs index cbad9815..e98830f5 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs @@ -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(); diff --git a/src/NadekoBot/data/pokemon/name-id_map2.json b/src/NadekoBot/data/pokemon/name-id_map2.json deleted file mode 100644 index eb6cf559..00000000 --- a/src/NadekoBot/data/pokemon/name-id_map2.json +++ /dev/null @@ -1,3246 +0,0 @@ -[ - { - "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": "ampharos" - }, - { - "Id": 182, - "Name": "bellossom" - }, - { - "Id": 183, - "Name": "marill" - }, - { - "Id": 184, - "Name": "azumarill" - }, - { - "Id": 185, - "Name": "sudowoodo" - }, - { - "Id": 186, - "Name": "politoed" - }, - { - "Id": 187, - "Name": "hoppip" - }, - { - "Id": 188, - "Name": "skiploom" - }, - { - "Id": 189, - "Name": "jumpluff" - }, - { - "Id": 190, - "Name": "aipom" - }, - { - "Id": 191, - "Name": "sunkern" - }, - { - "Id": 192, - "Name": "sunflora" - }, - { - "Id": 193, - "Name": "yanma" - }, - { - "Id": 194, - "Name": "wooper" - }, - { - "Id": 195, - "Name": "quagsire" - }, - { - "Id": 196, - "Name": "espeon" - }, - { - "Id": 197, - "Name": "umbreon" - }, - { - "Id": 198, - "Name": "murkrow" - }, - { - "Id": 199, - "Name": "slowking" - }, - { - "Id": 200, - "Name": "misdreavus" - }, - { - "Id": 201, - "Name": "unown" - }, - { - "Id": 202, - "Name": "wobbuffet" - }, - { - "Id": 203, - "Name": "girafarig" - }, - { - "Id": 204, - "Name": "pineco" - }, - { - "Id": 205, - "Name": "forretress" - }, - { - "Id": 206, - "Name": "dunsparce" - }, - { - "Id": 207, - "Name": "gligar" - }, - { - "Id": 208, - "Name": "steelix" - }, - { - "Id": 209, - "Name": "snubbull" - }, - { - "Id": 210, - "Name": "granbull" - }, - { - "Id": 211, - "Name": "qwilfish" - }, - { - "Id": 212, - "Name": "scizor" - }, - { - "Id": 213, - "Name": "shuckle" - }, - { - "Id": 214, - "Name": "heracross" - }, - { - "Id": 215, - "Name": "sneasel" - }, - { - "Id": 216, - "Name": "teddiursa" - }, - { - "Id": 217, - "Name": "ursaring" - }, - { - "Id": 218, - "Name": "slugma" - }, - { - "Id": 219, - "Name": "magcargo" - }, - { - "Id": 220, - "Name": "swinub" - }, - { - "Id": 221, - "Name": "piloswine" - }, - { - "Id": 222, - "Name": "corsola" - }, - { - "Id": 223, - "Name": "remoraid" - }, - { - "Id": 224, - "Name": "octillery" - }, - { - "Id": 225, - "Name": "delibird" - }, - { - "Id": 226, - "Name": "mantine" - }, - { - "Id": 227, - "Name": "skarmory" - }, - { - "Id": 228, - "Name": "houndour" - }, - { - "Id": 229, - "Name": "houndoom" - }, - { - "Id": 230, - "Name": "kingdra" - }, - { - "Id": 231, - "Name": "phanpy" - }, - { - "Id": 232, - "Name": "donphan" - }, - { - "Id": 233, - "Name": "porygon2" - }, - { - "Id": 234, - "Name": "stantler" - }, - { - "Id": 235, - "Name": "smeargle" - }, - { - "Id": 236, - "Name": "tyrogue" - }, - { - "Id": 237, - "Name": "hitmontop" - }, - { - "Id": 238, - "Name": "smoochum" - }, - { - "Id": 239, - "Name": "elekid" - }, - { - "Id": 240, - "Name": "magby" - }, - { - "Id": 241, - "Name": "miltank" - }, - { - "Id": 242, - "Name": "blissey" - }, - { - "Id": 243, - "Name": "raikou" - }, - { - "Id": 244, - "Name": "entei" - }, - { - "Id": 245, - "Name": "suicune" - }, - { - "Id": 246, - "Name": "larvitar" - }, - { - "Id": 247, - "Name": "pupitar" - }, - { - "Id": 248, - "Name": "tyranitar" - }, - { - "Id": 249, - "Name": "lugia" - }, - { - "Id": 250, - "Name": "ho" - }, - { - "Id": 251, - "Name": "celebi" - }, - { - "Id": 252, - "Name": "treecko" - }, - { - "Id": 253, - "Name": "grovyle" - }, - { - "Id": 254, - "Name": "sceptile" - }, - { - "Id": 255, - "Name": "torchic" - }, - { - "Id": 256, - "Name": "combusken" - }, - { - "Id": 257, - "Name": "blaziken" - }, - { - "Id": 258, - "Name": "mudkip" - }, - { - "Id": 259, - "Name": "marshtomp" - }, - { - "Id": 260, - "Name": "swampert" - }, - { - "Id": 261, - "Name": "poochyena" - }, - { - "Id": 262, - "Name": "mightyena" - }, - { - "Id": 263, - "Name": "zigzagoon" - }, - { - "Id": 264, - "Name": "linoone" - }, - { - "Id": 265, - "Name": "wurmple" - }, - { - "Id": 266, - "Name": "silcoon" - }, - { - "Id": 267, - "Name": "beautifly" - }, - { - "Id": 268, - "Name": "cascoon" - }, - { - "Id": 269, - "Name": "dustox" - }, - { - "Id": 270, - "Name": "lotad" - }, - { - "Id": 271, - "Name": "lombre" - }, - { - "Id": 272, - "Name": "ludicolo" - }, - { - "Id": 273, - "Name": "seedot" - }, - { - "Id": 274, - "Name": "nuzleaf" - }, - { - "Id": 275, - "Name": "shiftry" - }, - { - "Id": 276, - "Name": "taillow" - }, - { - "Id": 277, - "Name": "swellow" - }, - { - "Id": 278, - "Name": "wingull" - }, - { - "Id": 279, - "Name": "pelipper" - }, - { - "Id": 280, - "Name": "ralts" - }, - { - "Id": 281, - "Name": "kirlia" - }, - { - "Id": 282, - "Name": "gardevoir" - }, - { - "Id": 283, - "Name": "surskit" - }, - { - "Id": 284, - "Name": "masquerain" - }, - { - "Id": 285, - "Name": "shroomish" - }, - { - "Id": 286, - "Name": "breloom" - }, - { - "Id": 287, - "Name": "slakoth" - }, - { - "Id": 288, - "Name": "vigoroth" - }, - { - "Id": 289, - "Name": "slaking" - }, - { - "Id": 290, - "Name": "nincada" - }, - { - "Id": 291, - "Name": "ninjask" - }, - { - "Id": 292, - "Name": "shedinja" - }, - { - "Id": 293, - "Name": "whismur" - }, - { - "Id": 294, - "Name": "loudred" - }, - { - "Id": 295, - "Name": "exploud" - }, - { - "Id": 296, - "Name": "makuhita" - }, - { - "Id": 297, - "Name": "hariyama" - }, - { - "Id": 298, - "Name": "azurill" - }, - { - "Id": 299, - "Name": "nosepass" - }, - { - "Id": 300, - "Name": "skitty" - }, - { - "Id": 301, - "Name": "delcatty" - }, - { - "Id": 302, - "Name": "sableye" - }, - { - "Id": 303, - "Name": "mawile" - }, - { - "Id": 304, - "Name": "aron" - }, - { - "Id": 305, - "Name": "lairon" - }, - { - "Id": 306, - "Name": "aggron" - }, - { - "Id": 307, - "Name": "meditite" - }, - { - "Id": 308, - "Name": "medicham" - }, - { - "Id": 309, - "Name": "electrike" - }, - { - "Id": 310, - "Name": "manectric" - }, - { - "Id": 311, - "Name": "plusle" - }, - { - "Id": 312, - "Name": "minun" - }, - { - "Id": 313, - "Name": "volbeat" - }, - { - "Id": 314, - "Name": "illumise" - }, - { - "Id": 315, - "Name": "roselia" - }, - { - "Id": 316, - "Name": "gulpin" - }, - { - "Id": 317, - "Name": "swalot" - }, - { - "Id": 318, - "Name": "carvanha" - }, - { - "Id": 319, - "Name": "sharpedo" - }, - { - "Id": 320, - "Name": "wailmer" - }, - { - "Id": 321, - "Name": "wailord" - }, - { - "Id": 322, - "Name": "numel" - }, - { - "Id": 323, - "Name": "camerupt" - }, - { - "Id": 324, - "Name": "torkoal" - }, - { - "Id": 325, - "Name": "spoink" - }, - { - "Id": 326, - "Name": "grumpig" - }, - { - "Id": 327, - "Name": "spinda" - }, - { - "Id": 328, - "Name": "trapinch" - }, - { - "Id": 329, - "Name": "vibrava" - }, - { - "Id": 330, - "Name": "flygon" - }, - { - "Id": 331, - "Name": "cacnea" - }, - { - "Id": 332, - "Name": "cacturne" - }, - { - "Id": 333, - "Name": "swablu" - }, - { - "Id": 334, - "Name": "altaria" - }, - { - "Id": 335, - "Name": "zangoose" - }, - { - "Id": 336, - "Name": "seviper" - }, - { - "Id": 337, - "Name": "lunatone" - }, - { - "Id": 338, - "Name": "solrock" - }, - { - "Id": 339, - "Name": "barboach" - }, - { - "Id": 340, - "Name": "whiscash" - }, - { - "Id": 341, - "Name": "corphish" - }, - { - "Id": 342, - "Name": "crawdaunt" - }, - { - "Id": 343, - "Name": "baltoy" - }, - { - "Id": 344, - "Name": "claydol" - }, - { - "Id": 345, - "Name": "lileep" - }, - { - "Id": 346, - "Name": "cradily" - }, - { - "Id": 347, - "Name": "anorith" - }, - { - "Id": 348, - "Name": "armaldo" - }, - { - "Id": 349, - "Name": "feebas" - }, - { - "Id": 350, - "Name": "milotic" - }, - { - "Id": 351, - "Name": "castform" - }, - { - "Id": 352, - "Name": "kecleon" - }, - { - "Id": 353, - "Name": "shuppet" - }, - { - "Id": 354, - "Name": "banette" - }, - { - "Id": 355, - "Name": "duskull" - }, - { - "Id": 356, - "Name": "dusclops" - }, - { - "Id": 357, - "Name": "tropius" - }, - { - "Id": 358, - "Name": "chimecho" - }, - { - "Id": 359, - "Name": "absol" - }, - { - "Id": 360, - "Name": "wynaut" - }, - { - "Id": 361, - "Name": "snorunt" - }, - { - "Id": 362, - "Name": "glalie" - }, - { - "Id": 363, - "Name": "spheal" - }, - { - "Id": 364, - "Name": "sealeo" - }, - { - "Id": 365, - "Name": "walrein" - }, - { - "Id": 366, - "Name": "clamperl" - }, - { - "Id": 367, - "Name": "huntail" - }, - { - "Id": 368, - "Name": "gorebyss" - }, - { - "Id": 369, - "Name": "relicanth" - }, - { - "Id": 370, - "Name": "luvdisc" - }, - { - "Id": 371, - "Name": "bagon" - }, - { - "Id": 372, - "Name": "shelgon" - }, - { - "Id": 373, - "Name": "salamence" - }, - { - "Id": 374, - "Name": "beldum" - }, - { - "Id": 375, - "Name": "metang" - }, - { - "Id": 376, - "Name": "metagross" - }, - { - "Id": 377, - "Name": "regirock" - }, - { - "Id": 378, - "Name": "regice" - }, - { - "Id": 379, - "Name": "registeel" - }, - { - "Id": 380, - "Name": "latias" - }, - { - "Id": 381, - "Name": "latios" - }, - { - "Id": 382, - "Name": "kyogre" - }, - { - "Id": 383, - "Name": "groudon" - }, - { - "Id": 384, - "Name": "rayquaza" - }, - { - "Id": 385, - "Name": "jirachi" - }, - { - "Id": 386, - "Name": "deoxys" - }, - { - "Id": 387, - "Name": "turtwig" - }, - { - "Id": 388, - "Name": "grotle" - }, - { - "Id": 389, - "Name": "torterra" - }, - { - "Id": 390, - "Name": "chimchar" - }, - { - "Id": 391, - "Name": "monferno" - }, - { - "Id": 392, - "Name": "infernape" - }, - { - "Id": 393, - "Name": "piplup" - }, - { - "Id": 394, - "Name": "prinplup" - }, - { - "Id": 395, - "Name": "empoleon" - }, - { - "Id": 396, - "Name": "starly" - }, - { - "Id": 397, - "Name": "staravia" - }, - { - "Id": 398, - "Name": "staraptor" - }, - { - "Id": 399, - "Name": "bidoof" - }, - { - "Id": 400, - "Name": "bibarel" - }, - { - "Id": 401, - "Name": "kricketot" - }, - { - "Id": 402, - "Name": "kricketune" - }, - { - "Id": 403, - "Name": "shinx" - }, - { - "Id": 404, - "Name": "luxio" - }, - { - "Id": 405, - "Name": "luxray" - }, - { - "Id": 406, - "Name": "budew" - }, - { - "Id": 407, - "Name": "roserade" - }, - { - "Id": 408, - "Name": "cranidos" - }, - { - "Id": 409, - "Name": "rampardos" - }, - { - "Id": 410, - "Name": "shieldon" - }, - { - "Id": 411, - "Name": "bastiodon" - }, - { - "Id": 412, - "Name": "burmy" - }, - { - "Id": 413, - "Name": "wormadam" - }, - { - "Id": 414, - "Name": "mothim" - }, - { - "Id": 415, - "Name": "combee" - }, - { - "Id": 416, - "Name": "vespiquen" - }, - { - "Id": 417, - "Name": "pachirisu" - }, - { - "Id": 418, - "Name": "buizel" - }, - { - "Id": 419, - "Name": "floatzel" - }, - { - "Id": 420, - "Name": "cherubi" - }, - { - "Id": 421, - "Name": "cherrim" - }, - { - "Id": 422, - "Name": "shellos" - }, - { - "Id": 423, - "Name": "gastrodon" - }, - { - "Id": 424, - "Name": "ambipom" - }, - { - "Id": 425, - "Name": "drifloon" - }, - { - "Id": 426, - "Name": "drifblim" - }, - { - "Id": 427, - "Name": "buneary" - }, - { - "Id": 428, - "Name": "lopunny" - }, - { - "Id": 429, - "Name": "mismagius" - }, - { - "Id": 430, - "Name": "honchkrow" - }, - { - "Id": 431, - "Name": "glameow" - }, - { - "Id": 432, - "Name": "purugly" - }, - { - "Id": 433, - "Name": "chingling" - }, - { - "Id": 434, - "Name": "stunky" - }, - { - "Id": 435, - "Name": "skuntank" - }, - { - "Id": 436, - "Name": "bronzor" - }, - { - "Id": 437, - "Name": "bronzong" - }, - { - "Id": 438, - "Name": "bonsly" - }, - { - "Id": 439, - "Name": "mime jr" - }, - { - "Id": 440, - "Name": "happiny" - }, - { - "Id": 441, - "Name": "chatot" - }, - { - "Id": 442, - "Name": "spiritomb" - }, - { - "Id": 443, - "Name": "gible" - }, - { - "Id": 444, - "Name": "gabite" - }, - { - "Id": 445, - "Name": "garchomp" - }, - { - "Id": 446, - "Name": "munchlax" - }, - { - "Id": 447, - "Name": "riolu" - }, - { - "Id": 448, - "Name": "lucario" - }, - { - "Id": 449, - "Name": "hippopotas" - }, - { - "Id": 450, - "Name": "hippowdon" - }, - { - "Id": 451, - "Name": "skorupi" - }, - { - "Id": 452, - "Name": "drapion" - }, - { - "Id": 453, - "Name": "croagunk" - }, - { - "Id": 454, - "Name": "toxicroak" - }, - { - "Id": 455, - "Name": "carnivine" - }, - { - "Id": 456, - "Name": "finneon" - }, - { - "Id": 457, - "Name": "lumineon" - }, - { - "Id": 458, - "Name": "mantyke" - }, - { - "Id": 459, - "Name": "snover" - }, - { - "Id": 460, - "Name": "abomasnow" - }, - { - "Id": 461, - "Name": "weavile" - }, - { - "Id": 462, - "Name": "magnezone" - }, - { - "Id": 463, - "Name": "lickilicky" - }, - { - "Id": 464, - "Name": "rhyperior" - }, - { - "Id": 465, - "Name": "tangrowth" - }, - { - "Id": 466, - "Name": "electivire" - }, - { - "Id": 467, - "Name": "magmortar" - }, - { - "Id": 468, - "Name": "togekiss" - }, - { - "Id": 469, - "Name": "yanmega" - }, - { - "Id": 470, - "Name": "leafeon" - }, - { - "Id": 471, - "Name": "glaceon" - }, - { - "Id": 472, - "Name": "gliscor" - }, - { - "Id": 473, - "Name": "mamoswine" - }, - { - "Id": 474, - "Name": "porygon" - }, - { - "Id": 475, - "Name": "gallade" - }, - { - "Id": 476, - "Name": "probopass" - }, - { - "Id": 477, - "Name": "dusknoir" - }, - { - "Id": 478, - "Name": "froslass" - }, - { - "Id": 479, - "Name": "rotom" - }, - { - "Id": 480, - "Name": "uxie" - }, - { - "Id": 481, - "Name": "mesprit" - }, - { - "Id": 482, - "Name": "azelf" - }, - { - "Id": 483, - "Name": "dialga" - }, - { - "Id": 484, - "Name": "palkia" - }, - { - "Id": 485, - "Name": "heatran" - }, - { - "Id": 486, - "Name": "regigigas" - }, - { - "Id": 487, - "Name": "giratina" - }, - { - "Id": 488, - "Name": "cresselia" - }, - { - "Id": 489, - "Name": "phione" - }, - { - "Id": 490, - "Name": "manaphy" - }, - { - "Id": 491, - "Name": "darkrai" - }, - { - "Id": 492, - "Name": "shaymin" - }, - { - "Id": 493, - "Name": "arceus" - }, - { - "Id": 494, - "Name": "victini" - }, - { - "Id": 495, - "Name": "snivy" - }, - { - "Id": 496, - "Name": "servine" - }, - { - "Id": 497, - "Name": "serperior" - }, - { - "Id": 498, - "Name": "tepig" - }, - { - "Id": 499, - "Name": "pignite" - }, - { - "Id": 500, - "Name": "emboar" - }, - { - "Id": 501, - "Name": "oshawott" - }, - { - "Id": 502, - "Name": "dewott" - }, - { - "Id": 503, - "Name": "samurott" - }, - { - "Id": 504, - "Name": "patrat" - }, - { - "Id": 505, - "Name": "watchog" - }, - { - "Id": 506, - "Name": "lillipup" - }, - { - "Id": 507, - "Name": "herdier" - }, - { - "Id": 508, - "Name": "stoutland" - }, - { - "Id": 509, - "Name": "purrloin" - }, - { - "Id": 510, - "Name": "liepard" - }, - { - "Id": 511, - "Name": "pansage" - }, - { - "Id": 512, - "Name": "simisage" - }, - { - "Id": 513, - "Name": "pansear" - }, - { - "Id": 514, - "Name": "simisear" - }, - { - "Id": 515, - "Name": "panpour" - }, - { - "Id": 516, - "Name": "simipour" - }, - { - "Id": 517, - "Name": "munna" - }, - { - "Id": 518, - "Name": "musharna" - }, - { - "Id": 519, - "Name": "pidove" - }, - { - "Id": 520, - "Name": "tranquill" - }, - { - "Id": 521, - "Name": "unfezant" - }, - { - "Id": 522, - "Name": "blitzle" - }, - { - "Id": 523, - "Name": "zebstrika" - }, - { - "Id": 524, - "Name": "roggenrola" - }, - { - "Id": 525, - "Name": "boldore" - }, - { - "Id": 526, - "Name": "gigalith" - }, - { - "Id": 527, - "Name": "woobat" - }, - { - "Id": 528, - "Name": "swoobat" - }, - { - "Id": 529, - "Name": "drilbur" - }, - { - "Id": 530, - "Name": "excadrill" - }, - { - "Id": 531, - "Name": "audino" - }, - { - "Id": 532, - "Name": "timburr" - }, - { - "Id": 533, - "Name": "gurdurr" - }, - { - "Id": 534, - "Name": "conkeldurr" - }, - { - "Id": 535, - "Name": "tympole" - }, - { - "Id": 536, - "Name": "palpitoad" - }, - { - "Id": 537, - "Name": "seismitoad" - }, - { - "Id": 538, - "Name": "throh" - }, - { - "Id": 539, - "Name": "sawk" - }, - { - "Id": 540, - "Name": "sewaddle" - }, - { - "Id": 541, - "Name": "swadloon" - }, - { - "Id": 542, - "Name": "leavanny" - }, - { - "Id": 543, - "Name": "venipede" - }, - { - "Id": 544, - "Name": "whirlipede" - }, - { - "Id": 545, - "Name": "scolipede" - }, - { - "Id": 546, - "Name": "cottonee" - }, - { - "Id": 547, - "Name": "whimsicott" - }, - { - "Id": 548, - "Name": "petilil" - }, - { - "Id": 549, - "Name": "lilligant" - }, - { - "Id": 550, - "Name": "basculin" - }, - { - "Id": 551, - "Name": "sandile" - }, - { - "Id": 552, - "Name": "krokorok" - }, - { - "Id": 553, - "Name": "krookodile" - }, - { - "Id": 554, - "Name": "darumaka" - }, - { - "Id": 555, - "Name": "darmanitan" - }, - { - "Id": 556, - "Name": "maractus" - }, - { - "Id": 557, - "Name": "dwebble" - }, - { - "Id": 558, - "Name": "crustle" - }, - { - "Id": 559, - "Name": "scraggy" - }, - { - "Id": 560, - "Name": "scrafty" - }, - { - "Id": 561, - "Name": "sigilyph" - }, - { - "Id": 562, - "Name": "yamask" - }, - { - "Id": 563, - "Name": "cofagrigus" - }, - { - "Id": 564, - "Name": "tirtouga" - }, - { - "Id": 565, - "Name": "carracosta" - }, - { - "Id": 566, - "Name": "archen" - }, - { - "Id": 567, - "Name": "archeops" - }, - { - "Id": 568, - "Name": "trubbish" - }, - { - "Id": 569, - "Name": "garbodor" - }, - { - "Id": 570, - "Name": "zorua" - }, - { - "Id": 571, - "Name": "zoroark" - }, - { - "Id": 572, - "Name": "minccino" - }, - { - "Id": 573, - "Name": "cinccino" - }, - { - "Id": 574, - "Name": "gothita" - }, - { - "Id": 575, - "Name": "gothorita" - }, - { - "Id": 576, - "Name": "gothitelle" - }, - { - "Id": 577, - "Name": "solosis" - }, - { - "Id": 578, - "Name": "duosion" - }, - { - "Id": 579, - "Name": "reuniclus" - }, - { - "Id": 580, - "Name": "ducklett" - }, - { - "Id": 581, - "Name": "swanna" - }, - { - "Id": 582, - "Name": "vanillite" - }, - { - "Id": 583, - "Name": "vanillish" - }, - { - "Id": 584, - "Name": "vanilluxe" - }, - { - "Id": 585, - "Name": "deerling" - }, - { - "Id": 586, - "Name": "sawsbuck" - }, - { - "Id": 587, - "Name": "emolga" - }, - { - "Id": 588, - "Name": "karrablast" - }, - { - "Id": 589, - "Name": "escavalier" - }, - { - "Id": 590, - "Name": "foongus" - }, - { - "Id": 591, - "Name": "amoonguss" - }, - { - "Id": 592, - "Name": "frillish" - }, - { - "Id": 593, - "Name": "jellicent" - }, - { - "Id": 594, - "Name": "alomomola" - }, - { - "Id": 595, - "Name": "joltik" - }, - { - "Id": 596, - "Name": "galvantula" - }, - { - "Id": 597, - "Name": "ferroseed" - }, - { - "Id": 598, - "Name": "ferrothorn" - }, - { - "Id": 599, - "Name": "klink" - }, - { - "Id": 600, - "Name": "klang" - }, - { - "Id": 601, - "Name": "klinklang" - }, - { - "Id": 602, - "Name": "tynamo" - }, - { - "Id": 603, - "Name": "eelektrik" - }, - { - "Id": 604, - "Name": "eelektross" - }, - { - "Id": 605, - "Name": "elgyem" - }, - { - "Id": 606, - "Name": "beheeyem" - }, - { - "Id": 607, - "Name": "litwick" - }, - { - "Id": 608, - "Name": "lampent" - }, - { - "Id": 609, - "Name": "chandelure" - }, - { - "Id": 610, - "Name": "axew" - }, - { - "Id": 611, - "Name": "fraxure" - }, - { - "Id": 612, - "Name": "haxorus" - }, - { - "Id": 613, - "Name": "cubchoo" - }, - { - "Id": 614, - "Name": "beartic" - }, - { - "Id": 615, - "Name": "cryogonal" - }, - { - "Id": 616, - "Name": "shelmet" - }, - { - "Id": 617, - "Name": "accelgor" - }, - { - "Id": 618, - "Name": "stunfisk" - }, - { - "Id": 619, - "Name": "mienfoo" - }, - { - "Id": 620, - "Name": "mienshao" - }, - { - "Id": 621, - "Name": "druddigon" - }, - { - "Id": 622, - "Name": "golett" - }, - { - "Id": 623, - "Name": "golurk" - }, - { - "Id": 624, - "Name": "pawniard" - }, - { - "Id": 625, - "Name": "bisharp" - }, - { - "Id": 626, - "Name": "bouffalant" - }, - { - "Id": 627, - "Name": "rufflet" - }, - { - "Id": 628, - "Name": "braviary" - }, - { - "Id": 629, - "Name": "vullaby" - }, - { - "Id": 630, - "Name": "mandibuzz" - }, - { - "Id": 631, - "Name": "heatmor" - }, - { - "Id": 632, - "Name": "durant" - }, - { - "Id": 633, - "Name": "deino" - }, - { - "Id": 634, - "Name": "zweilous" - }, - { - "Id": 635, - "Name": "hydreigon" - }, - { - "Id": 636, - "Name": "larvesta" - }, - { - "Id": 637, - "Name": "volcarona" - }, - { - "Id": 638, - "Name": "cobalion" - }, - { - "Id": 639, - "Name": "terrakion" - }, - { - "Id": 640, - "Name": "virizion" - }, - { - "Id": 641, - "Name": "tornadus" - }, - { - "Id": 642, - "Name": "thundurus" - }, - { - "Id": 643, - "Name": "reshiram" - }, - { - "Id": 644, - "Name": "zekrom" - }, - { - "Id": 645, - "Name": "landorus" - }, - { - "Id": 646, - "Name": "kyurem" - }, - { - "Id": 647, - "Name": "keldeo" - }, - { - "Id": 648, - "Name": "meloetta" - }, - { - "Id": 649, - "Name": "genesect" - }, - { - "Id": 650, - "Name": "chespin" - }, - { - "Id": 651, - "Name": "quilladin" - }, - { - "Id": 652, - "Name": "chesnaught" - }, - { - "Id": 653, - "Name": "fennekin" - }, - { - "Id": 654, - "Name": "braixen" - }, - { - "Id": 655, - "Name": "delphox" - }, - { - "Id": 656, - "Name": "froakie" - }, - { - "Id": 657, - "Name": "frogadier" - }, - { - "Id": 658, - "Name": "greninja" - }, - { - "Id": 659, - "Name": "bunnelby" - }, - { - "Id": 660, - "Name": "diggersby" - }, - { - "Id": 661, - "Name": "fletchling" - }, - { - "Id": 662, - "Name": "fletchinder" - }, - { - "Id": 663, - "Name": "talonflame" - }, - { - "Id": 664, - "Name": "scatterbug" - }, - { - "Id": 665, - "Name": "spewpa" - }, - { - "Id": 666, - "Name": "vivillon" - }, - { - "Id": 667, - "Name": "litleo" - }, - { - "Id": 668, - "Name": "pyroar" - }, - { - "Id": 669, - "Name": "flabebe" - }, - { - "Id": 670, - "Name": "floette" - }, - { - "Id": 671, - "Name": "florges" - }, - { - "Id": 672, - "Name": "skiddo" - }, - { - "Id": 673, - "Name": "gogoat" - }, - { - "Id": 674, - "Name": "pancham" - }, - { - "Id": 675, - "Name": "pangoro" - }, - { - "Id": 676, - "Name": "furfrou" - }, - { - "Id": 677, - "Name": "espurr" - }, - { - "Id": 678, - "Name": "meowstic" - }, - { - "Id": 679, - "Name": "honedge" - }, - { - "Id": 680, - "Name": "doublade" - }, - { - "Id": 681, - "Name": "aegislash" - }, - { - "Id": 682, - "Name": "spritzee" - }, - { - "Id": 683, - "Name": "aromatisse" - }, - { - "Id": 684, - "Name": "swirlix" - }, - { - "Id": 685, - "Name": "slurpuff" - }, - { - "Id": 686, - "Name": "inkay" - }, - { - "Id": 687, - "Name": "malamar" - }, - { - "Id": 688, - "Name": "binacle" - }, - { - "Id": 689, - "Name": "barbaracle" - }, - { - "Id": 690, - "Name": "skrelp" - }, - { - "Id": 691, - "Name": "dragalge" - }, - { - "Id": 692, - "Name": "clauncher" - }, - { - "Id": 693, - "Name": "clawitzer" - }, - { - "Id": 694, - "Name": "helioptile" - }, - { - "Id": 695, - "Name": "heliolisk" - }, - { - "Id": 696, - "Name": "tyrunt" - }, - { - "Id": 697, - "Name": "tyrantrum" - }, - { - "Id": 698, - "Name": "amaura" - }, - { - "Id": 699, - "Name": "aurorus" - }, - { - "Id": 700, - "Name": "sylveon" - }, - { - "Id": 701, - "Name": "hawlucha" - }, - { - "Id": 702, - "Name": "dedenne" - }, - { - "Id": 703, - "Name": "carbink" - }, - { - "Id": 704, - "Name": "goomy" - }, - { - "Id": 705, - "Name": "sliggoo" - }, - { - "Id": 706, - "Name": "goodra" - }, - { - "Id": 707, - "Name": "klefki" - }, - { - "Id": 708, - "Name": "phantump" - }, - { - "Id": 709, - "Name": "trevenant" - }, - { - "Id": 710, - "Name": "pumpkaboo" - }, - { - "Id": 711, - "Name": "gourgeist" - }, - { - "Id": 712, - "Name": "bergmite" - }, - { - "Id": 713, - "Name": "avalugg" - }, - { - "Id": 714, - "Name": "noibat" - }, - { - "Id": 715, - "Name": "noivern" - }, - { - "Id": 716, - "Name": "xerneas" - }, - { - "Id": 717, - "Name": "yveltal" - }, - { - "Id": 718, - "Name": "zygarde" - }, - { - "Id": 719, - "Name": "diancie" - }, - { - "Id": 720, - "Name": "hoopa" - }, - { - "Id": 721, - "Name": "volcanion" - }, - { - "Id": 10001, - "Name": "deoxys" - }, - { - "Id": 10002, - "Name": "deoxys" - }, - { - "Id": 10003, - "Name": "deoxys" - }, - { - "Id": 10004, - "Name": "wormadam" - }, - { - "Id": 10005, - "Name": "wormadam" - }, - { - "Id": 10006, - "Name": "shaymin" - }, - { - "Id": 10007, - "Name": "giratina" - }, - { - "Id": 10008, - "Name": "rotom" - }, - { - "Id": 10009, - "Name": "rotom" - }, - { - "Id": 10010, - "Name": "rotom" - }, - { - "Id": 10011, - "Name": "rotom" - }, - { - "Id": 10012, - "Name": "rotom" - }, - { - "Id": 10013, - "Name": "castform" - }, - { - "Id": 10014, - "Name": "castform" - }, - { - "Id": 10015, - "Name": "castform" - }, - { - "Id": 10016, - "Name": "basculin" - }, - { - "Id": 10017, - "Name": "darmanitan" - }, - { - "Id": 10018, - "Name": "meloetta" - }, - { - "Id": 10019, - "Name": "tornadus" - }, - { - "Id": 10020, - "Name": "thundurus" - }, - { - "Id": 10021, - "Name": "landorus" - }, - { - "Id": 10022, - "Name": "kyurem" - }, - { - "Id": 10023, - "Name": "kyurem" - }, - { - "Id": 10024, - "Name": "keldeo" - }, - { - "Id": 10025, - "Name": "meowstic" - }, - { - "Id": 10026, - "Name": "aegislash" - }, - { - "Id": 10027, - "Name": "pumpkaboo" - }, - { - "Id": 10028, - "Name": "pumpkaboo" - }, - { - "Id": 10029, - "Name": "pumpkaboo" - }, - { - "Id": 10030, - "Name": "gourgeist" - }, - { - "Id": 10031, - "Name": "gourgeist" - }, - { - "Id": 10032, - "Name": "gourgeist" - }, - { - "Id": 10033, - "Name": "venusaur" - }, - { - "Id": 10034, - "Name": "charizard" - }, - { - "Id": 10035, - "Name": "charizard" - }, - { - "Id": 10036, - "Name": "blastoise" - }, - { - "Id": 10037, - "Name": "alakazam" - }, - { - "Id": 10038, - "Name": "gengar" - }, - { - "Id": 10039, - "Name": "kangaskhan" - }, - { - "Id": 10040, - "Name": "pinsir" - }, - { - "Id": 10041, - "Name": "gyarados" - }, - { - "Id": 10042, - "Name": "aerodactyl" - }, - { - "Id": 10043, - "Name": "mewtwo" - }, - { - "Id": 10044, - "Name": "mewtwo" - }, - { - "Id": 10045, - "Name": "ampharos" - }, - { - "Id": 10046, - "Name": "scizor" - }, - { - "Id": 10047, - "Name": "heracross" - }, - { - "Id": 10048, - "Name": "houndoom" - }, - { - "Id": 10049, - "Name": "tyranitar" - }, - { - "Id": 10050, - "Name": "blaziken" - }, - { - "Id": 10051, - "Name": "gardevoir" - }, - { - "Id": 10052, - "Name": "mawile" - }, - { - "Id": 10053, - "Name": "aggron" - }, - { - "Id": 10054, - "Name": "medicham" - }, - { - "Id": 10055, - "Name": "manectric" - }, - { - "Id": 10056, - "Name": "banette" - }, - { - "Id": 10057, - "Name": "absol" - }, - { - "Id": 10058, - "Name": "garchomp" - }, - { - "Id": 10059, - "Name": "lucario" - }, - { - "Id": 10060, - "Name": "abomasnow" - }, - { - "Id": 10061, - "Name": "floette" - }, - { - "Id": 10062, - "Name": "latias" - }, - { - "Id": 10063, - "Name": "latios" - }, - { - "Id": 10064, - "Name": "swampert" - }, - { - "Id": 10065, - "Name": "sceptile" - }, - { - "Id": 10066, - "Name": "sableye" - }, - { - "Id": 10067, - "Name": "altaria" - }, - { - "Id": 10068, - "Name": "gallade" - }, - { - "Id": 10069, - "Name": "audino" - }, - { - "Id": 10070, - "Name": "sharpedo" - }, - { - "Id": 10071, - "Name": "slowbro" - }, - { - "Id": 10072, - "Name": "steelix" - }, - { - "Id": 10073, - "Name": "pidgeot" - }, - { - "Id": 10074, - "Name": "glalie" - }, - { - "Id": 10075, - "Name": "diancie" - }, - { - "Id": 10076, - "Name": "metagross" - }, - { - "Id": 10077, - "Name": "kyogre" - }, - { - "Id": 10078, - "Name": "groudon" - }, - { - "Id": 10079, - "Name": "rayquaza" - }, - { - "Id": 10080, - "Name": "pikachu" - }, - { - "Id": 10081, - "Name": "pikachu" - }, - { - "Id": 10082, - "Name": "pikachu" - }, - { - "Id": 10083, - "Name": "pikachu" - }, - { - "Id": 10084, - "Name": "pikachu" - }, - { - "Id": 10085, - "Name": "pikachu" - }, - { - "Id": 10086, - "Name": "hoopa" - }, - { - "Id": 10087, - "Name": "camerupt" - }, - { - "Id": 10088, - "Name": "lopunny" - }, - { - "Id": 10089, - "Name": "salamence" - }, - { - "Id": 10090, - "Name": "beedrill" - } -] \ No newline at end of file diff --git a/src/NadekoBot/data/pokemon/name-id_map3.json b/src/NadekoBot/data/pokemon/name-id_map3.json new file mode 100644 index 00000000..06422033 --- /dev/null +++ b/src/NadekoBot/data/pokemon/name-id_map3.json @@ -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":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file From 58996b7286bfe5a152a36e7248bd420cf8808dfe Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 25 Mar 2017 09:44:17 +0100 Subject: [PATCH 09/42] another pokeman fix --- src/NadekoBot/data/pokemon/name-id_map3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/data/pokemon/name-id_map3.json b/src/NadekoBot/data/pokemon/name-id_map3.json index 06422033..fa0b9d9c 100644 --- a/src/NadekoBot/data/pokemon/name-id_map3.json +++ b/src/NadekoBot/data/pokemon/name-id_map3.json @@ -1 +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":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file +[{"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 z"},{"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":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file From 3604f6a2474aa29483587982398c9dbc6486a930 Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Wed, 22 Mar 2017 02:08:08 -0400 Subject: [PATCH 10/42] Add quote ID to output of .qsearch --- src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs index 41c29a44..ea4bc674 100644 --- a/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/QuoteCommands.cs @@ -97,7 +97,7 @@ namespace NadekoBot.Modules.Utility if (keywordquote == null) return; - await Context.Channel.SendMessageAsync("💬 " + keyword.ToLowerInvariant() + ": " + + await Context.Channel.SendMessageAsync($"`#{keywordquote.Id}` 💬 " + keyword.ToLowerInvariant() + ": " + keywordquote.Text.SanitizeMentions()); } @@ -176,4 +176,4 @@ namespace NadekoBot.Modules.Utility } } } -} \ No newline at end of file +} From 529343ceb6469ebc25a9fdc3aab1796f2785126e Mon Sep 17 00:00:00 2001 From: Shikhir Arora Date: Sun, 26 Mar 2017 12:16:17 -0400 Subject: [PATCH 11/42] Fix RepeatSong/RepeatPlaylist bug bug where song would be added to the queue at the last index when repeatplaylist was enabled + repeatsong, as the actionqueue events are not mutually independent --- src/NadekoBot/Modules/Music/Classes/MusicControls.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs index bf07a508..d5581884 100644 --- a/src/NadekoBot/Modules/Music/Classes/MusicControls.cs +++ b/src/NadekoBot/Modules/Music/Classes/MusicControls.cs @@ -163,7 +163,7 @@ namespace NadekoBot.Modules.Music.Classes } - if (RepeatPlaylist) + if (RepeatPlaylist & !RepeatSong) AddSong(CurrentSong, CurrentSong.QueuerName); if (RepeatSong) From 683107bb9134217e708d3cd96d37f8cd99852d68 Mon Sep 17 00:00:00 2001 From: Hubcapp Date: Sun, 26 Mar 2017 21:04:09 -0500 Subject: [PATCH 12/42] Fix trailing sentences, grammar, untypable characters, and remove poor quality articles. --- src/NadekoBot/data/typing_articles.json | 164 +++++------------------- 1 file changed, 34 insertions(+), 130 deletions(-) diff --git a/src/NadekoBot/data/typing_articles.json b/src/NadekoBot/data/typing_articles.json index ab34341c..9850103f 100644 --- a/src/NadekoBot/data/typing_articles.json +++ b/src/NadekoBot/data/typing_articles.json @@ -9,7 +9,7 @@ }, { "Title":"Forensic and Legal Psychology", - "Text":"Using research in clinical, cognitive, developmental, and social psychology, Forensic and Legal Psychology shows how psychological science can enhance the gathering and presentation of evidence, improve legal decision-making, prevent crime," + "Text":"Using research in clinical, cognitive, developmental, and social psychology, Forensic and Legal Psychology shows how psychological science can enhance the gathering and presentation of evidence, improve legal decision-making, prevent crime, and other things." }, { "Title":"International Handbook of Psychology in Education", @@ -17,7 +17,7 @@ }, { "Title":"Handbook of Personality Psychology", - "Text":"This comprehensive reference work on personality psychology discusses the development and measurement of personality, biological and social determinants, dynamic personality processes, the personality's relation to the self, and personality" + "Text":"This comprehensive reference work on personality psychology discusses the development and measurement of personality, biological and social determinants, dynamic personality processes, the personality's relation to the self, and personality." }, { "Title":"Dictionary of Theories, Laws, and Concepts in Psychology", @@ -25,19 +25,7 @@ }, { "Title":"Essays on Plato's Psychology", - "Text":"With a comprehensive introduction to the major issues of Plato's psychology and an up-to-date bibliography of work on the relevant issues, this much-needed text makes the study of Plato's psychology accessible to scholars in ancient Greek" - }, - { - "Title":"Psychology Statistics For Dummies", - "Text":"As an alternative to typical, lead-heavy statistics texts or supplements to assigned course reading, this is one book psychology students won't want to be without." - }, - { - "Title":"Doing Psychology Experiments", - "Text":"David W. Martin’s unique blend of informality, humor, clear instruction, and solid scholarship make this concise text a popular choice for research methods courses in psychology." - }, - { - "Title":"A Handbook of Research Methods for Clinical and Health", - "Text":"For both undergraduate and postgraduate students, the book will be essential in making them aware of the full range of techniques available to them, helping them to design scientifically rigorous experiments." + "Text":"With a comprehensive introduction to the major issues of Plato's psychology and an up-to-date bibliography of work on the relevant issues, this much-needed text makes the study of Plato's psychology accessible to scholars in ancient Greece." }, { "Title":"A History of Psychology", @@ -57,19 +45,19 @@ }, { "Title":"Psychology and Deterrence", - "Text":"Now available in paperback, Psychology and Deterrence reveals deterrence strategy's hidden and generally simplistic assumptions about the nature of power and aggression, threat and response, and calculation and behavior in the international" + "Text":"Now available in paperback, Psychology and Deterrence reveals deterrence strategy's hidden and generally simplistic assumptions about the nature of power and aggression, threat and response, and calculation and behavior internationally." }, { "Title":"Psychology: An International Perspective", - "Text":"Unlike typical American texts, this book provides an international approach to introductory psychology, providing comprehensive and lively coverage of current research from a global perspective, including the UK, Germany, Scandinavia," + "Text":"Unlike typical American texts, this book provides an international approach to introductory psychology, providing comprehensive and lively coverage of current research from a global perspective, including the UK, Germany, Scandinavia, and probably others." }, { "Title":"Psychology, Briefer Course", - "Text":"Despite its title, 'Psychology: Briefer Course' is more than a simple condensation of the great 'Principles of Psychology." + "Text":"Despite its title, \"Psychology: Briefer Course\" is more than a simple condensation of the great Principles of Psychology." }, { "Title":"Psychology, Seventh Edition (High School)", - "Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field—cognition, gender and diversity studies, neuroscience and more, while at the same time using the most" + "Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field cognition, gender and diversity studies, neuroscience and more." }, { "Title":"Psychology of Russia: Past, Present, Future", @@ -79,25 +67,17 @@ "Title":"Barron's AP Psychology", "Text":"Provides information on scoring and structure of the test, offers tips on test-taking strategies, and includes practice examinations and subject review." }, - { - "Title":"Psychology for Inclusive Education: New Directions in", - "Text":"International in focus and at the very cutting edge of the field, this is essential reading for all those interested in the development of inclusive education." - }, { "Title":"Applied Psychology: Putting Theory Into Practice", "Text":"Applied Psychology: Putting theory into practice demonstrates how psychology theory is applied in the real world." }, - { - "Title":"The Psychology of Science: A Reconnaissance", - "Text":"' This eBook edition contains the complete 168 page text of the original 1966 hardcover edition. Contents: Preface by Abraham H. Maslow Acknowledgments 1. Mechanistic and Humanistic Science 2." - }, { "Title":"Filipino American Psychology: A Handbook of Theory,", "Text":"This book is the first of its kind and aims to promote visibility of this invisible group, so that 2.4 million Filipino Americans will have their voices heard." }, { "Title":"The Psychology of Visual Illusion", - "Text":"Well-rounded perspective on the ambiguities of visual display emphasizes geometrical optical illusions: framing and contrast effects, distortion of angles and direction, and apparent 'movement' of images. 240 drawings. 1972 edition." + "Text":"Well-rounded perspective on the ambiguities of visual display emphasizes geometrical optical illusions: framing and contrast effects, distortion of angles and direction, and apparent \"movement\" of images. 240 drawings. 1972 edition." }, { "Title":"The Psychology of Women", @@ -105,15 +85,11 @@ }, { "Title":"Psychology and Race", - "Text":"' Psychology and Race is divided into two major parts. The first half of the book looks at the interracial situation itself." - }, - { - "Title":"Psychology for A-Level", - "Text":"'Precisely targeted at AQA A Level Psychology, specification A. It will also be of interest to those who are new to psychology, and who want to get a flavour of the kinds of topics in which psychologists are interested'--Preface, p. vii." + "Text":"Psychology and Race is divided into two major parts. The first half of the book looks at the interracial situation itself. The second half is a mystery." }, { "Title":"Biological Psychology", - "Text":"Updated with new topics, examples, and recent research findings--and supported by new online bio-labs, part of the strongest media package yet--this text speaks to today’s students and instructors." + "Text":"Updated with new topics, examples, and recent research findings -- and supported by new online bio-labs, part of the strongest media package yet. This text speaks to today's students and instructors." }, { "Title":"Psychology: Concepts & Connections", @@ -121,15 +97,15 @@ }, { "Title":"The Psychology of Adoption", - "Text":"In this volume David Brodzinsky, who has conducted one of the nation's largest studies of adopted children, and Marshall Schechter, a noted child psychiatrist who has been involved with adoption related issues for over forty years, have" + "Text":"In this volume David Brodzinsky, who has conducted one of the nation's largest studies of adopted children, and Marshall Schechter, a noted child psychiatrist who has been involved with adoption related issues for over forty years, have done what was previously thought impossible." }, { "Title":"Psychology and Adult Learning", - "Text":"This new edition is thoroughly revised and updated in light of the impact of globalising processes and the application of new information technologies, and the influence of postmodernism on psychology." + "Text":"This new edition is thoroughly revised and updated in light of the impact of new processes and the application of new information technologies, and the influence of postmodernism on psychology." }, { "Title":"Gestalt Psychology: An Introduction to New Concepts in", - "Text":"The general reader, if he looks to psychology for something more than entertainment or practical advice, will discover in this book a storehouse of searching criticism and brilliant suggestions from the pen of a rare thinker, and one who" + "Text":"The general reader, if he looks to psychology for something more than entertainment or practical advice, will discover in this book a storehouse of searching criticism and brilliant suggestions from the pen of a rare thinker, and one who enjoys the smell of his own farts." }, { "Title":"The Psychology of Goals", @@ -139,29 +115,17 @@ "Title":"Metaphors in the History of Psychology", "Text":"Through the identification of these metaphors, the contributors to this volume have provided a remarkably useful guide to the history, current orientations, and future prospects of modern psychology." }, - { - "Title":"Abnormal Psychology: An Integrative Approach", - "Text":"ABNORMAL PSYCHOLOGY: AN INTEGRATIVE APPROACH, Seventh Edition, is the perfect book to help you succeed in your abnormal psychology course!" - }, - { - "Title":"Art and Visual Perception: A Psychology of the Creative Eye", - "Text":"Gestalt theory and the psychology of visual perception form the basis for an analysis of art and its basic elements" - }, { "Title":"Psychology & Christianity: Five Views", "Text":"This revised edition of a widely appreciated text now presents five models for understanding the relationship between psychology and Christianity." }, { "Title":"The Psychology of Hope: You Can Get There from Here", - "Text":"Why do some people lead positive, hope-filled lives, while others wallow in pessimism? In The Psychology of Hope, a professor of psychology reveals the specific character traits that produce highly hopeful individuals." + "Text":"Why do some people lead positive, hope-filled lives, while others wallow in pessimism? In \"The Psychology of Hope\", a professor of psychology reveals the specific character traits that produce highly hopeful individuals." }, { "Title":"Perspectives on Psychology", - "Text":"This is a title in the modular 'Principles in Psychology Series', designed for A-level and other introductory courses, aiming to provide students embarking on psychology courses with the necessary background and context." - }, - { - "Title":"Psychology the Easy Way", - "Text":"Material is presented in a way that makes these books ideal as self-teaching guides, but Easy Way titles are also preferred by many teachers as supplements to classroom textbooks." + "Text":"This is a title in the modular \"Principles in Psychology Series\", designed for A-level and other introductory courses, aiming to provide students embarking on psychology courses with the necessary background and context." }, { "Title":"Ethics in Psychology: Professional Standards and Cases", @@ -169,35 +133,23 @@ }, { "Title":"Psychology Gets in the Game: Sport, Mind, and Behavior,", - "Text":"The essays collected in this volume tell the stories not only of these psychologists and their subjects but of the social and academic context that surrounded them, shaping and being shaped by their ideas'--Provided by publisher." - }, - { - "Title":"Psychology for Physical Educators: Student in Focus", - "Text":"This updated edition focuses on attitude and motivation as important aspects of the physical education curriculum, illustrating practical ideas and pedagogical solutions for any PE setting." + "Text":"The essays collected in this volume tell the stories not only of these psychologists and their subjects but of the social and academic context that surrounded them, shaping and being shaped by their ideas." }, { "Title":"The Psychology of Leadership: New Perspectives and Research", - "Text":"In this book, some of the world's leading scholars come together to describe their thinking and research on the topic of the psychology of leadership." + "Text":"Some of the world's leading scholars came together to describe their thinking and research on the topic of the psychology of leadership." }, { "Title":"The Psychology of Interpersonal Relations", - "Text":"As the title suggests, this book examines the psychology of interpersonal relations. In the context of this book, the term 'interpersonal relations' denotes relations between a few, usually between two, people." - }, - { - "Title":"Applied Psychology", - "Text":"The chapters on Counselling Psychology and Teaching Psychology are available online via the Student Companion Site at: http://tinyurl.com/c3ztvtj The text is written to be accessible to Level 1 Introductory Psychology students, and also to" + "Text":"As the title suggests, this book examines the psychology of interpersonal relations. In the context of this book, the term \"interpersonal relations\" denotes relations between a few, usually between two, people." }, { "Title":"Psychology", "Text":"An exciting read for anyone interested in psychology and research; because of its comprehensive appendix, glossary, and reference section, this book is a must-have desk reference for psychologists and others in the field." }, - { - "Title":"The Psychology of Music", - "Text":"On interpreting musical phenomena in terms of mental function" - }, { "Title":"Abnormal Psychology", - "Text":"Ron Comer's Abnormal Psychology continues to captivate students with its integrated coverage of theory, diagnosis, and treatment, its inclusive wide-ranging cross-cultural perspective, and its compassionate emphasis on the real impact of" + "Text":"Ron Comer's Abnormal Psychology continues to captivate students with its integrated coverage of theory, diagnosis, and treatment, its inclusive wide-ranging cross-cultural perspective, and its compassionate emphasis on the real impact of hugs." }, { "Title":"The Psychology of Food Choice", @@ -205,19 +157,15 @@ }, { "Title":"Psychology: brain, behavior, & culture", - "Text":"Rather than present psychological science as a series of facts for memorization, this book takes readers on a psychological journey that uncovers things they didn't know or new ways of thinking about things they did know." + "Text":"Rather than present psychological science as a series of facts for memorization, this book takes readers on a psychological journey that uncovers things they didn't know and new ways of thinking about things they did know." }, { "Title":"A Brief History of Psychology", - "Text":"Due to its brevity and engaging style, the book is often used in introductory courses to introduce students to the field. The enormous index and substantial glossary make this volume a useful desk reference for the entire field." - }, - { - "Title":"Psychology AS: The Complete Companion", - "Text":"Presented in double-page spreads this book written to the average AS ability level, provides information on psychology in bite-sized chunks with learning and revision features." + "Text":"Due to its brevity and engaging style, this book is often used in introductory courses to introduce students to the field. The enormous index and substantial glossary make this volume a useful desk reference for the entire field." }, { "Title":"The Psychology Book: From Shamanism to Cutting-Edge", - "Text":"Lavishly illustrated, this new addition in the Sterling's Milestones series chronicles the history of psychology through 250 groundbreaking events, theories, publications, experiments and discoveries." + "Text":"Lavishly illustrated, this new addition in Sterling's Milestones series chronicles the history of psychology through 250 groundbreaking events, theories, publications, experiments and discoveries." }, { "Title":"The Psychology Book", @@ -225,15 +173,15 @@ }, { "Title":"Handbook of Positive Psychology", - "Text":"' The Handbook of Positive Psychology provides a forum for a more positive view of the human condition. In its pages, readers are treated to an analysis of what the foremost experts believe to be the fundamental strengths of humankind." + "Text":"The Handbook of Positive Psychology provides a forum for a more positive view of the human condition. In its pages, readers are treated to an analysis of what the foremost experts believe to be the fundamental strengths of humankind." }, { "Title":"Psychology of Sustainable Development", - "Text":"With contributions from an international team of policy shapers and makers, the book will be an important reference for environmental, developmental, social, and organizational psychologists, in addition to other social scientists concerned" + "Text":"With contributions from an international team of policy shapers and makers, the book will be an important reference for environmental, developmental, social, and organizational psychologists, in addition to other social scientists concerned about the environment." }, { "Title":"An Introduction to the History of Psychology", - "Text":"In this Fifth Edition, B.R. Hergenhahn demonstrates that most of the concerns of contemporary psychologists are manifestations of themes that have been part of psychology for hundreds-or even thousands-of years." + "Text":"In this Fifth Edition, B.R. Hergenhahn demonstrates that most of the concerns of contemporary psychologists are manifestations of themes that have been part of psychology for thousands of years." }, { "Title":"Careers in Psychology: Opportunities in a Changing World", @@ -241,39 +189,23 @@ }, { "Title":"Philosophy of Psychology", - "Text":"This is the story of the clattering of elevated subways and the cacophony of crowded neighborhoods, the heady optimism of industrial progress and the despair of economic recession, and the vibrancy of ethnic cultures and the resilience of" + "Text":"This is the story of the clattering of elevated subways and the cacophony of crowded neighborhoods, the heady optimism of industrial progress and the despair of economic recession, and the vibrancy of ethnic cultures and the resilience of the lower class." }, { "Title":"The Psychology of Risk Taking Behavior", "Text":"This book aims to help the reader to understand what motivates people to engage in risk taking behavior, such as participating in traffic, sports, financial investments, or courtship." }, { - "Title":"The Nazi Doctors: Medical Killing and the Psychology of", - "Text":"This book explores the psychological conditions that promote the human potential for evil, relating medical killing to broader principles of doubling and genocide" - }, - { - "Title":"The Body and Psychology", - "Text":"The material in this volume was previously published as a Special Issue of th" - }, - { - "Title":"Introduction to Psychology: Gateways to Mind and Behavior", + "Title":"Legal Notices", "Text":"Important Notice: Media content referenced within the product description or the product text may not be available in the ebook version." }, - { - "Title":"Psychology of Time", - "Text":"Basic Structure The book would contain 14 or 15 chapters of roughly 12 000 words. The exact final number of chapters would depend on further discussions with you about the book's basic structure." - }, { "Title":"Handbook of Psychology, Experimental Psychology", "Text":"Includes established theories and cutting-edge developments. Presents the work of an international group of experts. Presents the nature, origin, implications, and future course of major unresolved issues in the area." }, - { - "Title":"Study Guide for Psychology, Seventh Edition", - "Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field--cognition, gender and diversity studies, neuroscience and more, while at the same time using the most" - }, { "Title":"Culture and Psychology", - "Text":"In addition, the text encourages students to question traditionally held beliefs and theories as and their relevance to different cultural groups today." + "Text":"In addition, the text encourages students to question traditionally held beliefs and theories and their relevance to different cultural groups today." }, { "Title":"Exploring the Psychology of Interest", @@ -289,43 +221,23 @@ }, { "Title":"The Psychology of Social Class", - "Text":"By addressing differences in social class, the book broadens the perspective of social psychological research to examine such topics as the effect of achievement motivation and other personality variables on social mobility and the effect" - }, - { - "Title":"Applied Psychology: Current Issues and New Directions", - "Text":"Key features of this book: - Consistently pedagogical throughout - chapter summaries, questions for reflection and discussion and annotated further reading in every chapter - Comprehensive coverage - all areas of applied psychology included" + "Text":"By addressing differences in social class, the book broadens the perspective of social psychological research to examine such topics as the effect of achievement motivation, personality variables on social mobility, and the effect of winning the lottery." }, { "Title":"Popular Psychology: An Encyclopedia", "Text":"Entries cover a variety of topics in the field of popular psychology, including acupuncture, emotional intelligence, brainwashing, chemical inbalance, and seasonal affective disorder." }, - { - "Title":"Advanced Psychology: Applications, Issues and Perspectives", - "Text":"The second of two books, Advanced Psychology covers units 4 to 6 for the second year at Advanced Level." - }, - { - "Title":"Mindset: The New Psychology of Success", - "Text":"This is a book that can change your life, as its ideas have changed mine.”—Robert J. Sternberg, IBM Professor of Education and Psychology at Yale University, director of the PACE Center of Yale University, and author of Successful" - }, { "Title":"E-Z Psychology", - "Text":"This book covers material as it is taught on a college-101 level." - }, - { - "Title":"Myers' Psychology for AP*", - "Text":"Already The Bestselling AP* Psychology Author, Myers Writes His First Exclusive AP* Psych Text Watch Dave G. Myers introduce this new text here." + "Text":"This book covers material as it is taught on a college-101 level. There is no substance in this book that the casual observer of humans would not already know." }, { "Title":"Psychology and Health", "Text":"Part of a series of textbooks which have been written to support A levels in psychology. The books use real life applications to make theories come alive for students and teach them what they need to know." }, - { - "Title":"Applying Psychology in Business: The Handbook for Managers", - "Text":"To learn more about Rowman & Littlefield titles please visit us at www.rowmanlittlefield.com." - }, { "Title":"Influence", - "Text":"Influence, the classic book on persuasion, explains the psychology of why people say 'yes'—and how to apply these understandings. Dr. Robert Cialdini is the seminal expert in the rapidly expanding field of influence and persuasion." + "Text":"Influence is the classic book on persuasion. It explains the psychology of why people say 'yes' and how to apply these understandings. Dr. Robert Cialdini is the seminal expert in the rapidly expanding field of influence and persuasion." }, { "Title":"Psychology and Policing", @@ -333,11 +245,7 @@ }, { "Title":"Applied Psychology: New Frontiers and Rewarding Careers", - "Text":"This book examines how psychological science is, and can be, used to prevent and ameliorate pressing human problems to promote positive social change." - }, - { - "Title":"Psychology: Concepts and Applications", - "Text":"Nevid developed the effective teaching devices in this text based on a comprehensive system derived from research on learning and memory as well as his own research on textbook pedagogy." + "Text":"This book examines how psychological science is, and can be, used to prevent and improve pressing human problems to promote positive social change." }, { "Title":"Foundations of Sport and Exercise Psychology, 6E: ", @@ -345,7 +253,7 @@ }, { "Title":"Biographical Dictionary of Psychology", - "Text":"This Dictionary provides biographical and bibliographical information on over 500 psychologists from all over the world from 1850 to the present day. All branches of psychology and its related disciplines are featured." + "Text":"This dictionary provides biographical and bibliographical information on over 500 psychologists from all over the world from 1850 to the present day. All branches of psychology and its related disciplines are featured." }, { "Title":"Psychology: A Self-Teaching Guide", @@ -354,8 +262,4 @@ { "Title":"A Dictionary of Psychology", "Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text." - }, - { - "Title":"An Intellectual History of Psychology", - "Text":"Invaluable as a text for students and as a stimulating and insightful overview for scholars and practicing psychologists, this volume can be read either as a history of psychology in both its philosophical and aspiring scientific periods or" - }] \ No newline at end of file + }] From 0a32e0251e1550885a466e348a2c80b452e8eebb Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 11:30:21 +0200 Subject: [PATCH 13/42] Fixes to pokemon names: porygon, porygon z and ho-oh --- .../Modules/Games/Commands/Trivia/TriviaQuestionPool.cs | 2 +- .../data/pokemon/{name-id_map3.json => name-id_map4.json} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/NadekoBot/data/pokemon/{name-id_map3.json => name-id_map4.json} (52%) diff --git a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs index e98830f5..ad752e95 100644 --- a/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs +++ b/src/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs @@ -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_map3.json"; + private const string pokemonMapPath = "data/pokemon/name-id_map4.json"; private readonly int maxPokemonId; private Random rng { get; } = new NadekoRandom(); diff --git a/src/NadekoBot/data/pokemon/name-id_map3.json b/src/NadekoBot/data/pokemon/name-id_map4.json similarity index 52% rename from src/NadekoBot/data/pokemon/name-id_map3.json rename to src/NadekoBot/data/pokemon/name-id_map4.json index fa0b9d9c..ed6411fa 100644 --- a/src/NadekoBot/data/pokemon/name-id_map3.json +++ b/src/NadekoBot/data/pokemon/name-id_map4.json @@ -1 +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 z"},{"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":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file +[{"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":"ampharos"},{"Id":182,"Name":"bellossom"},{"Id":183,"Name":"marill"},{"Id":184,"Name":"azumarill"},{"Id":185,"Name":"sudowoodo"},{"Id":186,"Name":"politoed"},{"Id":187,"Name":"hoppip"},{"Id":188,"Name":"skiploom"},{"Id":189,"Name":"jumpluff"},{"Id":190,"Name":"aipom"},{"Id":191,"Name":"sunkern"},{"Id":192,"Name":"sunflora"},{"Id":193,"Name":"yanma"},{"Id":194,"Name":"wooper"},{"Id":195,"Name":"quagsire"},{"Id":196,"Name":"espeon"},{"Id":197,"Name":"umbreon"},{"Id":198,"Name":"murkrow"},{"Id":199,"Name":"slowking"},{"Id":200,"Name":"misdreavus"},{"Id":201,"Name":"unown"},{"Id":202,"Name":"wobbuffet"},{"Id":203,"Name":"girafarig"},{"Id":204,"Name":"pineco"},{"Id":205,"Name":"forretress"},{"Id":206,"Name":"dunsparce"},{"Id":207,"Name":"gligar"},{"Id":208,"Name":"steelix"},{"Id":209,"Name":"snubbull"},{"Id":210,"Name":"granbull"},{"Id":211,"Name":"qwilfish"},{"Id":212,"Name":"scizor"},{"Id":213,"Name":"shuckle"},{"Id":214,"Name":"heracross"},{"Id":215,"Name":"sneasel"},{"Id":216,"Name":"teddiursa"},{"Id":217,"Name":"ursaring"},{"Id":218,"Name":"slugma"},{"Id":219,"Name":"magcargo"},{"Id":220,"Name":"swinub"},{"Id":221,"Name":"piloswine"},{"Id":222,"Name":"corsola"},{"Id":223,"Name":"remoraid"},{"Id":224,"Name":"octillery"},{"Id":225,"Name":"delibird"},{"Id":226,"Name":"mantine"},{"Id":227,"Name":"skarmory"},{"Id":228,"Name":"houndour"},{"Id":229,"Name":"houndoom"},{"Id":230,"Name":"kingdra"},{"Id":231,"Name":"phanpy"},{"Id":232,"Name":"donphan"},{"Id":233,"Name":"porygon2"},{"Id":234,"Name":"stantler"},{"Id":235,"Name":"smeargle"},{"Id":236,"Name":"tyrogue"},{"Id":237,"Name":"hitmontop"},{"Id":238,"Name":"smoochum"},{"Id":239,"Name":"elekid"},{"Id":240,"Name":"magby"},{"Id":241,"Name":"miltank"},{"Id":242,"Name":"blissey"},{"Id":243,"Name":"raikou"},{"Id":244,"Name":"entei"},{"Id":245,"Name":"suicune"},{"Id":246,"Name":"larvitar"},{"Id":247,"Name":"pupitar"},{"Id":248,"Name":"tyranitar"},{"Id":249,"Name":"lugia"},{"Id":250,"Name":"ho-oh"},{"Id":251,"Name":"celebi"},{"Id":252,"Name":"treecko"},{"Id":253,"Name":"grovyle"},{"Id":254,"Name":"sceptile"},{"Id":255,"Name":"torchic"},{"Id":256,"Name":"combusken"},{"Id":257,"Name":"blaziken"},{"Id":258,"Name":"mudkip"},{"Id":259,"Name":"marshtomp"},{"Id":260,"Name":"swampert"},{"Id":261,"Name":"poochyena"},{"Id":262,"Name":"mightyena"},{"Id":263,"Name":"zigzagoon"},{"Id":264,"Name":"linoone"},{"Id":265,"Name":"wurmple"},{"Id":266,"Name":"silcoon"},{"Id":267,"Name":"beautifly"},{"Id":268,"Name":"cascoon"},{"Id":269,"Name":"dustox"},{"Id":270,"Name":"lotad"},{"Id":271,"Name":"lombre"},{"Id":272,"Name":"ludicolo"},{"Id":273,"Name":"seedot"},{"Id":274,"Name":"nuzleaf"},{"Id":275,"Name":"shiftry"},{"Id":276,"Name":"taillow"},{"Id":277,"Name":"swellow"},{"Id":278,"Name":"wingull"},{"Id":279,"Name":"pelipper"},{"Id":280,"Name":"ralts"},{"Id":281,"Name":"kirlia"},{"Id":282,"Name":"gardevoir"},{"Id":283,"Name":"surskit"},{"Id":284,"Name":"masquerain"},{"Id":285,"Name":"shroomish"},{"Id":286,"Name":"breloom"},{"Id":287,"Name":"slakoth"},{"Id":288,"Name":"vigoroth"},{"Id":289,"Name":"slaking"},{"Id":290,"Name":"nincada"},{"Id":291,"Name":"ninjask"},{"Id":292,"Name":"shedinja"},{"Id":293,"Name":"whismur"},{"Id":294,"Name":"loudred"},{"Id":295,"Name":"exploud"},{"Id":296,"Name":"makuhita"},{"Id":297,"Name":"hariyama"},{"Id":298,"Name":"azurill"},{"Id":299,"Name":"nosepass"},{"Id":300,"Name":"skitty"},{"Id":301,"Name":"delcatty"},{"Id":302,"Name":"sableye"},{"Id":303,"Name":"mawile"},{"Id":304,"Name":"aron"},{"Id":305,"Name":"lairon"},{"Id":306,"Name":"aggron"},{"Id":307,"Name":"meditite"},{"Id":308,"Name":"medicham"},{"Id":309,"Name":"electrike"},{"Id":310,"Name":"manectric"},{"Id":311,"Name":"plusle"},{"Id":312,"Name":"minun"},{"Id":313,"Name":"volbeat"},{"Id":314,"Name":"illumise"},{"Id":315,"Name":"roselia"},{"Id":316,"Name":"gulpin"},{"Id":317,"Name":"swalot"},{"Id":318,"Name":"carvanha"},{"Id":319,"Name":"sharpedo"},{"Id":320,"Name":"wailmer"},{"Id":321,"Name":"wailord"},{"Id":322,"Name":"numel"},{"Id":323,"Name":"camerupt"},{"Id":324,"Name":"torkoal"},{"Id":325,"Name":"spoink"},{"Id":326,"Name":"grumpig"},{"Id":327,"Name":"spinda"},{"Id":328,"Name":"trapinch"},{"Id":329,"Name":"vibrava"},{"Id":330,"Name":"flygon"},{"Id":331,"Name":"cacnea"},{"Id":332,"Name":"cacturne"},{"Id":333,"Name":"swablu"},{"Id":334,"Name":"altaria"},{"Id":335,"Name":"zangoose"},{"Id":336,"Name":"seviper"},{"Id":337,"Name":"lunatone"},{"Id":338,"Name":"solrock"},{"Id":339,"Name":"barboach"},{"Id":340,"Name":"whiscash"},{"Id":341,"Name":"corphish"},{"Id":342,"Name":"crawdaunt"},{"Id":343,"Name":"baltoy"},{"Id":344,"Name":"claydol"},{"Id":345,"Name":"lileep"},{"Id":346,"Name":"cradily"},{"Id":347,"Name":"anorith"},{"Id":348,"Name":"armaldo"},{"Id":349,"Name":"feebas"},{"Id":350,"Name":"milotic"},{"Id":351,"Name":"castform"},{"Id":352,"Name":"kecleon"},{"Id":353,"Name":"shuppet"},{"Id":354,"Name":"banette"},{"Id":355,"Name":"duskull"},{"Id":356,"Name":"dusclops"},{"Id":357,"Name":"tropius"},{"Id":358,"Name":"chimecho"},{"Id":359,"Name":"absol"},{"Id":360,"Name":"wynaut"},{"Id":361,"Name":"snorunt"},{"Id":362,"Name":"glalie"},{"Id":363,"Name":"spheal"},{"Id":364,"Name":"sealeo"},{"Id":365,"Name":"walrein"},{"Id":366,"Name":"clamperl"},{"Id":367,"Name":"huntail"},{"Id":368,"Name":"gorebyss"},{"Id":369,"Name":"relicanth"},{"Id":370,"Name":"luvdisc"},{"Id":371,"Name":"bagon"},{"Id":372,"Name":"shelgon"},{"Id":373,"Name":"salamence"},{"Id":374,"Name":"beldum"},{"Id":375,"Name":"metang"},{"Id":376,"Name":"metagross"},{"Id":377,"Name":"regirock"},{"Id":378,"Name":"regice"},{"Id":379,"Name":"registeel"},{"Id":380,"Name":"latias"},{"Id":381,"Name":"latios"},{"Id":382,"Name":"kyogre"},{"Id":383,"Name":"groudon"},{"Id":384,"Name":"rayquaza"},{"Id":385,"Name":"jirachi"},{"Id":386,"Name":"deoxys"},{"Id":387,"Name":"turtwig"},{"Id":388,"Name":"grotle"},{"Id":389,"Name":"torterra"},{"Id":390,"Name":"chimchar"},{"Id":391,"Name":"monferno"},{"Id":392,"Name":"infernape"},{"Id":393,"Name":"piplup"},{"Id":394,"Name":"prinplup"},{"Id":395,"Name":"empoleon"},{"Id":396,"Name":"starly"},{"Id":397,"Name":"staravia"},{"Id":398,"Name":"staraptor"},{"Id":399,"Name":"bidoof"},{"Id":400,"Name":"bibarel"},{"Id":401,"Name":"kricketot"},{"Id":402,"Name":"kricketune"},{"Id":403,"Name":"shinx"},{"Id":404,"Name":"luxio"},{"Id":405,"Name":"luxray"},{"Id":406,"Name":"budew"},{"Id":407,"Name":"roserade"},{"Id":408,"Name":"cranidos"},{"Id":409,"Name":"rampardos"},{"Id":410,"Name":"shieldon"},{"Id":411,"Name":"bastiodon"},{"Id":412,"Name":"burmy"},{"Id":413,"Name":"wormadam"},{"Id":414,"Name":"mothim"},{"Id":415,"Name":"combee"},{"Id":416,"Name":"vespiquen"},{"Id":417,"Name":"pachirisu"},{"Id":418,"Name":"buizel"},{"Id":419,"Name":"floatzel"},{"Id":420,"Name":"cherubi"},{"Id":421,"Name":"cherrim"},{"Id":422,"Name":"shellos"},{"Id":423,"Name":"gastrodon"},{"Id":424,"Name":"ambipom"},{"Id":425,"Name":"drifloon"},{"Id":426,"Name":"drifblim"},{"Id":427,"Name":"buneary"},{"Id":428,"Name":"lopunny"},{"Id":429,"Name":"mismagius"},{"Id":430,"Name":"honchkrow"},{"Id":431,"Name":"glameow"},{"Id":432,"Name":"purugly"},{"Id":433,"Name":"chingling"},{"Id":434,"Name":"stunky"},{"Id":435,"Name":"skuntank"},{"Id":436,"Name":"bronzor"},{"Id":437,"Name":"bronzong"},{"Id":438,"Name":"bonsly"},{"Id":439,"Name":"mime jr"},{"Id":440,"Name":"happiny"},{"Id":441,"Name":"chatot"},{"Id":442,"Name":"spiritomb"},{"Id":443,"Name":"gible"},{"Id":444,"Name":"gabite"},{"Id":445,"Name":"garchomp"},{"Id":446,"Name":"munchlax"},{"Id":447,"Name":"riolu"},{"Id":448,"Name":"lucario"},{"Id":449,"Name":"hippopotas"},{"Id":450,"Name":"hippowdon"},{"Id":451,"Name":"skorupi"},{"Id":452,"Name":"drapion"},{"Id":453,"Name":"croagunk"},{"Id":454,"Name":"toxicroak"},{"Id":455,"Name":"carnivine"},{"Id":456,"Name":"finneon"},{"Id":457,"Name":"lumineon"},{"Id":458,"Name":"mantyke"},{"Id":459,"Name":"snover"},{"Id":460,"Name":"abomasnow"},{"Id":461,"Name":"weavile"},{"Id":462,"Name":"magnezone"},{"Id":463,"Name":"lickilicky"},{"Id":464,"Name":"rhyperior"},{"Id":465,"Name":"tangrowth"},{"Id":466,"Name":"electivire"},{"Id":467,"Name":"magmortar"},{"Id":468,"Name":"togekiss"},{"Id":469,"Name":"yanmega"},{"Id":470,"Name":"leafeon"},{"Id":471,"Name":"glaceon"},{"Id":472,"Name":"gliscor"},{"Id":473,"Name":"mamoswine"},{"Id":474,"Name":"porygon z"},{"Id":475,"Name":"gallade"},{"Id":476,"Name":"probopass"},{"Id":477,"Name":"dusknoir"},{"Id":478,"Name":"froslass"},{"Id":479,"Name":"rotom"},{"Id":480,"Name":"uxie"},{"Id":481,"Name":"mesprit"},{"Id":482,"Name":"azelf"},{"Id":483,"Name":"dialga"},{"Id":484,"Name":"palkia"},{"Id":485,"Name":"heatran"},{"Id":486,"Name":"regigigas"},{"Id":487,"Name":"giratina"},{"Id":488,"Name":"cresselia"},{"Id":489,"Name":"phione"},{"Id":490,"Name":"manaphy"},{"Id":491,"Name":"darkrai"},{"Id":492,"Name":"shaymin"},{"Id":493,"Name":"arceus"},{"Id":494,"Name":"victini"},{"Id":495,"Name":"snivy"},{"Id":496,"Name":"servine"},{"Id":497,"Name":"serperior"},{"Id":498,"Name":"tepig"},{"Id":499,"Name":"pignite"},{"Id":500,"Name":"emboar"},{"Id":501,"Name":"oshawott"},{"Id":502,"Name":"dewott"},{"Id":503,"Name":"samurott"},{"Id":504,"Name":"patrat"},{"Id":505,"Name":"watchog"},{"Id":506,"Name":"lillipup"},{"Id":507,"Name":"herdier"},{"Id":508,"Name":"stoutland"},{"Id":509,"Name":"purrloin"},{"Id":510,"Name":"liepard"},{"Id":511,"Name":"pansage"},{"Id":512,"Name":"simisage"},{"Id":513,"Name":"pansear"},{"Id":514,"Name":"simisear"},{"Id":515,"Name":"panpour"},{"Id":516,"Name":"simipour"},{"Id":517,"Name":"munna"},{"Id":518,"Name":"musharna"},{"Id":519,"Name":"pidove"},{"Id":520,"Name":"tranquill"},{"Id":521,"Name":"unfezant"},{"Id":522,"Name":"blitzle"},{"Id":523,"Name":"zebstrika"},{"Id":524,"Name":"roggenrola"},{"Id":525,"Name":"boldore"},{"Id":526,"Name":"gigalith"},{"Id":527,"Name":"woobat"},{"Id":528,"Name":"swoobat"},{"Id":529,"Name":"drilbur"},{"Id":530,"Name":"excadrill"},{"Id":531,"Name":"audino"},{"Id":532,"Name":"timburr"},{"Id":533,"Name":"gurdurr"},{"Id":534,"Name":"conkeldurr"},{"Id":535,"Name":"tympole"},{"Id":536,"Name":"palpitoad"},{"Id":537,"Name":"seismitoad"},{"Id":538,"Name":"throh"},{"Id":539,"Name":"sawk"},{"Id":540,"Name":"sewaddle"},{"Id":541,"Name":"swadloon"},{"Id":542,"Name":"leavanny"},{"Id":543,"Name":"venipede"},{"Id":544,"Name":"whirlipede"},{"Id":545,"Name":"scolipede"},{"Id":546,"Name":"cottonee"},{"Id":547,"Name":"whimsicott"},{"Id":548,"Name":"petilil"},{"Id":549,"Name":"lilligant"},{"Id":550,"Name":"basculin"},{"Id":551,"Name":"sandile"},{"Id":552,"Name":"krokorok"},{"Id":553,"Name":"krookodile"},{"Id":554,"Name":"darumaka"},{"Id":555,"Name":"darmanitan"},{"Id":556,"Name":"maractus"},{"Id":557,"Name":"dwebble"},{"Id":558,"Name":"crustle"},{"Id":559,"Name":"scraggy"},{"Id":560,"Name":"scrafty"},{"Id":561,"Name":"sigilyph"},{"Id":562,"Name":"yamask"},{"Id":563,"Name":"cofagrigus"},{"Id":564,"Name":"tirtouga"},{"Id":565,"Name":"carracosta"},{"Id":566,"Name":"archen"},{"Id":567,"Name":"archeops"},{"Id":568,"Name":"trubbish"},{"Id":569,"Name":"garbodor"},{"Id":570,"Name":"zorua"},{"Id":571,"Name":"zoroark"},{"Id":572,"Name":"minccino"},{"Id":573,"Name":"cinccino"},{"Id":574,"Name":"gothita"},{"Id":575,"Name":"gothorita"},{"Id":576,"Name":"gothitelle"},{"Id":577,"Name":"solosis"},{"Id":578,"Name":"duosion"},{"Id":579,"Name":"reuniclus"},{"Id":580,"Name":"ducklett"},{"Id":581,"Name":"swanna"},{"Id":582,"Name":"vanillite"},{"Id":583,"Name":"vanillish"},{"Id":584,"Name":"vanilluxe"},{"Id":585,"Name":"deerling"},{"Id":586,"Name":"sawsbuck"},{"Id":587,"Name":"emolga"},{"Id":588,"Name":"karrablast"},{"Id":589,"Name":"escavalier"},{"Id":590,"Name":"foongus"},{"Id":591,"Name":"amoonguss"},{"Id":592,"Name":"frillish"},{"Id":593,"Name":"jellicent"},{"Id":594,"Name":"alomomola"},{"Id":595,"Name":"joltik"},{"Id":596,"Name":"galvantula"},{"Id":597,"Name":"ferroseed"},{"Id":598,"Name":"ferrothorn"},{"Id":599,"Name":"klink"},{"Id":600,"Name":"klang"},{"Id":601,"Name":"klinklang"},{"Id":602,"Name":"tynamo"},{"Id":603,"Name":"eelektrik"},{"Id":604,"Name":"eelektross"},{"Id":605,"Name":"elgyem"},{"Id":606,"Name":"beheeyem"},{"Id":607,"Name":"litwick"},{"Id":608,"Name":"lampent"},{"Id":609,"Name":"chandelure"},{"Id":610,"Name":"axew"},{"Id":611,"Name":"fraxure"},{"Id":612,"Name":"haxorus"},{"Id":613,"Name":"cubchoo"},{"Id":614,"Name":"beartic"},{"Id":615,"Name":"cryogonal"},{"Id":616,"Name":"shelmet"},{"Id":617,"Name":"accelgor"},{"Id":618,"Name":"stunfisk"},{"Id":619,"Name":"mienfoo"},{"Id":620,"Name":"mienshao"},{"Id":621,"Name":"druddigon"},{"Id":622,"Name":"golett"},{"Id":623,"Name":"golurk"},{"Id":624,"Name":"pawniard"},{"Id":625,"Name":"bisharp"},{"Id":626,"Name":"bouffalant"},{"Id":627,"Name":"rufflet"},{"Id":628,"Name":"braviary"},{"Id":629,"Name":"vullaby"},{"Id":630,"Name":"mandibuzz"},{"Id":631,"Name":"heatmor"},{"Id":632,"Name":"durant"},{"Id":633,"Name":"deino"},{"Id":634,"Name":"zweilous"},{"Id":635,"Name":"hydreigon"},{"Id":636,"Name":"larvesta"},{"Id":637,"Name":"volcarona"},{"Id":638,"Name":"cobalion"},{"Id":639,"Name":"terrakion"},{"Id":640,"Name":"virizion"},{"Id":641,"Name":"tornadus"},{"Id":642,"Name":"thundurus"},{"Id":643,"Name":"reshiram"},{"Id":644,"Name":"zekrom"},{"Id":645,"Name":"landorus"},{"Id":646,"Name":"kyurem"},{"Id":647,"Name":"keldeo"},{"Id":648,"Name":"meloetta"},{"Id":649,"Name":"genesect"},{"Id":650,"Name":"chespin"},{"Id":651,"Name":"quilladin"},{"Id":652,"Name":"chesnaught"},{"Id":653,"Name":"fennekin"},{"Id":654,"Name":"braixen"},{"Id":655,"Name":"delphox"},{"Id":656,"Name":"froakie"},{"Id":657,"Name":"frogadier"},{"Id":658,"Name":"greninja"},{"Id":659,"Name":"bunnelby"},{"Id":660,"Name":"diggersby"},{"Id":661,"Name":"fletchling"},{"Id":662,"Name":"fletchinder"},{"Id":663,"Name":"talonflame"},{"Id":664,"Name":"scatterbug"},{"Id":665,"Name":"spewpa"},{"Id":666,"Name":"vivillon"},{"Id":667,"Name":"litleo"},{"Id":668,"Name":"pyroar"},{"Id":669,"Name":"flabebe"},{"Id":670,"Name":"floette"},{"Id":671,"Name":"florges"},{"Id":672,"Name":"skiddo"},{"Id":673,"Name":"gogoat"},{"Id":674,"Name":"pancham"},{"Id":675,"Name":"pangoro"},{"Id":676,"Name":"furfrou"},{"Id":677,"Name":"espurr"},{"Id":678,"Name":"meowstic"},{"Id":679,"Name":"honedge"},{"Id":680,"Name":"doublade"},{"Id":681,"Name":"aegislash"},{"Id":682,"Name":"spritzee"},{"Id":683,"Name":"aromatisse"},{"Id":684,"Name":"swirlix"},{"Id":685,"Name":"slurpuff"},{"Id":686,"Name":"inkay"},{"Id":687,"Name":"malamar"},{"Id":688,"Name":"binacle"},{"Id":689,"Name":"barbaracle"},{"Id":690,"Name":"skrelp"},{"Id":691,"Name":"dragalge"},{"Id":692,"Name":"clauncher"},{"Id":693,"Name":"clawitzer"},{"Id":694,"Name":"helioptile"},{"Id":695,"Name":"heliolisk"},{"Id":696,"Name":"tyrunt"},{"Id":697,"Name":"tyrantrum"},{"Id":698,"Name":"amaura"},{"Id":699,"Name":"aurorus"},{"Id":700,"Name":"sylveon"},{"Id":701,"Name":"hawlucha"},{"Id":702,"Name":"dedenne"},{"Id":703,"Name":"carbink"},{"Id":704,"Name":"goomy"},{"Id":705,"Name":"sliggoo"},{"Id":706,"Name":"goodra"},{"Id":707,"Name":"klefki"},{"Id":708,"Name":"phantump"},{"Id":709,"Name":"trevenant"},{"Id":710,"Name":"pumpkaboo"},{"Id":711,"Name":"gourgeist"},{"Id":712,"Name":"bergmite"},{"Id":713,"Name":"avalugg"},{"Id":714,"Name":"noibat"},{"Id":715,"Name":"noivern"},{"Id":716,"Name":"xerneas"},{"Id":717,"Name":"yveltal"},{"Id":718,"Name":"zygarde"},{"Id":719,"Name":"diancie"},{"Id":720,"Name":"hoopa"},{"Id":721,"Name":"volcanion"}] \ No newline at end of file From e107bee62f65428c0793be1313cbacaf1c08b09b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 11:35:06 +0200 Subject: [PATCH 14/42] fixed help links when ffmpeg is not properly setup --- src/NadekoBot/Modules/Music/Classes/SongBuffer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Music/Classes/SongBuffer.cs b/src/NadekoBot/Modules/Music/Classes/SongBuffer.cs index 738d07ec..87c01ff6 100644 --- a/src/NadekoBot/Modules/Music/Classes/SongBuffer.cs +++ b/src/NadekoBot/Modules/Music/Classes/SongBuffer.cs @@ -99,8 +99,8 @@ namespace NadekoBot.Modules.Music.Classes Console.WriteLine(@"You have not properly installed or configured FFMPEG. Please install and configure FFMPEG to play music. Check the guides for your platform on how to setup ffmpeg correctly: - Windows Guide: https://goo.gl/SCv72y - Linux Guide: https://goo.gl/rRhjCp"); + Windows Guide: https://goo.gl/OjKk8F + Linux Guide: https://goo.gl/ShjCUo"); Console.ForegroundColor = oldclr; } catch (Exception ex) From 43ff3ad7161120104eea63090a6ab4ea51b1278b Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 11:43:49 +0200 Subject: [PATCH 15/42] Fixed some strings --- .../Resources/ResponseStrings.Designer.cs | 6 +- .../Resources/ResponseStrings.en-US.resx | 4328 ++++++++--------- .../Resources/ResponseStrings.ja-JP.resx | 236 +- src/NadekoBot/Resources/ResponseStrings.resx | 6 +- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 240 +- 5 files changed, 2408 insertions(+), 2408 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.Designer.cs b/src/NadekoBot/Resources/ResponseStrings.Designer.cs index fec34b11..1b0cd969 100644 --- a/src/NadekoBot/Resources/ResponseStrings.Designer.cs +++ b/src/NadekoBot/Resources/ResponseStrings.Designer.cs @@ -250,7 +250,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sucessfully created role {0}. + /// Looks up a localized string similar to Successfully created role {0}. /// public static string administration_cr { get { @@ -340,7 +340,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sucessfully added a new donator.Total donated amount from this user: {0} 👑. + /// Looks up a localized string similar to Successfully added a new donator.Total donated amount from this user: {0} 👑. /// public static string administration_donadd { get { @@ -1351,7 +1351,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Sucessfully added role {0} to user {1}. + /// Looks up a localized string similar to Successfully added role {0} to user {1}. /// public static string administration_setrole { get { diff --git a/src/NadekoBot/Resources/ResponseStrings.en-US.resx b/src/NadekoBot/Resources/ResponseStrings.en-US.resx index c384f48e..3fb0ba18 100644 --- a/src/NadekoBot/Resources/ResponseStrings.en-US.resx +++ b/src/NadekoBot/Resources/ResponseStrings.en-US.resx @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 そのベースはもう要求・破壊されました。 @@ -856,7 +856,7 @@ Fuzzy ユーザー{1}にロール{0}を追加しました - Typo- "Sucessfully" should be 'Successfully' + Typo- "successfully" should be 'Successfully' ロールの追加に失敗しました。アクセス権が足りません。 diff --git a/src/NadekoBot/Resources/ResponseStrings.resx b/src/NadekoBot/Resources/ResponseStrings.resx index 56ada3ed..6f8446b9 100644 --- a/src/NadekoBot/Resources/ResponseStrings.resx +++ b/src/NadekoBot/Resources/ResponseStrings.resx @@ -364,7 +364,7 @@ Reason: {1} Content - Sucessfully created role {0} + Successfully created role {0} Text channel {0} created. @@ -394,7 +394,7 @@ Reason: {1} DM from - Sucessfully added a new donator.Total donated amount from this user: {0} 👑 + Successfully added a new donator.Total donated amount from this user: {0} 👑 Thanks to the people listed below for making this project happen! @@ -701,7 +701,7 @@ Reason: {1} You now have {0} role. - Sucessfully added role {0} to user {1} + Successfully added role {0} to user {1} Failed to add role. I have insufficient permissions. diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index 8fe7d18e..8c3dd6c5 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Та база је већ под захетвом или је уништена. @@ -364,7 +364,7 @@ Reason: {1} Content - Sucessfully created role {0} + successfully created role {0} Text channel {0} created. @@ -394,7 +394,7 @@ Reason: {1} DM from - Sucessfully added a new donator.Total donated amount from this user: {0} 👑 + successfully added a new donator.Total donated amount from this user: {0} 👑 Thanks to the people listed below for making this project hjappen! @@ -712,7 +712,7 @@ Reason: {1} You now have {0} role. - Sucessfully added role {0} to user {1} + successfully added role {0} to user {1} Failed to add role. I have insufficient permissions. From ac3f9f539651262189a5682cfa5d7444ca1763c0 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 14:02:01 +0200 Subject: [PATCH 16/42] Italian added --- .../Commands/LocalizationCommands.cs | 1 + .../Resources/ResponseStrings.it-IT.resx | 2307 +++++++++++++++++ 2 files changed, 2308 insertions(+) create mode 100644 src/NadekoBot/Resources/ResponseStrings.it-IT.resx diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index c8c07fe2..19930059 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -24,6 +24,7 @@ namespace NadekoBot.Modules.Administration {"en-US", "English, United States"}, {"fr-FR", "French, France"}, {"de-DE", "German, Germany"}, + {"it-IT", "Italian, Italy" }, //{"ja-JP", "Japanese, Japan"}, {"nb-NO", "Norwegian (bokmål), Norway"}, {"pl-PL", "Polish, Poland" }, diff --git a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx new file mode 100644 index 00000000..7a09ef5d --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx @@ -0,0 +1,2307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Quella base è già rivendicata o distrutta. + + + Quella base è già distrutta. + + + Quella base non è rivendicata. + + + **DISTRUTTO** base #{0} in una guerra contro {1} + + + {0} ha **NON RIVENDICATO** base #{1} in una guerra contro {2} + + + {0} ha rivendicato la base #{1} in una guerra contro {2} + + + @{0} Hai già rivendicato la base #{1} + + + La rivendicazione di @{0} in una guerra contro {1} + + + Nemico + + + Informazioni sulla guerra contro {0} + + + Numero della base invalido. + + + Dimensione della guerra non valida. + + + Lista delle guerre in corso + + + non rivendicato + + + Non stai partecipando a questa guerra + + + @{0} Tu non stai partecipando in questa guerra, o questa base è già distrutta. + + + Nessuna guerra in corso. + + + Dimensione + + + La guerra contro {0} è già iniziata. + + + Guerra contro {0} creata. + + + Guerra contro {0} finita. + + + Questa guerra non esiste. + + + Guerra contro {0} iniziata! + + + Tutte le reazioni personalizzate approvate. + + + Reazione personalizzata cancellata + + + Permessi insufficienti. Richiede l'essere proprietario del bot per le reazioni personalizzate globali, e l'amministratore del server per le reazioni personalizzate. + + + Lista di tutte le reazioni personalizzate + + + Reazioni Personalizzate + + + Nuove Reazioni Personalizzate + + + Nessuna reazione personalizzata trovata. + + + Nessuna reazione personalizzata trovata con quell'id. + + + Risposta + + + Statistiche Reazioni Personalizzate + + + Statistiche pulite per {0} reazioni personalizzate. + + + Nessuna statistica per questo innesco trovata, nessun azione presa. + + + Innesco + + + Autohentai fermato. + + + Nessun risultato trovato. + + + {0} è già svenuto. + + + {0} ha già gli HP al massimo. + + + il tuo tipo è già {0} + + + Ha usato {0}{1} su {2}{3} per {4} danni. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + Non puoi attaccare senza ritorsione! + Fuzzy + + + Non puoi attaccare te stesso. + + + {0} è svenuto! + + + curato {0} con un {1} + + + {0} ha {1} HP rimasto + + + Non puoi usare {0}. Scrivi `{1}ml` per vedere la lista delle mosse che puoi usare. + + + Listamosse per tipo {0} + + + Non è efficace. + + + Non hai abbastanza {0} + + + Hai resuscitato {0} con un {1} + + + Hai resuscitato te stesso con un {0} + + + Il tuo tipo è stato cambiato in {0} per un {1} + + + E' lievemente efficace. + + + E' superefficace! + + + Hai usato troppe mosse in una volta, non puoi muoverti! + + + Tipo di {0} è {1} + + + Utente non trovato. + + + Sei svenuto, non sei più in grado di muoverti! + + + **Auto assegna ruolo** sull'utente ora entrato è ora **disattivato** + + + **Auto assegna ruolo** sull'utente ora entrato è ora **attivato** + + + Allegato + + + Avatar Cambiato + + + Sei stato bannato dal {0} server. +Ragione: {1} + + + bannati + PLURAL + + + Utente bannato + + + Nome bot cambiato in {0} + + + Stato del bot cambiato in {0} + + + L'eliminazione automatica dei messaggi di arrivederci è stata disabilitata. + + + I messaggi di arrivederci verranno eliminati dopo {0} secondi. + + + Messaggi di arrivederci attuali: {0} + + + Attiva i messaggi di arrivederci scrivendo {0} + + + Nuovo messaggio di arrivederci impostato. + + + Annunci di arrivederci disattivati. + + + Annunci di arrivederci attivati in questo canale + + + Nome del canale cambiato + + + Vecchio Nome + + + Argomento del canale cambiato + + + Pulito. + + + Contenuto + + + Ruolo creato con successo {0} + + + Canale di testo {0} creato. + + + Canale vocale {0} creato. + + + Assordato con successo. + + + Server Eliminato {0} + + + Fermata con successo l'eliminazione automatica dei comandi di invocazione. + + + Avviata con successo l'eliminazione automatica dei comandi di invocazione. + + + Canale di testo {0} eliminato. + + + Canale vocale {0} eliminato. + + + MP da + + + Aggiunto con successo un nuovo donatore. Totale ammontare donato da questo utente: {0} 👑 + + + Grazie alle persone nella lista qui sotto per aver fatto avverare questo progetto! + + + Inoltrerò MP a tutti i proprietari. + + + Inoltrerò MP solo al primo proprietario. + + + Inoltrerò MP da ora in poi. + + + Fermerò l'inoltrare degli MP da ora in poi. + + + L'eliminazione automatica dei messaggi di benvenuto è stata disabilitata + + + I messaggi di benvenuto verranno eliminati dopo {0} secondi. + + + Attuali MP di benvenuto ricevuti: {0} + + + Abilità MP di benvenuto scrivendoli {0} + + + Nuovo MP di bevenuto impostato. + + + MP annunci di bevenenuto disattivato. + + + MP annunci di bevenuto attivati. + + + + + + + + + Nuovo messaggio di benvenuto impostato. + + + Annunci di bevenuto disabilitati + + + Annunci di benvenuto abilitatati in questo canale + + + Non puoi usare questo comando su utenti con un ruolo più alto o uguale al tuo nella gerarchia dei ruoli. + + + Immagine caricata dopo {0} secondi! + + + + + + Parametri Invalidi + + + {0} è entrato {1} + + + Sei stato cacciato dal {0} server. +Ragione: {1} + + + Utente cacciato + + + Lista dei linguaggi + + + + + + + + + il linguaggio dei Bot è impostato a {0} - {1} + + + + + + Il linguaggio di questo server è impostato a {0} - {1} + + + {0} ha lasciato {1} + + + Hai lasciato il server {0} + + + Inserire {0} evento in questo canale. + Someone can tell me what he means for log, soo i can translate it better and correct it anyway! +Fuzzy + + + Inseriti tutti gli eventi in questo canale. + Fuzzy + + + Entrata disattivata + Fuzzy + + + Gli eventi a cui puoi iscriverti: + Fuzzy + + + + + + + + + + + + {0} ha chiesto una menzione nei seguenti ruoli + + + Messaggio da {0} `[Proprietario Bot]`: + + + Messaggio inviato. + + + {0} spostato in {1} da {2} + + + Messaggio eliminato in #{0} + + + + + + Gli utenti sono stati mutati + PLURAL (users have been muted) + + + Utente mutato + singular "User muted." + + + Probabilmente non ho i permessi necessari per questo + + + Nuovo ruolo di muto impostato. + + + Ho bisogno dei permessi di **Amministrazione** per farlo + + + Nuovo messaggio + + + Nuovo soprannome + + + Nuova discussione + + + Soprannome cambiato + + + Non riesco a trovare questo server + + + + + + Messaggio precedente + + + Nickname precedente + + + Discussione precedente + + + Errore. Probabilmente non ho i permessi sufficienti. + + + I permessi per questo server sono resettati + + + Protezioni attive + + + {0} è stato **disattivato** in questo server. + + + {0} Attivato + + + Errore. Hai bisogno dei permessi di gestione dei ruoli + + + Nessuna protezione attiva. + + + Gli utenti in ingresso devono essere tra {0} e {1}. + + + Se {0} o più utenti entrano entro {1} secondi, io li {0} loro. + + + Il tempo deve essere tra {0} e {1} secondi. + + + Rimossi con successo tutti i ruoli dall'utente {0} + + + Fallito a rimuovere i ruoli. Non ho abbastanza permessi. + + + il colore di {0} è stato cambiato. + + + Questo ruolo non esiste. + + + I parametri specificati sono invalidi + + + Si è verificato un errore dovuto a un colore invalido o a permessi insufficienti. + + + Rimosso con successo ruolo {0} dall'utente {1} + + + Fallito a rimuovere ruolo. Non ho abbastanza permessi. + + + Ruolo rinominato + + + Rinomina del ruolo fallita. Non ho abbastanza permessi. + + + Non puoi modificare i ruoli più alti del tuo + + + Rimosso il messaggio di gioco: {0} + + + Ruolo {0} è stato aggiunto alla lista. + + + {0} non trovato.Ripulito. + + + il ruolo {0} è già nella lista + + + Aggiunto. + + + Stato di gioco rotativo disattivato. + + + Stato di gioco rotativo attivato. + + + Qui c'è una lista delle condizioni di ruolo rotative: +{0} + Fuzzy + + + Nessuno condizione di gioco rotativo impostato. + Fuzzy + + + Tu hai già {0} ruolo + + + Tu hai già {0} esclusivi ruoli auto-assegnati. + + + I ruoli auto-assegnati sono ora riservati! + + + Ci sono {0} ruoli auto-assegnabili. + + + Quel ruolo non è auto-assegnabile. + + + Tu non hai {0} ruolo. + + + I ruoli auto-assegnati ora non sono più riservati! + + + Io non sono in grado di assegnarti questo ruolo. `Io non posso assegnare ruoli al proprietario o ad altri ruoli più alti del mio nella gerarchia dei ruoli.` + + + {0} è stato rimosso dalla lista dei ruoli auto-assegnabili. + + + Tu non hai più {0} ruolo. + + + Tu ora hai {0} ruolo. + + + Aggiunto con successo ruolo {0} all'utente {1} + + + Fallito ad aggiungere il ruolo. Non ho i permessi sufficienti. + + + Nuova immagine impostata! + + + Nuovo nome del canale impostato. + + + Nuovo gioco impostato! + + + Nuova sequenza impostata! + + + Nuova discussione del canale impostata. + + + + + + + + + Spegnimento + + + Gli utenti non possono mandare più di {0} messaggi ogni {1} secondi. + + + Modalità lenta disattivata + + + Modalità lenta attivata + + + Ammonizione (Espulso) + PLURAL + + + {0} ignorerà questo canale. + + + {0} non ignorerà più questo canale. + + + Se un utente posta {0} lo stesso messaggio consecutivamente, io {0} loro. +__Canaliignorati__: {2} + + + Canale di testo creato. + + + Canale di testo distrutto. + + + Desilenziato con successo. + + + Smutato + singular + + + Nome Utente + + + Nome utente cambiato. + + + Utenti + + + Utente bannato + + + {0} è stato **mutato** dalla chat. + + + {0} è stato **smutato** dalla chat. + + + Utente entrato + + + Utente è andato via + + + {0} è stato **mutato** dal canale di testo e vocale. + + + Ruolo utente aggiunto + + + Ruolo utente rimosso + + + {0} è ora {1} + + + {0} è stato **smutato** dal canale di testo e vocale. + + + {0} è entrato {1} canale vocale. + + + {0} è uscito {1} canale vocale. + + + {0} ha spostato {1} al {2} canale vocale. + + + {0} è stato **mutato vocalmente** + + + {0} è stato **smutato vocalmente* + + + Canale vocale creato + + + Canale vocale distrutto + + + Voce + testo disabilitati. + + + Voce + testo abilitati. + + + + + + + + + + + + Utente {0} dalla chat di testo + + + Utente {0} dalla chat di testo e vocale + + + Utente {0} dalla chat vocale + + + + + + Utente sbannato + + + Trasferimento completato! + + + Errore durante il trasferimento, guarda la console del bot per più informazioni. + + + + + + Utente ammonito + + + ha regalato {0} to {1} + + + Avrai più fortuna la prossima volta ^_^ + + + Congratulazioni! Hai vinto {0} per aver rollato oltre {1} + + + Mazzo rimescolato. + + + Lanciato {0} + User flipped tails. + + + Indovinato! Hai vinto {0} + + + + + + Aggiungi {0} a questo messaggio per ottenere {1} + + + Quest'evento è attivo per le prossime {0} ore + + + + + + ha regalato {0} a {1} + X has gifted 15 flowers to Y + + + {0} ha {1} + X has Y flowers + + + Testa + + + + + + + + + Non puoi puntare più di {0} + + + Non puoi puntare meno di {0} + + + Non hai abbastanza {0} + + + Non ci sono più carte nel mazzo. + + + + + + Hai rollato {0} + + + Punta + + + WOAAHHHHHHH!!! Congratulazioni!!! x{0} + + + Un singolo {0}, x{1} + + + Wow! Fortunato! Tre di un tipo! x{0} + + + Bel lavoro! Due {0} - puntato x{1} + + + Vinto + + + Gli utenti devono scrivere un codice segreto per ottenere {0}. +Dura {1} secondi. Non dirlo a nessuno. Shhh. + + + + + + + + + Croce + + + Hai preso con successo {0} da {1} + Fuzzy + + + + + + + + + Solo il proprietario del bot. + + + + + + Puoi supportare il progetto sul patreon: <{0}> o paypal: <{0}> + + + + + + + + + + + + Non riesco a trovare questo comando. Perfavore verifica che questo comando esiste prima di riprovare. + + + Descrizione + + + Puoi supportare "NadekoBot project" su +Patreon <{0}> oppure su +Paypal <{1}> +Non dimenticarti di firmare con il tuo nome o id di discord. + +**Grazie** ♥️ + + + **Lista dei comandi**: <{0}> +**Trovi delle guide per diventare host e altri documenti qui**: <{1}> + + + Lista dei comandi + + + Lista dei moduli + + + + + + Modulo inesistente. + + + + + + Tabella dei contenuti + + + + + + Autohentai avviato. Ogni {0} secondi verrà postato qualcosa coi seguenti tag: +{1} + + + Tag + + + + + + Impossibile iniziare perché non ci sono abbastanza partecipanti. + + + La gara è piena! Inizio immediato. + + + {0} è entrato come {1} + + + {0} è entrato come {1} e ha scommesso {2}! + + + Scrivi {0}eg per entrare nella gara. + Fuzzy + + + Inizia tra 20 secondi o quando la stanza è piena. + + + Inizia con {0} partecipanti. + + + {0} come {1} Ha vinto la gara! + + + {0} come {2} Ha vinto la gara e {2}! + + + Numero specificato invalido. Puoi tirare {0}-{1} dadi alla volta. + Fuzzy + + + Ha rollato {0} + Someone rolled 35 +Fuzzy + + + Dado rollato: {0} + Dice Rolled: 5 +Fuzzy + + + Fallito a iniziare la gara. Un'altra gara è probabilmente in corso. + + + Nessuna gara esistente su questo server. + + + Il secondo numero dev'essere maggiore del primo. + + + Cambi di cuore + + + Rivendicato da + + + Divorziati + + + Piace + + + Prezzo + + + Nessuna waifu è stata rivendicata. + + + Classifica delle waifu + + + + + + ha cambiato la sua affinità da {0} a {1}. + +*È moralmente questionabile.*🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + Devi aspettare {0} ore e {1} minuti prima di poter cambiare di nuovo la tua affinità. + + + La tua affinità è stata reimpostata. Non ti piace più nessuno. + + + vuole essere la waifu di {0}. Aww <3 + + + ha rivendicato {0} come la sua waifu per {1}! + + + Hai divorziato da una waifu a cui piacevi. Sei un mostro senza cuore. +{0} riceve {1} come risarcimento. + + + Non puoi impostare l'affinità su te stesso, tu egomaniaco. + + + 🎉 Il loro amore è soddisfatto! 🎉 +il nuovo valore di {0} è {1}! + Fuzzy + + + Nessuna waifu vale così poco. Devi pagare almeno {0} per avere una waifu, malgrado il suo valore reale fosse minore. + + + Devi pagare {0} o più per poter rivendicare quella waifu! + + + Quella waifu non è tua. + + + Non puoi auto-rivendicarti. + + + Hai divorziato recentemente. Devi aspettare {0} ore e {0} minuti per poter divorziare di nuovo. + + + Nessuno + + + Hai divorziato da una waifu a cui non piacevi. Riottieni {0} Indietro. + + + palla8 + + + Acrofobia + + + Partita conclusa senza risposte. + + + Nessuno ha votato. Partita conclusa senza vincitori. + + + L'acronimo era {0} + + + Una partita di Acrofobia è già in corso su questo canale. + + + Partita avviata. Crea una frase utilizzando il seguente acronimo: {0}. + + + Hai {0} secondi a disposizione per rispondere. + + + {0} ha dato la sua risposta. ({1} in totale) + + + Vota digitando il numero della risposta + + + {0} ha votato! + Fuzzy + + + Il vincitore è {0} con {1} punti. + + + {0} è il vincitore poiché è stato l'unico ad aver dato una risposta! + + + Domanda + + + E' un pareggio! Entrambi avete scelto {0} + + + {0} vince! {1} batte {2} + + + Il tempo per rispondere è scaduto + + + La corsa degli animali è già iniziata. + + + Totale: {0} Media: {1} + + + Categoria. + + + Cleverbot è stato disabilitato in questo server. + + + Cleverbot è stato abilitato in questo server. + + + + + + + + + + plural + + + + + + Impossibile caricare una domanda. + + + Partita iniziato + + + Gioco dell'impiccato iniziato + + + Il gioco dell'impiccato è già in corso in questo canale. + + + Impossibile iniziare il gioco dell'impiccato. + Fuzzy + + + + + + Classifica + + + Non hai abbastanza {0} + + + Nessun risultato + + + raccolto {0} + Kwoth picked 5* + + + {0} ha piantato {1} + Kwoth planted 5* + + + Un gioco dei trivia è già in corso su questo canale. + + + Gioco dei trivia + + + {0} ha indovinato! La riposta era: {1} + + + Nessun gioco dei trivia è in corso su questo server. + + + {0} ha {1} punti + + + Il gioco terminerà dopo questa domanda. + + + Tempo scaduto! La risposta corretta era {0} + + + {0} ha indovinato ed è il VINCITORE! La risposta era: {1} + + + Non puoi giocare contro te stesso. + + + Una partita di Tris è già in corso in questo canale. + + + Pareggio! + + + ha avviato una partita di Tris. + + + {0} ha vinto! + + + + + + Nessuna mossa rimanente! + + + Tempo scaduto! + + + + + + {0} vs {1} + + + + + + Autoplay disabilitato. + + + Autoplay abilitato. + + + Volume di default impostato a {0}% + + + + + + + + + Canzone finita + + + + + + + + + Dalla posizione + + + Id + + + Input non valido + + + + + + + + + + + + + + + + + + Nome + + + In riproduzione + + + + + + Nessun risultato trovato. + + + + + + + + + Canzone iniziata + + + + + + + + + Playlist cancellata. + + + Impossibile cancellare quella playlist perché non esiste oppure perché non ne sei l'autore. + + + Non esiste una playlist con quel ID. + + + Playlist in coda completata. + + + Playlist salvata + + + + + + Coda + + + Canzone in coda + + + + + + + + + Canzone rimossa + context: "removed song #5" + + + + + + + + + Traccia ripetuta + + + + + + + + + + + + + + + + + + + + + Canzoni mischiate + + + Canzone spostata + + + {0}o {1}m {2}s + + + Alla posizione + + + infinito + + + Il volume dev'essere impostato fra 0 e 100. + + + Volume impostato a {0}% + + + Non può essere più usato ALCUN MODULO in questo canale. + + + Possono essere usati TUTTI I MODULI in questo canale. + + + Concesso + + + Il ruolo {0} non può più usare ALCUN MODULO. + + + Il ruolo {0} può usare TUTTI I MODULI. + + + Non può essere più usato ALCUN MODULO in questo server. + + + Possono essere usati TUTTI I MODULI in questo server. + + + L'utente {0} non può più usare ALCUN MODULO. + + + L'utente {0} può usare TUTTI I MODULI. + + + + + + + + + + + + + + + Costo dei comandi + + + Disattivare l'uso di {0} {1} in questo canale {2}. + + + Attivare l'uso di {0} {1} in questo canale {2}. + + + Permesso negato + + + Aggiunta la parola {0} alla lista delle parole bandite. + + + Lista di parole bandite + + + Rimossa la parola {0} dalla lista delle parole bandite. + + + Parametro dei secondi non valido.(Deve essere un numero tra {0} e {1}) + + + + + + + + + + + + + + + + + + + + + Nessun costo impostato. + + + Comando + Gen (of command) + + + Modulo + Gen. (of module) + + + Pagina dei comandi {0} + + + + + + Gli utenti ora devono avere il ruolo di {0} per modificare i permessi. + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Abilità + + + Nessun anime preferito + + + Iniziata la traduzione automatica dei messaggi in questo canale. I messaggi degli utenti verranno automaticamente cancellati. + + + La tua traduzione automatica dei messaggi è stata rimossa. + + + La tua auto-traduzione linguaggio è stato impostata a {0}>{0} + Fuzzy + + + Avviata traduzione automatica dei messaggi in questo canale. + + + Annullata traduzione automatica dei messaggi in questo canale. + + + Formato input errato o errore sconosciuto. + + + Non ho trovato quella carta. + Fuzzy + + + Curiosità + + + Capitoli + + + + + + Competitive perse + + + Competitive giocate + + + Rango delle competitive + Fuzzy + + + Competitive Vinte. + + + Completato + + + Condizione + + + Costo + + + Data + + + Definisci: + + + Abbandonato + + + Episodi + + + Errore. + + + Esempio. + + + Fallito a trovare questo anime. + + + Fallito a trovare questo manga. + + + Genere + + + Fallito a trovare la definizione per questo tag. + + + Altezza/Peso + + + + + + Umidità + + + Ricerca immagine per: + + + Fallito a trovare questo film. + + + + + + Scherzo non caricato. + + + Latitudine/Lunghezza + Fuzzy + + + Livello + + + + Don't translate {0}place + + + Luogo + + + Oggetto magico non caricato. + + + + + + + + + Minimo/Massimo + + + Nessun canale trovato. + + + Nessun risultato trovato. + + + + + + Url originale + Fuzzy + + + + + + + + + + + + + + + In programma da guardare + + + Piattaforma + + + Nessun abilità trovata. + + + Nessun pokèmon trovato. + + + Link profilo: + + + Qualità: + + + + + + + + + Voto + + + Punteggio: + + + Ricerca per: + + + Non è stato possibile accorciare quel url. + + + Accorcia url + + + Qualcosa è andato storto. + + + Per favore specifica i parametri della ricerca. + + + Stato + + + Conserva url + + + Lo streamer {0} è offline. + + + Lo streamer {0} è online con {1} spettatori. + + + Stai seguendo {0} streaming in questo server. + + + Non stai seguendo nessuno streaming in questo server. + + + + + + Questo streaming probabilmente non esiste. + + + Rimossi {0} streaming ({1}) dalle notifiche + + + Io notificherò in questo canale quando il suo stato cambia. + Fuzzy + + + Alba + + + Tramonto + + + Temperratura + + + Titolo: + + + Top 3 anime preferiti: + + + Traduzione: + + + Tipi + + + + + + Url + + + Spettatori + + + Seguendo + Fuzzy + + + + + + + + + Pagina non trovata. + + + Velocità del vento + + + I campioni più bannati di {0} + + + + + + + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + {0} utenti in totale. + + + Autore + + + ID del bot + + + + + + + + + Canale di discussione + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Emoji personalizzati + + + Errore + + + Funzioni + Fuzzy + + + ID + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + Si è unito a Discord + + + Si è unito al server + + + ID: {0} +Membri: {1} +ID del proprietario: {2} + + + + + + + + + Membri + + + Memoria + + + Messaggi + + + Ripetitore di Messaggi + + + Nome + + + Soprannome + + + Nessuno sta giocando a quel gioco. + + + Nessun ripetitore attivo. + + + Nessun ruolo in questa pagina. + + + + + + Nessun argomento impostato. + + + Proprietario + + + ID del proprietario + + + Presenza + + + {0} Server +{1} Canali di testo +{2} Canali vocali + + + Eliminato tutte le parole con {0} all'interno. + + + Pagina {0} delle citazioni + + + Nessuna citazione in questa pagina. + + + Nessuna citazione trovata che tu possa rimuovare. + + + Citazione Aggiunta + + + Citazione #{0} cancellata. + + + Regione + + + Registrato il + + + + + + + + + + + + + + + Lista dei ripetitori + + + Nessun ripetitore funzionante in questo server. + Fuzzy + + + #{0} fermato. + + + Nessun messaggio ripetuto trovato in questo server. + + + Risultato + + + Ruoli + + + + + + + + + Nessun colore è nel formato giusto. Usa `#00ff00` per esempio. + + + Iniziata rotazione {0} dei ruoli colorati. + Fuzzy + + + Fermata la rotazione dei colori per il {0} ruolo + + + + + + Info del server + + + + + + + + + + + + + + + + + + + + + Canali di testo + + + + + + + + + + Id of the user kwoth#1234 is 123123123123 + + + Utenti + + + Canali vocali + + + Sei già entrato in gara! + + + + + + + + + + + + + + + + + + {0} ha votato. + Kwoth voted. + + + Mandami in privato il numero della risposta. + + + Scrivi qui il numero della risposta. + + + Grazie per aver votato, {0} + + + {0} voti in totale. + + + + + + + + + Nessun utente trovato. + + + pagina {0} + + + Devi essere in un canale vocale in questo server. + + + Non ci sono ruoli nei canali vocali. + + + + + + + + + + + + + + + + + + + + + + + + + + + Nessun alias trovato + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5bed3ed601458ade1d3f4c52d18f538d7e22a688 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 14:35:23 +0200 Subject: [PATCH 17/42] Added korean and hebrew --- .../Commands/LocalizationCommands.cs | 2 + .../Resources/ResponseStrings.he-IL.resx | 2276 ++++++++++++++++ .../Resources/ResponseStrings.ko-KR.resx | 2373 +++++++++++++++++ 3 files changed, 4651 insertions(+) create mode 100644 src/NadekoBot/Resources/ResponseStrings.he-IL.resx create mode 100644 src/NadekoBot/Resources/ResponseStrings.ko-KR.resx diff --git a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs index 19930059..b61b2722 100644 --- a/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs +++ b/src/NadekoBot/Modules/Administration/Commands/LocalizationCommands.cs @@ -24,8 +24,10 @@ namespace NadekoBot.Modules.Administration {"en-US", "English, United States"}, {"fr-FR", "French, France"}, {"de-DE", "German, Germany"}, + {"he-IL", "Hebrew, Israel" }, {"it-IT", "Italian, Italy" }, //{"ja-JP", "Japanese, Japan"}, + {"ko-KR", "Korean, Korea" }, {"nb-NO", "Norwegian (bokmål), Norway"}, {"pl-PL", "Polish, Poland" }, {"pt-BR", "Portuguese, Brazil"}, diff --git a/src/NadekoBot/Resources/ResponseStrings.he-IL.resx b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx new file mode 100644 index 00000000..5ddf049e --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx @@ -0,0 +1,2276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + הבסיס הזה נתפס או נהרס. + + + הבסיס הזה כבר נהרס. + + + הבסיס הזה לא נתפס. + + + הבסיס #{0} **הושמד** במלחמה נגד {1} + + + + + + + + + + + + + + + אויב + + + מידע על המלחה נגד {0} + + + מספר בסיס שגוי + + + לא גודל מלחמה נכון. + + + רשימת מלחמות פעילות + + + לא תפוס + + + אתה לא משתתף במלחמה הזאת + + + @{0} אתה כנראה לא משתתף במלחמה הזאת או הבסיס הזה כבר הושמד. + + + אין מלחמות פעילות. + + + גודל + + + המלחה נגד {0} כבר התחילה. + + + מלחמה נגד {0} נוצרה. + + + המלחמה נגד {0} נגמרה. + + + המלחמה הזאת לא קיימת. + + + מלחמה נגד {0} התחילה! + + + כל הסטטיסטיקה של התגובות מתאם נמחקו. + + + תגובות מתאם נמחקו + + + אין מספיק רשות, מתחייבת בעלות של הבוט בשביל תגובות מתאם גלובליות, ומנהג בשביל תגובות מתאם של הרשת. + + + רשימה של כל התגובות מתאם + + + תגובות מתאם + + + תגובות מתאם חדשות + + + לא נמצאו תגובות מתאם. + + + לא נמצאו תגובות מתאם אם הזהות הזאת. + + + תגובה + + + + + + + + + + + + + + + + + + לא נמצאו תוצאות. + + + {0} כבר התעלף. + + + {0} כבר בחיים מלאים. + + + הסוג שלך הוא כבר {0} + + + {0}{1} שומש על {2}{3} שעשה {4} נזק. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + אתה לא יכול לתקוף שוב שד שיתקפו אותך. + + + אתה לא יכול לתקוף את עצמך. + + + {0} נתעלף. + + + {0} רופה עם {1} אחד. + + + ל{0} נשארו {1} חיים. + + + אתה לא יכול להשתמש ב{0}. תרשום "{1}ml" כדי לראות את רשימת המהלכים שאת יכול להשתמש בהם. + + + רשימת המהלכים לסוג {0} + + + זה לא אפקטיבי. + + + איך לך מספיק {0} + + + {0} הוחזר לתחייה עם {1} אחד. + + + החזרתה את אצמך עם {1} אחד. + + + הסוג שלך שונה ל{0} בתמורה ל{1}. + + + זה טיפה אפקטיבי. + + + זה ממש אפקטיבי! + + + השתמשת ביותר מדי מהלכים אז אתה לך יכול לזוז. + + + הסוג של {0} הוא {1} + + + משתמש לא נמצא. + + + את\ה התעלפת אז את\ה לא יכול לזוז. + + + + + + + + + קבצים מצורפים + + + תמונת פרופיל שונתה + + + אתה הוסרת משרת {0}. +סיבה: {1} + + + מגורש + PLURAL + + + משתמש גורש + + + השם של הבוט השתנה ל{0} + + + הסטטוס של הבוט השתנה ל{0} + + + ההסרה האוטומטית של הודאת השלום לא בשימוש. + + + הודאת השלום תמחק בעוד {0} שניות. + + + הודעת עזיבה נוכחית: {0} + + + אפשור הודאת שלום דרך כתיבת {0} + + + התראת עזיבה חדשה הוגדרה. + + + התראת עזיבה לא פעילה. + + + התראת עזיבה הופעלה עבור ערוץ זה. + + + השם של הערוץ השתנה + + + שם ישן + + + נושא ערוץ שונה + + + נוקה. + + + תוכן + + + תפקיד נוצר בהצלחה {0} + + + ערוץ טקסט {0} נוצר. + + + ערוץ קול {0} נוצר. + + + החרשה הצליחה. + + + השרת {0} נמחק + + + + + + + + + ערוץ טקסט {0} נמחק. + + + ערוץ קול {0} נמחק. + + + הודאה פרטית מ{0} + + + תורם חדש הוסף בהצלחה. כמות כוללת שנתרמה ממשתמש זה: {0} 👑 + + + תודה לאנשים המצורפים למטה על הצלחת הפרויקט! + + + אני האביר את ההודאות הפרטיות לכל הבעלים. + + + אני האביר את ההודאות הפרטיות לבעלים הראשונים. + + + אני האביר את ההודאות הפרטיות מעכשיו. + + + אני אפסיק להעביר את ההודאות הפרטיות מעכשיו. + + + + + + + + + הודאה פרטית נוכחית: {0} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + אתה לא יכול להשתמש בפקודה זו על משתמשים עם תפקיד שווה או גבוהה ממך בדירוג. + + + התמונות יעלו אחרי {0} שניות. + + + הפורמט המבוקש שגוי. + + + פרמטרים לא חוקיים. + + + {0} הצטרף {1} + + + + אתה הוסרת מהשרת {0} בגלל הסיבה: {1} + + + משתמש נבעט. + + + רשימה של כל השפות + + + + + + + + + שפת הבוט שונתה מ{0} ל{1}. + + + + + + שפת שרת זה מוגדרת כ- {0} - {1} + + + {0} עזב {1} + + + {0} עזב את השרת + + + רישום של האירוע {0} בערוץ זה. + + + רישום כל האירועים בערוץ זה. + + + הרישום הופסק. + + + תרשום את האירועים שאתה יכול להירשם אליהם. + + + הרישום יתעלם מ{0} + + + הרישום לא יתעלם מ{0} + + + הרישום לאירוע {0} נפסק. + + + + + + הודעה מ{0} ׳[מנהל הבוט]׳ + + + הודעה נשלחה. + + + {0} עבר מ{1} ל{2}. + + + הודעה נמחקה ב#{0} + + + הודעה עדכנה ב#{0} + + + מושתק + PLURAL (users have been muted) + + + מושתק + singular "User muted." + + + כנראה שאין לי הרשאה לזה. + + + תפקיד מושתק חדש נוצר. + + + אני צריך אישור **מנהל** כדי לעשות את זה. + + + הודעה חדשה + + + כינוי חדש + + + נושא חדש + + + כינוי שונה + + + לא ניתן למצוא את השרת + + + + + + הודעה ישנה + + + כינוי ישן + + + נושא ישן + + + שגיאה. כנראה אין לי את האישורים המתאימים. + + + ההרשאות לשרת זה התחדשו. + + + הגנות פועלות + + + {0} **הופסק** בשרת זה. + + + {0} אופשר. + + + שגיאה. אני צריך אישור **ManageRole** + + + אין הגנות פעילות + + + הסף של המשתמש צריך להיות בין {0} ל{1}. + + + אם {0} או יותר משתמשים יצטרפו בעוד {1} שניות, אני {2} אותם. + + + הזמן חייב להיות בין {0} ו{1} שניות. + + + כל התפקידים הוסרו בהצלחה ממשתמש {0} + + + הסרת התפקיד נכשלה. אין לי מספיק הרשאות. + + + הצבע של {0} התפקיד היה שונה. + + + התפקיד הזה לא קיים. + + + הפרמטר המבוקש אינו חוקי. + + + השגייה התרחשה בגלל צבע לא נכון או חוסר הרשאות. + + + התפקיד {0} הוסר בהצלחה ממשתמש {0} + + + הסרת התפקיד נחשלה. אני לי מספיק הרשאות. + + + שם התפקיד השתנה. + + + שינוי התפקיד מחשל. אני לי מספיק הרשאות. + + + אתה לא יכול לעדכן תפקידים גבוהים משלך. + + + ההודאה המוקלטת הוסרה: {0} + + + תפקיד {0} הוסף לרשימה. + + + {0} לא נמצא. נוקה. + + + התפקיד {0} כבר נמצא ברשימה. + + + הוסף. + + + סטטוס משתנה הופסק. + + + סטטוס משתנה הותחל. + + + הנה רשימה של סטטוסים מסתובבים: {0} + + + לא נקבע סטטוס משתנה. + + + יש לך כבר {0} תפקיד. + + + + + + + + + + + + + + + אין לך {0} תפקיד. + + + + + + + + + + + + אין לך את התפקיד {0}. + + + יש לך את התפקיד {0}. + + + + + + + + + תמונת הפרופיל הוספה. + + + שם הערוץ החדש נקבע. + + + משחק חדש נוצר. + + + + + + + + + + + + + + + קורס + + + משתמשים לא יכולים לשלוח יותר מ{0} הודאות כל {1} שניות. + + + מצב איתי הופסק. + + + מצב איתי הותחל. + + + הסרה קלה (גורש) + PLURAL + + + {0} יתעלם מערוץ זה. + + + {0} לא יתעלם מערוץ זה. + + + + + + ערוץ כתב נוצר. + + + ערוץ כתב הושמד. + + + + + + + singular + + + שם משתמש + + + שם משתמש שונה + + + משתמשים + + + משתמש מורחק + + + + + + + + + משתמש הצתרף + + + משתמש עזב + + + + + + התפקיד של המשתמש הוסף. + + + התפקיד של שמשתמש הורד. + + + {0} עכשיו {1} + + + + + + {0} הצטרף ל{1} ערוץ קול. + + + {0} עזב מ{1} ערוץ קול. + + + {0} עבר מ{1} ל{2} ערוץ קול. + + + + + + + + + ערוץ קול הוצר + + + ערוץ קול מושמד + + + תכונה של קול + טקסט מכובה. + + + תכונה של קול + טקסק אופשרה. + + + אין לי רשות **נהל תפקידים** וגם/או **נהל ערוצים**, אז אני לא יכול להריץ `קול+טקסט` על {0} רשת. + + + אתה מאפשר/שולל את התכונה הזאת ו**לי אין רשות של מנהל**. זה יכול לגרום לכמה בעיות, ואתה תתצרך לנקות את ערוצי הטקסט בעצמך אחר כך. + + + אני חייב לפחות **נהל תפקידים** ו**נהל ערוצים** הרשאות כדי לאפשר את התכונה הזאת. (רשות של מנהל מועדפת) + + + משתמש {0} מטקסט צ׳אט + + + משתמש {0} מטקסט וקול צ׳אט + + + משתמש {0} מערוץ קול. + + + + + + + + + נדידה גמורה! + + + שגיעה בזמן הנדידה, תבדוק את ה מסוף בקרה של הבוט בשביל יותר מידע. + + + + + עדכון נוכחות + + + + + + העניק {0} ל{1} + + + בהצלחה בפעם הבאה ^_^ + + + מזל טוב! אתה ניצחת {0} עבור זה שגלגלת מעבר מ{1} + + + חסיפה מעורבבת. + + + הפך {0}. + User flipped tails. + + + אתה ניחשת את זה! ניצחת {0} + + + המספר שצוין אינו חוקי. אתה יכול להעיף 1 עד {0} מטבעות. + + + תצרף תגובה {0} להודעה הזאת כדי לקבל {1}. + + + האירוע הזה פעיל עד {0} שעות. + + + אירוע תגובות הפרח התחיל! + + + נתן מתנה של {0} ל{1} + X has gifted 15 flowers to Y + + + {0} יש {1} + X has Y flowers + + + ראש + + + לוח תוצאות + + + הוענק {0} ל {1} למשתמשים מ{2} תפקיד. + + + אתה לא יכול להמר יותר מ-{0} + + + אתה לא יכול להמר פחות מ-{0} + + + אין לך מספיך {0} + + + אין יותר קלפים בחפיסה. + + + משתמש הגרלות + + + אתה גלגלת {0}. + + + להמר + + + ווווווווווווואאווו!!! מזל טוב!!! x{0} + + + {0} יחיד, x{1} + + + וואו! בר מזל! שלושה מאותו הסוג! x{0} + + + עבודה טובה! שני {0} - ההימור x{1} + + + זכית + + + משתמשים חייבים להקליד קוד סודי כדי לקבל {0}. נמשך {1} שניות. אל תספר לאף אחד. ששש. + + + האירוע של משחקערמומי הסתיים. {0} משתמשים קיבלו את הפרס. + + + משחקערמומיסטטוס אירוע התחיל + + + זנב + + + בהצלחה נלקח {0} מ{1} + + + לא הצליח לקחת {0} מ{1} משום שלמשתמש אין כל כך הרבה {2}! + + + חזר לToC + + + מנהל של הבוט בלבד + + + מתחייבת {0} רשות ערוץ. + + + אתה יכול לתמוח בפרוייקט על Patreon: <{0}> או Paypal: <{1}> + + + פקודות וכינויים + + + רשימת הפיקוד התחדשה. + + + + + + אני לא יכול למצוא את הפקודה הזאת. בבקשה תוודא שהפקודה הזאת נמצאת לפני שתנסה שוב. + + + תאור + + + אתה יכול למתוח את הנאדקובוט פרוייקט על Patreon <{0}> או Paypal <{1}> +אל תשכח להשאיר את השם של הדיסקורד שלך או הזהוי בהודעה. + +**תודה** ♥️ + + + **רשימה של פקודות**: <{0}> +**מדריכי אירוך ומסמכים אפשר למצוא כאן**: <{1}> + + + רשימה של פקודות + + + רשימה של מודולים + + + + + + המודול הזה לא קיים. + + + נדרשת {0} רשות השרת. + + + תוכן העניינים + + + נוהג + + + הנטאי אוטומטי התחיל. פורסים מחדש כל {0}ש עם אחד מהתגים הבאים: +{1} + + + תג + + + מרוץ בעלי חיים + + + נכשל להתחיל מכיוון שלא היו מספיק משתתפים. + + + המרוץ מלא! מתחיל מיד. + + + {0} הצתרף כ{1} + + + {0} הצתרף כ{1} והימר {2}! + + + תרשום jr{0} כדי להצתרף למרוץ. + + + מתחיל ב20 שניות או מתי שהחדר מלא. + + + מתחיל עם {0} משתתפים. + + + {0} כ{1} ניצח במרוץ! + + + {0} כ{1} ניצח במרוץ ו{2}! + + + המספר שצוין אינו חוקי. אתה יכול לגלגל {0}-{1} קוביות בבת אחת. + + + גלגל {0} + Someone rolled 35 + + + הקוביה גלגלה: {0} + Dice Rolled: 5 + + + נכשל להתחיל את המרוץ. יכול להיות שמרוץ אחר כבר פעיל. + + + אין מרוץ קיים ברשת הזאת. + + + המספר השני חייב להיות גדול יותר מהמספר הראשון. + + + שינויים של הלב + + + נתבע על ידי + + + גירושים + + + מחבב + + + מחיר + + + שום וואיפוס נתבעו עדיין. + + + וואיפוס ראשיות + + + הזיקה שלך כבר מוגדרת לוואיפו הזאת או שאתה מנסה להסיר את ההזיקה שלך בזמן שאין לך אחת. + + + שינה את הזיקה שלהם מ{0} ל{1} + +*זה מפקפק באופן מוסרי.* 🤔 + Make sure to get the formatting right, and leave the thinking emoji + + + אתה חייב לחכות {0} שעות ו{1} דקות כדי לשנות את הזיקה שלך עוד פעם. + + + הזיקה שלך אופסה. אין לך יותר אדם שאתה מחבב. + + + רוצה להיות וואיפו של {0}. אוו 3> + + + תבע {0} כהוואיפו שלהם בשביל {1}! + + + אתה גירשת וואיפו שאוהבת אותך. אתה מפלצת חסרת לב. +{0} קיבל {1} כפיצוי. + + + אתה לא יכול להגדיר זיקה לעצמך, אתה אגומניאק. + + + 🎉 האהבה שלהם התגשמה! 🎉 +הערך החדש של {0} הוא {1} + + + שום וואיפו כל כך זולה. אתה חייב לשלם לפחות {0} כדי להדיג וואיפו, אפילו אם הערך האמיתי שלהם נמוך יותר. + + + אתה חייב לשלם {0} או יותר בשביל לתבוע את הוואיפו הזאת! + + + הוואיפו הזאת לא שלך. + + + אתה לא יכול לתבע את עצמך. + + + אתה התגרשת לא מזמן. אתה צריך לחכות {0} שעות ו{1} דקות כדי להתגרש עוד פעם. + + + אף אחד + + + אתה גירשת וואיפו שלא מחבבת אותך. אתה קיבלת {0} בחזרה. + + + 8כדור + + + פחד גבהים + + + המשחק הסתיים ללא הגשות. + + + אין הצבעות. המשחק הסתיים ללא מנצח. + + + ראשי התיבות היו {0}. + + + משחק פחד גבהים כבר פועל בערוץ הזה. + + + המשחק התחיל. תכינו משפט עם הראשי התיבות הבאים: {0}. + + + יש לך {0} שניות כדי לעשות הגשה. + + + {0} הגיש את המשפט שלהם. ({1} בסכם) + + + תצביע על ידי הקלדת מספר ההגשה + + + {0} הצביעו! + + + המנצח הוא {0} עם {1} נקודות + + + {0} המנצח בגלל שהוא המשתמש היחיד שעשה הגשה! + + + שאלה + + + זה תיקו! שניהם הרימו {0} + + + {0} ניצח! {1} מביס {2} + + + ההגשות סגורות + + + מרוץ חיות כבר התחיל. + + + סה"כ: {0} ממוצע: {1} + + + קטגוריה + + + קלברבוט מכובה על השרת הזה. + + + קלברבוט מופעל על השרת הזה. + + + דור המטבע מופעל על הערוץ הזה. + + + דור המטבע מכובה על הערוץ הזה. + + + {0} מקרי {1} הופיע! + plural + + + מקרי {0} הופיע! + + + נכשל לטעון שאלה. + + + משחק התחיל + + + משחק איש תלוי התחיל + + + משחק איש תלוי בל פעיל על הערוץ הזה. + + + שגיאה בהתחלה של איש תלוי + + + רשימה של "{0}איש תלוי" סוגי טווח: + + + לוח תוצאות + + + אין לך מספיק {0} + + + אין תוצאות + + + תלש {0} + Kwoth picked 5* + + + {0} שתל {1} + Kwoth planted 5* + + + משחק טריוויה כבר פועל ברשת הזאת. + + + משחק טריוויה + + + {0} ניחש את זה! התשובה הייתה: {1} + + + משחק טריוויה לא פעיל על השרת הזה. + + + {0} יש {1} נקודות + + + עוצר אחרי השאלה הזאת. + + + הזמן עבר! התשובה הנכונה הייתה {0} + + + {0} ניחש את זה וניצח במשחק! התשובה הייתה: {1} + + + אתה לא יכול לשחק נגד עצמך. + + + משחק איקס ועיגולים כבר פעיל על הערוץ הזה. + + + תיקו! + + + יצר משחק של איקס ועיגולים. + + + {0} ניצח! + + + שלושה מתאימים + + + אין יותר מהלכים! + + + הזמן עבר! + + + המהלך של {0} + + + {0} נגד {1} + + + מנסה לשים {0} שירים בתור... + + + הפעלה אוטומטית מכובה. + + + הפעלה אוטומטית מופעלה. + + + ווליום ברירת מחדל מכוון ל%{0} + + + תור מנחה מושלם. + + + לנגןהוגן + + + שיר הסיים + + + לנגן הוגן מכובה. + + + לנגן הוגן מופעל. + + + מתוך עמדה + + + זהוי + + + קלט לא תקין. + + + מקסימום פלייטיים אין הגבלה עכשיו. + + + מקסימום פלייטיים קבע ל{0} שניות. + + + גודל התור של מקסימום מוזיקה קבע ללא הגבלה. + + + הגודל של מקסימום תור מוזיקה קבע ל{0} מסלול(ים). + + + אתה חייב להיות בערוץ קול על השרת הזה. + + + שם + + + עכשיו מנגן + + + אין נגן מוזיקה פעיל. + + + אין תוצאות חיפוש + + + השמעת מוזיקה נעצרה. + + + תור השחקן - עמוד {0}/{1} + + + מנגן שיר + + + `#{0}` - **{1}** by *{2}* ({3} שירים) + + + עמוד {0} של פלייליסטים שמורים + + + פלייליסט נמחק. + + + נכשל לנסות למחוק אל הפלייליסט הזה. זה אולי לא קיים, או שאתה לא מחברו. + + + פלייליסט עם הזהוי הזה לא קיים. + + + תור הפלייליסט שלם. + + + פליילסט נשמר + + + {0} הגבלה + + + תור + + + שיר בתור + + + תור המוזיקה נוקה. + + + התור מלא ב{0}/{0} + + + שיר מחוק + context: "removed song #5" + + + חוזרים על השיר הנוכחי + + + חוזרים על הפלייליסט + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + מותר + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + נשלל + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gen (of command) + + + + Gen. (of module) + + + + + + + + + + + + + + + + + + + + + + + + + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + הפרוש המידי שלך לשפה זאת הוסרה. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + שגיעה נוצרה + + + דוגמה + + + מציאת האנימה נחשל. + + + מציאת המנגה נחשלה + + + ג'אנר + + + + + + גובה/משקל + + + {0}מ'/{1}ק"ג + + + לחות + + + חיפוש תמונה של: + + + מציאת מסרט נחשל. + + + מקור או שפה לא נכונה. + + + בדיחה לא הועלתה. + + + + + + רמה + + + + Don't translate {0}place + + + מיקום + + + חפץ הקסם לא הועלה. + + + + + + + + + הכי פחות/הרבה + + + + + + אין תוצעות + + + במעצר + + + הקישור המקורי + + + + + + + + + + + + + + + מתקבן לראות + + + פלטפורמה + + + יכולת לא נמצאה + + + פוקמון לא נמצא + + + קישור פרופיל: + + + איכות: + + + + + + ניצחונות מהירים + + + דירוג + + + ניקוד: + + + חיפוש של: + + + קיצר שורת הקישור נחשל + + + קישור קצר + + + משהו השתבש + + + + + + + + + קישור החנות + + + + + + + + + + + + + + + + + + + + + + + + + + + זריחה + + + שקיעה + + + טמפרטורה + + + + + + שלושת האנימות הטובות ביותר: + + + פרוש: + + + סוגים + + + מציעת הפרושים של המוסג הזה נחשל. + + + קישור + + + צופים + + + צופה + + + + + + + + + העמוד לא נמצא + + + מהירות הרוח + + + + + + + + + הצתרף + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + יוצר + + + מס' זהות של הבוט + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + + + + + + + מס' זהות: {0} +משתמשים: {1} +בעלי המס' זהות: {2} + + + + + + + + + משתמשים + + + זיכרון + + + הודאות + + + + + + שם + + + כינוי + + + אף אחד לא משחק במשחק הזה + + + + + + + + + + + + + + + בעלים + + + מס' זהות של הבעלים + + + + + + + + + מחק את כל הציטוטים עם {0} מילות המפתח. + + + עמוד {0} של ציטוטים. + + + אין ציטוטים בעמוד זה. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {0} של המשתמש {1} הינו {2} + Id of the user kwoth#1234 is 123123123123 + + + משתמשים + + + + + + אתה כבר חלק מהמרוץ הזה. + + + + + + + + + + + + + + + + + + {0} הצביע. + Kwoth voted. + + + + + + + + + תודה שהצבעתת {0} + + + + + + בחר אותם על ידי הקלדת `{0}בחר` + + + + + + משתמש לא נמצא. + + + דף {0} + + + אתה חייב להיות בערוץ קול. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx new file mode 100644 index 00000000..cf1c65d5 --- /dev/null +++ b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx @@ -0,0 +1,2373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 기지가 이미 요청되었거나 파괴되었습니다. + Fuzzy + + + 기지가 이미 파괴되었습니다. + + + 기지가 요청당하지 않았습니다. + + + {1} 와의 전쟁에서 #{0} 번 기지가 **파괴**되었습니다. + Fuzzy + + + {2} 와의 전쟁에서 {0} 가 #{1} 번 기지를 **요청**하지 못했습니다. + Fuzzy + + + {2} 와의 전쟁에서 #{1} 번 기지를 {0} 가 요청하였습니다. + + + @{0} 이미 #{1} 번 기지를 요청했습니다. 새로운 기지를 요청 할 수 없습니다. + + + {1} 와의 전쟁에서 @{0} 의 요청이 만료되었습니다. + Fuzzy + + + 적 + Fuzzy + + + {0} 와의 전쟁에 대한 정보 + + + 유효하지 않은 기지 숫자입니다. + + + 유효하지 않은 전쟁 크기입니다. + + + 활성화된 전쟁 목록 + + + 요청되지 않았습니다. + + + 당신은 이 전쟁에 참여하고 있지 않습니다. + + + @{0} 당신은 그 전쟁에 참여하지 않거나 그 기지가 이미 파괴되었습니다. + + + 활성화된 전쟁이 없습니다. + + + 크기 + Fuzzy + + + {0} 에 대한 전쟁이 이미 시작되었습니다. + + + {0} 에 대한 전쟁이 생성되었습니다. + + + {0} 와의 전쟁이 종료되었습니다. + + + 전쟁이 존재하지않습니다. + + + {0} 와의 전쟁이 시작되었습니다. + + + 모든 커스텀 리액션에 대한 통계가 삭제되었습니다. + + + 커스텀 리액션이 삭제되었습니다. + + + 권한이 부족합니다. 전체 커스텀 리액션을 관리하기 위해서는 봇의 소유권과 서버의 관리자 권한이 필요합니다. + + + 모든 커스텀 리액션 목록 + + + 커스텀 리액션 + + + 새로운 커스텀 리액션 + + + 커스텀 리액션을 찾지 못했습니다. + + + 요청하신 ID에 대한 커스텀 리액션을 찾지 못했습니다. + + + 반응 + Fuzzy + + + 커스텀 리액션 통계 + + + {0} 에 대한 커스텀 리액션 통계가 삭제되었습니다. + + + 해당 트리거에 대한 통계를 찾지 못했으며, 아무런 행동도 취하지 않았습니다. + + + 트리거 + Fuzzy + + + Autohentai 기능이 정지되었습니다. + + + 결과를 찾지 못했습니다. + + + {0} 이(가) 이미 기절했습니다. + + + {0} 은(는) 이미 최대 체력입니다. + + + 당신은 이미 {0} 타입 입니다. + + + 님이 {2}{3} 에게 {0}{1} 을(를) 사용하여서 {4} 의 피해를 입혔습니다. + Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. + + + 보복 없이는 다시 공격 할 수 없습니다. + + + 자신을 공격 할 수 없습니다. + + + {0} 이(가) 기절했습니다! + + + {1} 을(를) 사용하여서 {0} 을(를) 치료했습니다. + + + {0} 의 HP가 {1} 남아 있습니다. + + + {0} 을(를) 사용 할 수 없습니다. `{1}ml` 을(를) 입력해서 사용할 수 있는 움직임들의 리스트를 확인하세요. + + + {0} 종류 의 공격표 + Fuzzy + + + 효과적이지 않았다. + + + 당신은 충분한 {0} 가 없습니다. + + + {1} 을(를) 사용하여서 {0} 을(를) 소생했습니다. + + + {0} 을(를) 사용해서 자기자신을 소생시켰습니다. + + + 당신의 타입이 {0} 에서 {1} 으로 변경되었습니다. + + + 어느정도 효과가 있었다. + + + 효과는 굉장했다! + + + 너무 많은 공격을 연속해서 사용했으므로 이동할 수 없습니다! + + + {0} 의 종류는 {1} 입니다. + + + 사용자를 찾을 수 없습니다. + + + 당신은 기절해서 움직일 수 없습니다! + + + **자동 할당 역할**에 대한 사용자의 참여가 **비활성화**되었습니다. + + + **자동 할당 역할**에 대한 사용자의 참여가 **활성화**되었습니다. + + + 첨부파일 + + + 아바타가 변경되었습니다. + + + 당신은 {0} 서버에서 밴되었습니다. +사유: {1} + + + 밴 + PLURAL +Fuzzy + + + 사용자 밴 + Fuzzy + + + 봇의 이름이 {0} 으로 변경되었습니다. + + + 봇의 상태가 {0} 으로 변경되었습니다. + + + 퇴장 메세지의 자동삭제가 비활성화되었습니다. + Fuzzy + + + 퇴장 메세지는 앞으로 {0} 초 후에 삭제됩니다. + Fuzzy + + + 현재 퇴장 메세지: {0} + Fuzzy + + + 퇴장 메세지를 활성화하기 위해서는 {0} 를 입력하십시오. + Fuzzy + + + 새로운 퇴장 메세지가 설정되었습니다. + Fuzzy + + + 퇴장 알림이 비활성화되었습니다. + + + 이 채널에서 퇴장 알림이 활성화되었습니다. + + + 채널 이름이 변경되었습니다. + + + 이전 이름 + Fuzzy + + + 채널의 주제가 변경되었습니다. + + + 정리했습니다. + + + 내용 + Fuzzy + + + {0} 역할을 성공적으로 생성하였습니다. + + + 텍스트 채널 {0} 이(가) 생성되었습니다. + + + 음성 채널 {0} 이(가) 생성되었습니다. + + + 음소거되었습니다. + Fuzzy + + + {0} 서버를 삭제하였습니다. + + + 성공적으로 처리된 명령어에 대한 자동삭제가 중지되었습니다. + + + 이제 성공적으로 처리된 명령어를 자동삭제합니다. + + + 텍스트 채널 {0} 를 삭제했습니다. + + + 음성 채널 {0} 를 삭제했습니다. + + + 개인 메세지 + Fuzzy + + + 성공적으로 새로운 기부자를 추가했습니다. 이 유저의 총 기부량은 {0} 입니다. + + + 이 프로젝트를 위해 수고해주신 아래의 사람들에게 감사드립니다! + + + DM을 모든 봇 소유자에게 전달하겠습니다. + + + DM을 첫번째 봇 소유자에게만 전달하겠습니다. + + + 지금부터 DM을 전달하겠습니다. + + + 지금부터 DM 전달을 중단하겠습니다. + + + 환영 메세지에 대한 자동삭제가 비활성화되었습니다. + + + 환영 메세지는 {0} 초 후에 삭제될 것입니다. + + + 현재 DM 환영 메세지: {0} + + + {0} 을(를) 입력하여서 DM 환영 메세지를 활성화시킵니다. + + + 새로운 DM 환영 메세지가 설정되었습니다. + + + DM 환영 알림이 비활성화되었습니다. + 환영 알림 = 환영 메세지라고 해도될까요? + + + DM 환영 알림 활성화 되었습니다. + + + 현재 환영 메세지: {0} + + + {0} 를 입력하여서 환영 메세지를 활성화시킵니다. + + + 새로운 환영 메세지가 설정되었습니다. + + + 환영 알림이 비활성화되었습니다. + + + 이 채널의 환영 알림이 활성화되었습니다. + + + 당신은 이 명령어를 당신보다 상위나 동등한 권한관계를 가진 사람에게 쓸 수 없습니다. + + + 이미지가 {0} 초 후에 생성되었습니다! + Fuzzy + + + 유효하지않은 입력 포맷입니다. + + + 유효하지않은 파라미터입니다. + + + {0} 님이 {1} 에 입장하였습니다. + + + 당신은 {0} 서버에서 퇴장당했습니다. +사유 : {1} + + + 사용자 강제퇴장 + Fuzzy + + + 언어 목록 + + + 서버의 지역이 {0} - {1} 로 변경되었습니다. + + + 봇의 기본 지역이 {0} - {1} 로 변경되었습니다. + + + 봇의 언어가 {0} - {1} 로 설정되었습니다. + + + 지역 설정에 실패했습니다. 이 명령어의 도움말을 참고하십시오. + + + 이 서버의 언어가 {0} - {1} 로 변경되었습니다. + + + {0} 님이 {1} 에서 퇴장하셨습니다. + + + {0} 서버에서 퇴장하였습니다. + + + 이 채널의 {0} 이벤트를 로깅합니다. + + + 이 채널의 모든 이벤트를 로깅합니다. + + + 로깅이 비활성화되었습니다. + + + 구독 할 수 있는 로그 이벤트 : + + + 로그는 앞으로 {0} 을(를) 무시합니다. + + + 로그는 {0} 을(를) 더 이상 무시하지 않습니다. + + + {0} 이벤트에 대한 로그를 중지하였습니다. + + + {0} 이(가) 다음 역할에 대한 언급을 요청했습니다. + + + {0} `[봇의 소유자]` 로부터 메세지: + Fuzzy + + + 메세지가 전송되었습니다. + + + {0} 이(가) {1} 에서 {2} 로 이동했습니다. + + + #{0} 에서 메세지가 삭제되었습니다. + + + #{0} 에서 메세지가 업데이트되었습니다. + + + 음소거 + PLURAL (users have been muted) +Fuzzy + + + 음소거 + singular "User muted." +Fuzzy + + + 명령어를 수행하기 위한 권한이 부족합니다. + + + 새로운 음소거 역할이 설정되었습니다. + + + 요청하신 것을 처리하기 위해서는**관리자** 권한이 필요합니다. + + + 새로운 메세지 + + + 새로운 닉네임 + + + 새로운 주제 + + + 닉네임이 변경되었습니다. + + + 요청하신 서버를 찾을 수 없습니다. + + + 해당하는 Shard ID가 없습니다. + + + 이전 메세지 + + + 이전 닉네임 + + + 이전 주제 + + + 오류. 봇에게 충분한 권한이 없습니다. + + + 이 서버의 모든 권한이 초기화되었습니다. + + + 보호기능 활성화 + + + {0} 은(는) 이 서버에서 **비활성화**되었습니다. + + + {0} 가 활성화되었습니다. + + + 오류. 관리자 권한이 필요합니다. + + + 활성화된 보호기능이 없습니다. + + + 사용자의 값은 반드시 {0} 과 {1} 사이의 값이여야 합니다. + Fuzzy + + + 만약 {0} 명 이상의 사용자가 {1} 초안에 접속한다면 {2} 합니다. + Fuzzy + + + 시간은 {0} 초와 {1} 초 사이의 값이여야 합니다. + + + {0} 유저의 모든 역할을 성공적으로 삭제했습니다. + + + 역할 삭제에 실패했습니다. 권한이 부족합니다. + + + {0} 역할에 대한 색이 변경되었습니다. + + + 그 역할은 존재하지 않습니다. + + + 지정된 파라미터가 유효하지 않습니다. + + + 유효하지 않은 색이거나 권한이 부족하여서 오류가 발생했습니다. + Fuzzy + + + {1} 사용자에 대한 {0} 역할을 성공적으로 제거했습니다. + + + 역할 제거에 실패했습니다. 권한이 부족합니다. + + + 역할 이름이 변경되었습니다. + + + 역할 이름 변경에 실패했습니다. 권한이 부족합니다. + + + 자신보다 가장 높은 역할보다 높은 사용자의 역할을 수정할 수 없습니다. + + + 다루고있었든 메세지 치웠습니다: {0} + Fuzzy + + + {0} 역할을 리스트에 추가했습니다. + + + {0} 을(를) 찾을 수 없기때문에 삭제했습니다. + Fuzzy + + + {0} 역할은 이미 리스트에 추가된 상태입니다. + + + 추가했습니다. + + + 플레이 상태 로테이션이 비활성화되었습니다. + + + 플레이 상태 로테이션이 활성화되었습니다. + + + 플레이 상태 로테이션 리스트: +{0} + + + 플레이 상태 로테이션이 설정되지 않았습니다. + + + 당신은 이미 {0} 역할이 있습니다. + + + 당신은 이미 독점 자가 배정 역할 {0} 가 있습니다. + Fuzzy + + + 자가 배정 역할은 이제 하나만 선택 할 수 있습니다! + Fuzzy + + + {0} 개의 자가 배정 역할이 있습니다. + Fuzzy + + + 그 역할은 자신이 적용 할 수 없습니다. + + + 당신은 {0} 역할이 없습니다. + + + 자가 배정 역할은 이제 복수 선택 할 수 있습니다! + Fuzzy + + + 그 역할을 당신에게 추가 할 수 없습니다. `당신보다 상위나 동등한 권한관계를 가진 사람에게 역할을 추가 할 수 없습니다.` + + + {0} 은(는) 자신이 적용 할 수 있는 역할 목록에서 삭제되었습니다. + + + 당신은 더 이상 {0} 역할이 아닙니다. + + + 당신은 이제 {0} 역할입니다. + + + {1} 유저에게 {0} 역할을 성공적으로 추가했습니다. + + + 역할 추가에 실패했습니다. 권한이 부족합니다. + + + 새로운 아바타가 설정되었습니다! + + + 새로운 채널 이름이 설정되었습니다. + + + 새로운 게임이 설정되었습니다! + + + 새로운 방송이 설정되었습니다! + + + 새로운 채널 주제를 설정했습니다. + Fuzzy + + + Shard {0} 가 다시 연결되었습니다. + + + Shard {0} 를 다시 연결 중입니다. + + + 종료 중... + + + 사용자는 {1} 초마다 {0} 개 이상의 메시지를 보낼 수 없습니다. + + + 슬로우 모드가 비활성화되었습니다. + + + 슬로우 모드가 활성화되었습니다. + + + 소프트 밴 (강제퇴장) + PLURAL + + + {0} 은(는) 이 채널을 무시할 것입니다. + + + {0} 은(는) 더이상 이 채널을 무시하지 않을 것입니다. + + + 만약 사용자가 {0} 개 이상의 같은 메세지를 보내면 {1} 합니다. + __무시하는 채널들__: {2} + + + 텍스트 채널이 생성되었습니다. + + + 텍스트 채널이 삭제되었습니다. + destroyed means deleted? +디스트로이드 뜻이 삭제됬다는 건가요? + + + 음소거 해제 완료. + + + 음소거 해제 + singular + + + 사용자 이름 + + + 사용자 이름이 변경되었습니다. + + + 사용자 + Fuzzy + + + 사용자 밴 + Fuzzy + + + {0} 님이 채팅으로부터 **음소거**되었습니다. + + + {0} 님이 채팅으로부터 **음소거 해제**되었습니다. + + + 사용자 입장 + + + 사용자 퇴장 + + + {0} 은(는) 텍스트와 음성 채팅으로부터 **차단**되었습니다. + + + 사용자의 역할이 추가되었습니다. + Fuzzy + + + 사용자의 역할이 제거되었습니다. + Fuzzy + + + {0} 은(는) 이제 {1} 입니다. + + + {0} 은(는) 텍스트와 음성 채팅으로부터 **차단해제**되었습니다. + + + {0} 님이 {1} 음성채널에 입장하셨습니다. + + + {0} 님이 {1} 음성채널에서 퇴장하셨습니다. + + + {0}님이 음성채널 {1} 에서 {2} 로 이동되었습니다. + + + {0} 님이 **음성 음소거**되었습니다. + + + {0} 님이 **음성 음소거 해제**되었습니다. + + + 음성 채널이 생성되었습니다. + + + 음성 채널이 삭제되었습니다. + + + 음성 + 텍스트 기능을 비활성화시켰습니다. + + + 음성 + 텍스트 기능을 활성화시켰습니다. + + + **관리 역할** 혹은 **채널 관리 권한**이 부족해서 {0} 서버에서 `음성 + 텍스트` 기능을 실행 할 수 없습니다. + + + 당신은 **봇이 관리자 권한이 없음에도** 이 기능을 활성화/비활성화 하고 있습니다. 이로 인해서 문제가 발생 할 수 있으며 이후에 직접 텍스트 채널을 정리해야합니다. + + + 이 기능을 활성화시키기 위해서는 **역할 관리**과 **채널 관리** 권한이 필요합니다. + Fuzzy + + + 사용자가 텍스트 채팅으로부터 {0} 됐습니다. + + + 사용자가 텍스트와 음성 채팅으로부터 {0} 됐습니다. + + + 사용자가 음성 채팅으로부터 {0} 됐습니다. + + + 당신은 {0} 서버에서 soft-밴을 당했습니다. +사유: {1} + Fuzzy + + + 사용자 밴 해제 + Fuzzy + + + 이전 완료! + Fuzzy + + + 이전 과정에서 오류가 발생했습니다. 자세한 정보는 봇의 콘솔을 통해서 확인하십시오. + + + 현재 상태 업데이트 + + + 사용자 소프트 밴 + + + 님이 {1} 에게 {0} 개를 지급했습니다. + + + 다음 기회에 ^_^ + + + 축하합니다! 당신은 {1} 이상을 굴려서 {0} 을 획득했습니다. + Fuzzy + + + 덱이 섞였습니다. + Fuzzy + + + 동전뒤집기의 결과는 {0}. + User flipped tails. +Fuzzy + + + 맞췄습니다! 당신은 {0} 을(를) 획득했습니다. + + + 유효하지 않은 숫자입니다. 당신은 1개부터 {0} 개까지만 동전을 뒤집을 수 있습니다. + Fuzzy + + + {1} 을(를) 받으려면 이 메세지에 {0} 리액션을 추가하세요. + Fuzzy + + + 이 이벤트는 최대 {0} 시간 동안 활성화됩니다. + + + 플라워 리액션 이벤트가 시작되었습니다. + + + 님이 {1} 에게 {0} 개를 선물하셨습니다. + X has gifted 15 flowers to Y + + + {0} 님은 {1} 개를 보유중입니다. + X has Y flowers + + + 앞 + + + 리더보드 + + + {2} 역할의 {1} 명의 사용자에게 {0} 를 보상하였습니다. + Fuzzy + + + {0} 보다 더 배팅 할 수 없습니다. + + + {0} 보다 적게 배팅 할 수 없습니다. + + + 당신은 충분한 {0} 이(가) 없습니다. + + + 덱에 더 이상 카드가 없습니다. + + + 래플 결과 + Fuzzy + + + {0} 를 굴렸습니다. + + + 배팅 + Fuzzy + + + 대박!!! 축하합니다!!! x{0} + + + 한 {0}, x{1} + Fuzzy + + + 와! 운이 좋습니다! 같은 종류의 세개! x{0} + Fuzzy + + + 잘 했습니다! {0} 두게 - x{1} + Fuzzy + + + 얻은 액수 + Fuzzy + + + 사용자는 반드시 {0} 를 얻기 위해서 비밀 코드를 입력해야합니다. + + + + SneakyGame 이벤트가 종료되었습니다. {0} 명의 사용자들이 보상을 받았습니다. + + + SneakyGameStatus 이벤트가 시작되었습니다. + Fuzzy + + + 뒷면 + + + {1} 에게서 {0} 을(를) 성공적으로 빼앗았습니다 + + + {1} 님이 {2} 만큼을 가지고있지 않기 때문에 {0} 을(를) 회수 할 수 없습니다. + Fuzzy + + + 목차로 돌아가기 + + + 봇 소유자만 가능합니다. + + + {0} 채널의 권한이 필요합니다. + + + Patreon( <0> )이나 Paypal( <1> )을 통해서 프로젝트를 후원 할 수 있습니다. + Fuzzy + + + 명령어와 가명 + Fuzzy + + + 명령어 목록이 재생성되었습니다. + + + `{0}h 명령어이름`을 입력해서 특정 명령어에 대한 도움말을 볼 수 있습니다. +예시 : `{0}h >8ball` + + + 입력하신 명령어를 찾을 수 없습니다. 입력하시기 전에 유효한 명령어인지 확인해주십시오. + + + 설명 + Fuzzy + + + Patreon <{0}> 이나 +Paypal <{1}> 에서 +NadekoBot 프로젝트를 지원할 수 있습니다. +Discord 닉네임이나 ID를 메시지에 남겨 두는 것을 잊지 마십시오. + +**감사합니다** ♥️ + + + **명령어 목록**: <{0}> +**호스팅 가이드와 문서는 여기서 찾을 수 있습니다**: <{1}> + + + 명령어 목록 + + + 모듈 목록 + + + `{0}h 모듈이름`을 입력해서 특정 모듈에 대한 도움말을 볼 수 있습니다. +예시 : `{0}cmds games` + + + 그 모듈은 존재하지 않습니다. + + + {0} 서버의 권한이 필요합니다. + + + 목차 + + + 사용법 + Fuzzy + + + Autohentai 기능이 활성화되었습니다. 다음의 태그와 함께 {0} 초마다 사진이 올라옵니다. +태그 : +{1} + Fuzzy + + + 태그 + Fuzzy + + + 동물 경주 + Fuzzy + + + 참가자가 충분히 없어서 시작하지 못했습니다. + + + 참가자가 모두 모였습니다! 즉시 시작하겠습니다. + Fuzzy + + + {0} 이(가) {1} (으)로 참가했습니다. + Fuzzy + + + {0} 님이 {1} 으로써 참가하였고, {2} 을(를) 걸었습니다! + Fuzzy + + + {0}jr 를 입력해서 레이스에 참가합니다. + + + 20초 동안 기다리거나, 방이 가득 차면 시작됩니다. + Fuzzy + + + {0} 명의 참가자와 함께 시작합니다. + + + {0} 이(가) {1} (으)로 레이스를 이겼습니다! + Fuzzy + + + {0} 이(가) {1} (으)로 레이스를 이겼고 {2}! + Fuzzy + + + 유효하지 않은 숫자입니다. 한번에 {0}-{1} 의 주사위를 던질 수 있습니다. + Fuzzy + + + 님이 {0} 를 굴렸습니다. + Someone rolled 35 + + + 주사위 결과: {0} + Dice Rolled: 5 + + + 레이스 시작에 실패했습니다. 다른 레이스가 진행중입니다. + Fuzzy + + + 이 서버에 레이스가 존재하지 않습니다. + + + 두번째 숫자는 첫번째 숫자보다 큰 숫자여야 합니다. + Fuzzy + + + 마음의 변화 + Fuzzy + + + 요구한 사람 + Fuzzy + + + 이혼 + + + 좋아하는 사람 + Fuzzy + + + 값 + + + 아무 와이프도 클레임되지 않았습니다. + Fuzzy + + + 최고의 와이프 + + + + + + + Make sure to get the formatting right, and leave the thinking emoji + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 자기자신을 클레임 할 수 없습니다. + Fuzzy + + + 당신은 최근에 이혼하셨습니다. 다시 이혼하려면 {0} 시간 {1} 분을 기다려야 합니다. + Fuzzy + + + 아무도 없음 + + + + + + 8ball + Fuzzy + + + 아크로포비아 + Fuzzy + + + 아무런 제출 없이 게임이 끝났습니다. + + + + + + 두문자가 {0} 이었슴니다. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + plural + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 결과가 없습니다. + + + 이(가) {0} 을(를) 뽑았습니다. + Kwoth picked 5* + + + {0} 이(가) {1} 을(를) 설치했습니다. + Kwoth planted 5* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + context: "removed song #5" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 허락함 + Fuzzy + + + + + + + + + + + + + + + + + + + + + {0} (ID {1})님을 블랙리스트했습니다 + + + 명령어 {0} 은(는) 이제 {1}초 재사용 대기시간이 있습니다. + + + 이제 명령어 {0} 이 재사용 대기시간이 없고 기존의 모든 재사용 대기시간이 삭제되었습니다. + + + 명령어 재사용 대기시간이 설정되지 않았습니다. + + + 명령어 값 + + + 채널 {2} 에서 {0} {1} 의 사용을 비활성화시켰습니다. + + + 채널 {2} 에서 {0} {1} 의 사용을 활성화시켰습니다. + + + 거절함 + Fuzzy + + + 필터링 된 단어 목록에 {0} 을 추가했습니다. + Fuzzy + + + 필터링 된 단어 목록 + + + 필터링 된 단어 목록에서 {0} 을 삭제했습니다. + Fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + 명령어 + Gen (of command) + + + 모듈 + Gen. (of module) + + + 권한 목록 {0} 페이지 + + + + + + + + + + + + + + + + + + + + + 초. + Short of seconds. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 능력 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 애니메이션 검색에 실패했습니다. + + + 만화 검색에 실패했습니다. + + + 장르 + + + + + + 키/무게 + + + {0}m/{1}kg + + + 습도 + + + 이미지 검색: + + + 영화 검색에 실패했습니다. + + + + + + + + + + + + + + + + Don't translate {0}place + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 보고있는것: + Fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + /s and total need to be localized to fit the context - +`1.` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Invalid months value/ Invalid hours value + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 인용구가 추가되었습니다. + + + 인용구 #{0} 가 삭제되었습니다. + + + 지역 + + + 가입 날짜 + + + + + + 유효하지않은 시간 포맷입니다. 명령어 목록을 확인하십시오. + + + + + + + + + 반복 메시지 목록 + + + 이 서버에 반복 메시지 실행하고있지 안습니다. + + + #{0} 이 정지되었습니다. + + + + + + 결과 + + + 역할 + + + + + + + + + + + + + + + + + + + + + + + + Shard + + + Shard 통계 + + + Shard **#{0}** 이 {1} 상태이고 {2} 서버에 있습니다. + + + **이름:** {0} **링크:** {1} + + + 특수 이모지를 찾을 수 없습니다. + Fuzzy + + + {0} 개의 곡을 재생중이며, {1} 개의 대기열이 있습니다. + + + 텍스트 채널 + + + + + + + + + {1} 의 {0} 은(는) {2} 입니다. + Id of the user kwoth#1234 is 123123123123 + + + 사용자 + Fuzzy + + + 음성 채널 + + + 당신은 이미 레이스에 참가했습니다. + + + 현재 투표 결과 + + + 진행중인 투표가 없습니다. + + + 이 서버에서 이미 투표가 진행되고있습니다. + + + 📃 {0} 님이 투표를 생성하였습니다. + Fuzzy + + + + + + {0} 님이 투표하였습니다. + Kwoth voted. + + + 해당 답변 번호와 함께 개인 메시지를 보내십시오. + Fuzzy + + + 해당 답변 번호와 함께 여기에 메시지를 보내십시오. + Fuzzy + + + {0} 님, 투표해주셔서 감사합니다 + + + {0} 개의 표가 던져졌습니다. + Fuzzy + + + + + + `{0}pick`을 입력해서 획득하십시오. + Fuzzy + + + 사용자를 찾지 못했습니다. + + + {0} 페이지 + + + 이 서버의 음성 채널에 있어야합니다. + + + 음성채널 역할이 없습니다. + + + {0} 은(는) 음성과 텍스트 채팅으로 부터 {1} 분간 **음소거**되었습니다. + + + {0} 음성채널에 입장하는 사용자는 {1} 역할을 얻게됩니다. + + + {0} 음성채널에 입장하는 사용자는 더이상 {1} 역할을 얻지 못합니다. + + + 음성채널 역할 + + + + + + + + + + + + + + + 가명을 찾지 못했습니다. + + + {0} 입력은 이제 {1} 의 가명일것이니다. + + + 가명 목록 + + + 트리거 {0} 의 가명을 삭제했습니다. + + + 트리거 {0} 은(는) 가명 없었습니다. + + + 경기한 시간 + + + \ No newline at end of file From 22ed47ff9ece9eedf4e7fb11b5b8079cff914b69 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:09 +0200 Subject: [PATCH 18/42] Update ResponseStrings.zh-CN.resx (POEditor.com) From c8ea0039fe0d899cb5a1d3bef62be8cc05aef81e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:11 +0200 Subject: [PATCH 19/42] Update ResponseStrings.zh-TW.resx (POEditor.com) --- .../Resources/ResponseStrings.zh-TW.resx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx index 051bb851..7f3ca400 100644 --- a/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx +++ b/src/NadekoBot/Resources/ResponseStrings.zh-TW.resx @@ -1337,7 +1337,7 @@ Paypal <{1}> {0} 對 {1} - 正在排 {0} 首歌... + 正在點播 {0} 首歌... 已停用自動播放。 @@ -2255,16 +2255,16 @@ Paypal <{1}> 語音頻道身分組 - + 觸發自訂回應 ID 為 {0} 的訊息不會自動刪除。 - + 觸發自訂回應 ID 為 {0} 的訊息將會自動刪除。 - + 自訂回應 ID 為 {0} 的回應不會以私訊方式傳送。 - + 自訂回應 ID 為 {0} 的回應將會以私訊方式傳送。 找不到別名 @@ -2276,13 +2276,13 @@ Paypal <{1}> 別名列表 - + 觸發 {0} 不再有別名。 - + 觸發 {0} 並沒有別名。 - + 競技時數 \ No newline at end of file From a9b9612184d7ceb3cd8a39ebc346136873452dc6 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:14 +0200 Subject: [PATCH 20/42] Update ResponseStrings.nl-NL.resx (POEditor.com) --- .../Resources/ResponseStrings.nl-NL.resx | 525 ++++++++---------- 1 file changed, 246 insertions(+), 279 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx index 15bc2419..3f7ad541 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nl-NL.resx @@ -152,8 +152,7 @@ Ongeldige basis nummer - Ongeldig oorlogs -formaat. + Ongeldig oorlogsformaat. Fuzzy @@ -195,7 +194,7 @@ formaat. Alle speciale reactie statistieken zijn verwijderd. - Speciale Reactie verwijderdt. + Speciale Reactie verwijderd. Onvoldoende rechten. Bot Eigendom is nodig voor globale speciale reacties, en Administrator voor speciale server-reacties. @@ -214,7 +213,7 @@ formaat. Fuzzy - Geen speciale reacties gevonden met die ID. + Geen speciale reacties gevonden met dat ID. Antwoord @@ -223,19 +222,19 @@ formaat. Speciale Reactie Statistieken - Statistieke verwijderd voor {0} speciale reactie. + Statistieken verwijderd voor {0} speciale reactie. Geen statistieken voor die trekker gevonden, geen actie genomen. - Trekker + Trigger Autohentai gestopt. - Geen resultaten gevonden + Geen resultaten gevonden. {0} is al flauw gevallen. @@ -251,10 +250,10 @@ formaat. Kwoth used punch:type_icon: on Sanity:type_icon: for 50 damage. - Jij zal niet winnen zonder tegenstand! + Je kan niet opnieuw aanvallen zonder vergelding! - Je kunt je zelf niet aanvallen + Je kunt je zelf niet aanvallen. {0} is verslagen! @@ -263,7 +262,7 @@ formaat. heeft {0} genezen met een {1} - {0} heeft nog {1} HP over + {0} heeft nog {1} HP over. Je kan {0} niet gebruiken. Typ `{1}ml` om een lijst te bekijken van de aanvallen die jij kunt gebruiken @@ -272,7 +271,7 @@ formaat. Aanvallijst voor {0} element - Het heeft weinig effect. + Het is niet effectief. Je hebt niet genoeg {0} @@ -293,7 +292,7 @@ formaat. Het is super effectief! - Je hebt te veel aanvallen achter elkaar gemaakt, je kan dus niet bewegen! + Je hebt te veel acties achter elkaar gedaan, dus je kan niet bewegen! Element van {0} is {1} @@ -302,7 +301,7 @@ formaat. Gebruiker niet gevonden. - Je bent flauw gevallen, dus je kunt niet bewegen! + Je bent flauwgevallen, dus je kunt niet bewegen! **Auto aanwijzing van rollen** op gebruiker is nu **uitgeschakeld**. @@ -311,7 +310,7 @@ formaat. **Auto aanwijzing van rollen** op gebruiker is nu **ingeschakeld**. - Bestanden + Bijlagen Avatar veranderd @@ -320,50 +319,50 @@ formaat. Je bent verbannen van {0} server. Reden: {1} - Verbannen + verbannen PLURAL Gebruiker verbannen - Bot naam is veranderd naar {0} + Botnaam is veranderd naar {0} - Bot status is veranderd naar {0} + Botstatus is veranderd naar {0} - Automatische verwijdering van de bye berichten is uitgeschakeld. + Automatische verwijdering van de afscheidsberichten is uitgeschakeld. - Bye berichten zullen worden verwijderd na {0} seconden. + Afscheidsberichten zullen worden verwijderd na {0} seconden. - Momenteel is de bye message: {0} + Momenteel is het afscheidsbericht: {0} - Schakel de bye berichten in door {0} te typen. + Schakel de afscheidsbericht in door {0} te typen. - Nieuw bye bericht is geplaatst. + Nieuw afscheidsbericht is geplaatst. - Dag aankondigingen uitgeschakeld. + Afscheidsbericht uitgeschakeld. - Dag aankondigingen ingeschakeld op dit kanaal. + Afscheidsbericht ingeschakeld op dit kanaal. - Kanaal naam is veranderd. + Kanaalnaam is veranderd. Oude naam - Kanaal onderwerp is veranderd + Kanaalonderwerp is veranderd - Opgeruimd + Opgeruimd. Inhoud @@ -372,10 +371,10 @@ formaat. Met success een nieuwe rol gecreëerd. - Tekst kanaal {0} gecreëerd. + Tekst-kanaal {0} gecreëerd. - Stem kanaal {0} gecreëerd. + Voice-kanaal {0} gecreëerd. Dempen succesvol. @@ -384,82 +383,82 @@ formaat. Server verwijderd {0} - Stopt van automatische verwijdering van succesvolle reacties aanroepingen commando. + Succesvol aangeroepen commando's worden niet automatisch verwijderd. - Verwijdert nu automatisch succesvolle commando aanroepingen + Succesvol aangeroepen commando's worden nu automatisch verwijderd. - Tekst kanaal {0} verwijdert. + Tekst-kanaal {0} verwijderd. - Stem kanaal {0} verwijdert. + Voice-kanaal {0} verwijderd. - Privé bericht van + Privé-bericht van - Met succes een nieuwe donateur toegevoegt. Totaal gedoneerde bedrag van deze gebruiker {0} + Met succes een nieuwe donateur toegevoegd. Totaal gedoneerde bedrag van deze gebruiker: {0} - Dank aan de mensen hieronder vernoemt voor het waarmaken van dit project! + Dank aan de mensen hieronder voor het waarmaken van dit project! - Ik zal alle eigenaren een privé bericht sturen. + Ik zal alle eigenaren privé-berichten doorsturen. - Ik zal een privé bericht sturen naar de eerste eigenaar + Ik zal alleen privé-berichten doorsturen naar de eerste eigenaar. - Ik zal privé berichten sturen vanaf nu. + Ik zal privé-berichten doorsturen vanaf nu. - Ik stop vanaf nu met het sturen van privé berichten. + Ik stop vanaf nu met het doorsturen van privé berichten. - Automatisch verwijderen van groet berichten is uitgeschakeld. + Automatisch verwijderen van begroetings-berichten uitgeschakeld. - Groet berichten zullen worden verwijderd na {0} seconden. + Begroetings-berichten zullen worden verwijderd na {0} seconden. - Momenteen is het privé groet bericht: {0} + Momenteel is het privé begroetings-bericht: {0} - Schakel DM begroetings bericht in door {0} in te typen + Schakel DM begroetingen in door {0} in te typen - Nieuwe DM begroetings bericht vastgesteld. + Nieuwe DM begroeting ingesteld. - DM begroetings aankondiging uitgeschakeld. + DM begroetingen uitgeschakeld. - DM begroetingen aankondiging ingeschakeld. + DM begroetingen ingeschakeld. - Momentele begroetings bericht: {0} + Huidige begroeting: {0} - Schakel begroetings bericht in door {0} in te typen + Schakel begroetingen in door {0} in te typen - Nieuwe begroetings message vastgesteld. + Nieuwe begroeting ingesteld. - Begroetings aankondiging uitgeschakeld. + Begroetingen uitgeschakeld. - Begroetings aankondiging uitschakeld op dit kanaal. + Begroetingen uitschakeld op dit kanaal. - Jij kunt geen commando gebruiken op gebruikers met hogere of dezelfde rol als die van jouw in de rollen hiërarchie. + Je kunt geen commando gebruiken op gebruikers met een hogere of eenzelfde rol als die van jouw in de rollenhiërarchie. - Afbeeldingen geplaatst na {0} seconden! + Afbeeldingen geladen na {0} seconden! - Ongelde invoer formaat. + Ongeldig invoerformaat. Ongeldige parameters. @@ -468,12 +467,11 @@ formaat. {0} heeft {1} toegetreden - Je bent weggeschopt van de {0} server. + Je bent gekickt van {0}. Reden: {1} - Gebruiker weggeschopt - Fuzzy + Gebruiker gekickt. Lijst van talen @@ -481,37 +479,37 @@ Reden: {1} Fuzzy - Jouw server's locale is nu {0} - {1} + Je server's landinstelling is nu {0} - {1} - Bot's standaard locale is nu {0} - {1} + De bot zijn standaard landinstelling is nu {0} - {1} - Taal van de bot is gezet naar {0} - {1} + Taal van de bot is nu {0} - {1} - Instellen van locale mislukt. Ga naar de hulp voor dit commando. + Instellen van landsinstelling mislukt. Ga naar de hulp voor dit commando. - De taal van de server is gezet naar {0} - {1} + De taal van de server is nu {0} - {1} {0} heeft {1} verlaten - Server {0} verlaten + {0} verlaten - Gebeurtenis {0} wordt bijgehouden in dit kanaal. + Gebeurtenis {0} wordt gelogd in dit kanaal. - Alle gebeurtenissen worden bijgehouden in dit kanaal. + Alle gebeurtenissen worden gelogd in dit kanaal. Logging uitgeschakeld. - Log gebeurtenissen waar je op kan abonneren: + Log-gebeurtenissen waar je op kan abonneren: Logging zal {0} negeren @@ -543,7 +541,7 @@ Reden: {1} Fuzzy - Gebruikers zijn gedempt + gemute PLURAL (users have been muted) @@ -551,7 +549,7 @@ Reden: {1} singular "User muted." - Ik heb de benodigde rechten daar voor waarschijnlijk niet. + Ik heb de benodigde rechten daarvoor waarschijnlijk niet. Nieuwe demp rol geplaatst. @@ -560,20 +558,16 @@ Reden: {1} Ik heb **administrator** rechten daar voor nodig. - nieuw bericht - Fuzzy + Nieuw bericht - nieuwe bijnaam - Fuzzy + Nieuwe bijnaam Nieuw onderwerp - Fuzzy Bijnaam veranderd - Fuzzy Kan de server niet vinden @@ -583,25 +577,21 @@ Reden: {1} Oud bericht - Fuzzy Oude bijnaam - Fuzzy - Oude onderwerp - Fuzzy + Oud onderwerp - Fout. Hoogst waarschijnlijk heb ik geen voldoende rechten. + Error. Hoogst waarschijnlijk heb ik geen voldoende rechten. De rechten op deze server zijn gereset. - Actieve Beschermingen. - Fuzzy + Actieve beschermingen. {0} is nu ** uitgeschakeld** op deze server. @@ -610,29 +600,28 @@ Reden: {1} {0} Ingeschakeld - Fout. ik heb Beheer Rollen rechten nodig + Error. ik heb Beheer Rollen rechten nodig - Geen bescherming aangezet. - Fuzzy + Geen bescherming ingeschakeld. - Gebruiker's drempel moet tussen {0} en {1} zijn. + Gebruikersdrempel moet tussen {0} en {1} zijn. - Als {0} of meerdere gebruikers binnen {1} seconden, zal ik hun {2}. + Als {0} of meerdere gebruikers binnen {1} seconden toetreden, zal ik ze {2}. Aangegeven tijd hoort binnen {0} en {1} seconden te vallen. - Met succes alle roles van de gebruiker {0} verwijderd + Met succes alle rollen van gebruiker {0} verwijderd. Het verwijderen van de rollen is mislukt. Ik heb onvoldoende rechten. - De kleur van de rol {0} is veranderd + De kleur van de rol {0} is veranderd. Die rol bestaat niet. @@ -641,7 +630,7 @@ Reden: {1} De aangegeven parameters zijn ongeldig. - Error opgekomen vanwege ongeldige kleur, of onvoldoende rechten. + Error opgekomen vanwege ongeldige kleur of onvoldoende rechten. Met sucess rol {0} verwijderd van gebruiker {1}. @@ -650,16 +639,16 @@ Reden: {1} Mislukt om rol te verwijderen. Ik heb onvoldoende rechten. - Rol naam veranderd. + Naam van de rol veranderd. - Rol naam veranderen mislukt. Ik heb onvoldoende rechten. + Naam van de rol veranderen mislukt. Ik heb onvoldoende rechten. - je kan geen rollen bijwerken die hoger zijn dan je eigen rol. + Je kan geen rollen bijwerken die hoger zijn dan je hoogste rol. - Speel bericht verwijderd: {0} + Spelende bericht verwijderd: {0} Rol {0} is toegevoegd aan de lijst. @@ -687,10 +676,10 @@ Reden: {1} Nog geen routerende speelstatussen ingesteld. - Je hebt al {0} rol. + Je hebt rol {0} al. - Je hebt {0} exclusieve zelf toegewezen rol al. + Je hebt {0} exclusieve zelf-toegewezen rol al. Zelf toegewezen rollen zijn nu exclusief! @@ -699,25 +688,25 @@ Reden: {1} Er zijn {0} zelf toewijsbare rollen - Deze rol is niet zelf toewijsbaar. + Deze rol is niet zelf-toewijsbaar. - Je hebt niet {0} rol. + Je hebt rol {0} niet. - Zelf toegewezen rollen zijn nu niet exclusief! + Zelf-toegewezen rollen zijn nu niet exclusief! - Ik kan deze rol niet aan je toevoegen. `Ik kan niet rollen toevoegen aan eigenaren of andere rollen die boven mij staan in de rol hiërarchie.` + Ik kan deze rol niet aan je toevoegen. `Ik kan geen rollen toevoegen aan eigenaren of andere rollen die boven mij staan in de rol-hiërarchie.` {0} is verwijderd van de lijst met zelf toewijsbare rollen. - Je hebt {0} rol niet meer. + Je hebt de {0} rol niet meer. - je hebt nu {0} rol. + Je hebt nu de {0} rol. Succesvol de rol {0} toegevoegd aan gebruiker {1} @@ -729,7 +718,7 @@ Reden: {1} Nieuwe avatar ingesteld! - Nieuwe kanaal naam ingesteld. + Nieuwe kanaalnaam ingesteld. Nieuwe game ingesteld! @@ -738,7 +727,7 @@ Reden: {1} Nieuwe stream ingesteld! - Nieuwe kanaal onderwerp ingesteld. + Nieuwe kanaalonderwerp ingesteld. Shard {0} opnieuw verbonden. @@ -747,42 +736,42 @@ Reden: {1} Shard {0} is opnieuw aan het verbinden. - Afsluiten + Aan het afsluiten Gebruikers kunnen niet meer dan {0} berichten sturen per {1} seconden. - langzame mode uitgezet + Langzame modus uitgezet. - langzame mode gestart + Langzame modus gestart. - zacht-verbannen (kicked) + soft-verbannen (gekickt) PLURAL {0} zal dit kanaal negeren. - {0} zal dit kanaal niet meer negeren. + {0} zal dit kanaal niet langer negeren. - Als een gebruiker {0} de zelfde berichten plaatst, zal ik ze {1}. + Als een gebruiker {0} gelijke berichten plaatst, zal ik ze {1}. __IgnoredChannels__: {2} - Tekst kanaal aangemaakt. + Tekst-kanaal aangemaakt. - Tekst kanaal verwijderd. + Tekst-kanaal verwijderd. - Ontdempen succesvol + Doof maken ontdoen succesvol - Ongedempt + Geünmute singular @@ -790,70 +779,60 @@ __IgnoredChannels__: {2} Gebruikersnaam veranderd - Fuzzy Gebruikers Gebruiker verbannen - Fuzzy - {0} is **gedempt** van chatten. - Fuzzy + {0} is **gedempt** van het chatten. - {0} is **ongedempt** van chatten. - Fuzzy + {0} is **ongedempt** van het chatten. - Gebruiker toegetreden - Fuzzy + Gebruiker is toegetreden - Gebruiker verlaten - Fuzzy + Gebruiker is weggegaan - {0} is **gedempt** van het tekst en stem kanaal. + {0} is **gedempt** van het tekst- en voice-kanaal. Rol van gebruiker toegevoegd - Fuzzy Rol van gebruiker verwijderd - Fuzzy {0} is nu {1} - {0} is **ongedempt** van het tekst en stem kanaal. + {0} is **ongedempt** van het tekst- en voice-kanaal. - {0} is {1} spraakkanaal toegetreden. + {0} is {1} voice-kanaal toegetreden. - {0} heeft {1} spraakkanaal verlaten. + {0} heeft {1} voice-kanaal verlaten. - {0} heeft {1} naar {2} spraakkanaal verplaatst. + {0} heeft {1} naar {2} voice-kanaal verplaatst. - {0} is **spraak gedempt** + {0} is **spraak gemute**. - {0} is **spraak ongedempt** + {0} is **spraak geünmute**. - Spraakkanaal gemaakt - Fuzzy + Voice-kanaal gemaakt - Spraakkanaal vernietigd - Fuzzy + Voice-kanaal verwijderd Spraak + tekst mogelijkheid uitgezet. @@ -862,13 +841,13 @@ __IgnoredChannels__: {2} Spraak + tekst mogelijkheid aangezet. - Ik heb geen **Rol Beheering** en/of **Kanaal Beheering** toestemmingen, dus ik kan geen `stem+text` gebruiken op de {0} server. + Ik heb geen **Rol Beheer** en/of **Kanaal Beheer** toestemmingen, dus ik kan geen `stem+text` gebruiken op de {0} server. - Deze eigenschap wordt door jou ingeschakelt/uitgeschakelt maar **Ik heb geen ADMINISTRATIEVE toestemmingen**. Hierdoor kunnen er mogelijk problemen ontstaan, en je zal daarna de tekst kanalen zelf moeten opruimen. + Deze eigenschap wordt door jou ingeschakeld/uitgeschakeld maar **Ik heb geen ADMINISTRATIEVE toestemmingen**. Hierdoor kunnen er mogelijk problemen ontstaan, en je zal daarna de tekst-kanalen zelf moeten opruimen. - Ik heb tenminste **Rol Beheering** en **Kanaal Beheering** toestemmingen nodig om deze eigenschap in te schakelen. (Geliefe adminstratieve rechten) + Ik heb tenminste **Rol Beheering** en **Kanaal Beheering** toestemmingen nodig om deze eigenschap in te schakelen. (Gelieve administratieve rechten) Gebruiker {0} van tekstkanaal @@ -880,25 +859,23 @@ __IgnoredChannels__: {2} Gebruiker {0} van spraakkanaal - Je bent zacht-verbannen van {0} server. + Je bent soft-gebant van {0} server. Reden: {1} Gebruiker niet meer verbannen - Migratie gelukt! + Migratie klaar! - Fout tijdens het migreren, kijk in de bot's console voor meer informatie. + Fout tijdens het migreren, kijk in de bot zijn console voor meer informatie. - Aanwezigheid Updates - Fuzzy + Aanwezigheid updates - Gebruiker zacht-verbannen - Fuzzy + Gebruiker soft-gebant heeft {0} aan {1} gegeven @@ -910,7 +887,7 @@ Reden: {1} Gefeliciteerd! Je hebt {0} gewonnen voor het rollen boven de {1} - Dek geschud. + Dek herschud. heeft de munt op {0} gegooid @@ -949,22 +926,22 @@ Reden: {1} {0} heeft {1} gebruikers beloont met {2} rol. - Je kan niet meer dan {0} gokken + Je kan niet meer dan {0} wedden - Je kan niet minder dan {0} gokken + Je kan niet minder dan {0} wedden Je hebt niet genoeg {0} - Geen kaarten meer in het dek + Geen kaarten meer in het dek. - Verloten gebruiker + Verlootte gebruiker - Je hebt {0} gerold + Je hebt {0} gerold. Inzet @@ -976,7 +953,7 @@ Reden: {1} Een enkele {0}, x{1} - Wow! Gelukkig! Drie van dezelfde! x{0} + Wow! Wat een geluk! Three of a kind! x{0} Goed gedaan! Twee {0} - wed x{1} @@ -1007,28 +984,25 @@ Duurt {1} seconden. Vertel het aan niemand. Shhh. Terug naar de inhoudsopgave - Alleen Voor Bot Eigenaren - Fuzzy + Alleen voor Bot-eigenaren Heeft {0} kanaal rechten nodig. - Je kan het project steunen op patreon: <{0}> of paypal: <{1}> + Je kan het project steunen op Patreon: <{0}> of PayPal: <{1}> - Command en aliassen. - Fuzzy + Commando's en aliassen - Commandolijst Geregenereerd. - Fuzzy + Commandolijst gegenereerd. - Typ `{0}h CommandoNaam` om de hulp te zien voor die specifieke commando. b.v `{0}h >8bal` + Typ `{0}h CommandoNaam` om de uitleg te zien voor dat specifieke commando. b.v `{0}h >8bal` - Ik kan die commando niet vinden. Verifiëren of die commando echt bestaat voor dat je het opnieuw probeert. + Ik kan het commando niet vinden. Verifieer of dit commando echt bestaat voordat je het opnieuw probeert. Beschrijving @@ -1036,56 +1010,51 @@ Duurt {1} seconden. Vertel het aan niemand. Shhh. Je kan het NadekoBot project steunen op Patreon <{0}> of -Paypal <{1}> +PayPal <{1}> Vergeet niet je discord naam en id in het bericht te zetten. **Hartelijk bedankt** ♥️ **Lijst met commando's**: <{0}> -**Hosting gidsen en documenten kunnen hier gevonden worden**: <{1}> - Fuzzy +**Hosting tutorials en documenten kunnen hier gevonden worden**: <{1}> - Lijst Met Commando's - Fuzzy + Lijst met commando's - Lijst Met Modules - Fuzzy + Lijst met modules Typ `{0}cmds ModuleNaam` om een lijst van commando's te krijgen voor die module. bv `{0}cmds games` - Deze module bestaat niet + Deze module bestaat niet. Heeft {0} server rechten nodig. Inhoudsopgave - Fuzzy Gebruik - Autohentai gestart. Elke {0}s word een foto geplaatst met de volgende labels: + Autohentai gestart. Er wordt elke {0} seconden een foto geplaatst met de volgende labels: {1} - Fuzzy Label - Dieren race + Dierenrace - Gefaalt om te starten omdat er niet genoeg deelnemers zijn. + Gefaald om te starten omdat er niet genoeg deelnemers zijn. - De race is vol! De race wordt onmiddelijk gestart. + De race is vol! De race wordt onmiddellijk gestart. {0} doet mee als een {1} @@ -1097,10 +1066,10 @@ Vergeet niet je discord naam en id in het bericht te zetten. Typ {0}jr om mee te doen met de race. - De race zal beginnen in 20 seconden of wanneer de kamer is vol. + De race zal met 20 seconden beginnen of wanneer de kamer is vol. - De race zal beginnen met {0} deelnemers. + De race zal beginnen bij {0} deelnemers. {0} heeft de race gewonnen als {1}! @@ -1112,7 +1081,7 @@ Vergeet niet je discord naam en id in het bericht te zetten. Ongeldig nummer ingevoerd. Je kan de dobbelsteen van {0}-{1} rollen. - {0} gerold. + heeft {0} gerold. Someone rolled 35 @@ -1120,16 +1089,16 @@ Vergeet niet je discord naam en id in het bericht te zetten. Dice Rolled: 5 - Gefaalt om de race te starten. Een andere race is waarschijnlijk bezig. + Starten van de race is mislukt. Een andere race is waarschijnlijk bezig. - Geen enkele race bestaat op deze server. + Er bestaat geen enkele race op deze server - Het tweede nummer moet groter zijn dan het eerste nummer. + Het tweede nummer moet hoger zijn dan het eerste nummer. - Verandering van het hart + Ommezwaai Opgeëist door @@ -1138,13 +1107,13 @@ Vergeet niet je discord naam en id in het bericht te zetten. Scheidingen - Leuk + Likes Prijs - Nog geen waifus zijn overwonnen. + Er zijn nog geen waifus geclaimed. Top Waifus @@ -1153,33 +1122,33 @@ Vergeet niet je discord naam en id in het bericht te zetten. Jouw affiniteit is al ingesteld op een waifu, of je probeert om je affiniteit weg te halen terwijl je geen hebt. - Affiniteit verandert van {0} naar {1} + Affiniteit veranderd van {0} naar {1} -Dit is moreel twijfelachtig🤔 +*Dit is moreel gezien twijfelachtig.*🤔 Make sure to get the formatting right, and leave the thinking emoji Je moet {0} uren en {1} minuten wachten om je affiniteit weer te veranderen. - Jouw affiniteit is gereset. Je hebt geen persoon meer die je leuk vindt. + Je affiniteit is gereset. Je hebt geen persoon meer die je leuk vindt. wil {0}'s waifu zijn. Aww <3 - heeft {0} genomen als hun waifu voor {1}! + heeft {0} geclaimed als hun waifu voor {1}! - Je bent gescheiden met een waifu die jou leuk vindt. Jij harteloze monster. + Je bent gescheiden met een waifu die jou leuk vindt. Jij harteloos monster. {0} ontvangen {1} als compensatie. - Je kunt geen affiniteit zelf opzetten, jij opgeblazen egoist. + Je kunt geen affiniteit voor jezelf instellen, jij opgeblazen egoist. - 🎉Hun liefde overvloeit! 🎉 -{0} nieuwe waarde is {1}! + 🎉Hun liefde overvloeit! 🎉 +{0}'s nieuwe waarde is {1}! Geen enkele waifu is zo goedkoop. Je moet tenminste {0} betalen om een waifu te krijgen, ook al is hun echte waarde lager. @@ -1188,7 +1157,7 @@ Dit is moreel twijfelachtig🤔 Je moet tenminste {0} betalen om die waifu te nemen! - Die waifu is niet van jouw. + Die waifu is niet van jou. Je kunt jezelf niet als waifu nemen. @@ -1203,7 +1172,7 @@ Dit is moreel twijfelachtig🤔 Je bent gescheiden met een waifu die jou niet leuk vindt. Je krijgt {0} terug. - 8bal + 8ball Acrophobie @@ -1212,7 +1181,7 @@ Dit is moreel twijfelachtig🤔 Spel afgelopen zonder inzendingen. - Geen stemmen ingestuurdt. Spel geëindigd zonder winnaar. + Geen stemmen ingestuurd. Spel beëindigd zonder winnaar. Afkorting was {0} @@ -1254,10 +1223,10 @@ Dit is moreel twijfelachtig🤔 Inzendingen gesloten. - Dieren Race is al bezig. + Dierenrace is al bezig. - Totaal: {0} Gemiddelde: {1} + Totaal: {0} Gemiddeld: {1} Categorie @@ -1275,31 +1244,29 @@ Dit is moreel twijfelachtig🤔 Valuta generatie is ingeschakeld op dit kanaal. - {0} willekeurige {1} zijn verschenen! Pak ze op door `{2}pick` in te typen. - plural -Fuzzy + {0} willekeurige {1} zijn verschenen! + plural - Een willekeurige {0} is verschenen! Pak ze op door `{1}pick` in te typen. - Fuzzy + Een willekeurige {0} is verschenen! - Het laden van de vraag is gefaalt. + Het laden van de vraag is gefaald. Spel gestart. - Hangman + Galgje potje gestart - Er is al een spel galgje aan de gang in dit kanaal. + Er is al een potje galgje aan de gang in dit kanaal. Galgje kon niet opstarten vanwege een fout. - lijst van {0}Galgje term types: + Lijst van "{0}galgje" term types: Scoreboard @@ -1325,19 +1292,19 @@ Fuzzy Trivia spel - {0} heeft 'm geraden! Het antwoord was: {1} + {0} heeft 't geraden! Het antwoord was: {1} - Trivia is niet bezig in deze server. + Trivia is niet bezig op deze server. {0} heeft {1} punten - Stopt na deze vraag. + Er wordt gestopt na deze vraag. - Tijd is op! Het goede antwoord was {0} + De tijd is om! Het goede antwoord was {0} {0} heeft het antwoord geraden en wint het spel! Het antwoord was: {1} @@ -1346,13 +1313,13 @@ Fuzzy Je kan niet tegen jezelf spelen. - BoterKaasenEieren spel is al bezig in dit kannal. + Boter-Kaas-en-Eieren spel is al bezig in dit kanaal. Gelijkspel! - heeft een Boter, Kaas en eieren sessie aangemaakt. + heeft een Boter-Kaas-en-Eieren sessie aangemaakt. {0} heeft gewonnen! @@ -1373,7 +1340,7 @@ Fuzzy {0} tegen {1} - Aan het proberen om {0} liedjes in de wachtrij te zetten... + Aan het proberen om {0} tracks in de wachtrij te zetten... Autoplay uitgezet. @@ -1382,31 +1349,31 @@ Fuzzy Autoplay aangezet. - Standaard volume op {0}% gezet + Standaardvolume op {0}% gezet Map afspeellijst geladen/compleet. - Eerlijk spel. + fairplay - Liedje afgelopen + Track afgelopen: - Eerlijk spel uitgeschakeld. + Fairplay uitgeschakeld. - Eerlijk spel ingeschakeld. + Fairplay ingeschakeld. - van positie + Van positie ID - ongeldige invoer. + Ongeldige invoer. Maximale speeltijd heeft geen limiet meer. @@ -1418,7 +1385,7 @@ Fuzzy Maximale muziek wachtrij heeft geen limiet meer. - Maximale muziek wachtrij is nu {0} liedjes. + Maximale muziek wachtrij is nu {0} tracks. Je moet in het spraakkanaal van de server zijn. @@ -1443,26 +1410,26 @@ Fuzzy Speler afspeellijst - Pagina {0}/{1} - Liedje aan het spelen + Track speelt af - `#{0}` - **{1}** van *{2}* ({3} liedjes) + `#{0}` - **{1}** van *{2}* ({3} tracks) Pagina {0} van opgeslagen afspeellijsten - Afspeellijst verwijderd + Afspeellijst verwijderd. - Fout bij het verwijderen van de afspeellijst. Of het bestaat niet of U bent niet de auteur. + Fout bij het verwijderen van de afspeellijst. De afspeellijst bestaat niet of jij bent niet de eigenaar. Afspeellijst met dat ID bestaat niet. - Speler afspeellijst afgerond. + Afspeellijst wachtrij afgerond. Afspeellijst opgeslagen @@ -1474,7 +1441,7 @@ Fuzzy Wachtrij - Gekozen nummer + Nummer toegevoegd @@ -1484,41 +1451,41 @@ Fuzzy Wachtrij is vol op {0}/{0}. - Liedje verwijderd + Track verwijderd: context: "removed song #5" - Huidig liedje word herhaald + Huidige track word herhaald - Huidige afspeellijst word herhaald + Afspeellijst wordt herhaald - Herhaal nummer + Nummer wordt herhaald - Huidig nummer herhaling gestopt. + Huidige nummerherhaling gestopt. Nummer word hervat. - Herhaal afspeellijst uitgeschakeld. + Herhalende afspeellijst uitgeschakeld. - Herhaal afspeellijst ingeschakeld. + Herhalende afspeellijst ingeschakeld. - Muziek dat wordt gespeeld, afloopt, gepauzeerd en wordt verwijder laat ik in dit kanaal zien. + Tracks die worden afgespeeld, aflopen, gepauzeerd worden en worden verwijderd laat ik in dit kanaal zien. Overslaan naar `{0}:{1}` - Liedjes geschud + Tracks geschud - Liedje verzet + Track verzet {0}u {1}m {2}s @@ -1536,102 +1503,102 @@ Fuzzy Volume op {0}% gezet - Uitgeschakelde gebruik op alle moddelen in dit kanaal {0}. + ALLE MODULES zijn uitgeschakeld op kanaal {0}. - Ingeschakelde gebruik op alle moddelen in dit kanaal {0}. + ALLE MODULES zijn ingeschakeld op kanaal {0}. Toegestaan - Uitgeschakelde gebruik op alle moddelen voor deze rol {0}. + ALLE MODULES zijn uitgeschakeld voor deze rol {0}. - Ingeschakelde gebruik op alle moddelen voor deze rol{0}. + ALLE MODULES zijn ingeschakeld voor deze rol{0}. - Uitgeschakelde gebruik op alle moddelen in deze server. + ALLE MODULES zijn uitgeschakeld op deze server. - ingeschakelde gebruik op alle moddelen in deze server. + ALLE MODULES zijn ingeschakeld op deze server. - Uitgeschakelde gebruik op alle moddelen voor deze gebruiker{0}. + ALLE MODULES zijn uitgeschakeld voor deze gebruiker{0}. - Ingeschakelde gebruik op alle moddelen voor deze gebruiker{0}. + ALLE MODULES zijn ingeschakeld voor deze gebruiker{0}. Blacklisted {0} met ID {1} - Commando {0} heeft nu een {1}s afkoel tijd. + Commando {0} heeft nu een {1} seconden cooldown. - Commando {0} heeft geen afkoel tijd meer, en alle bestaande afkoeltijden zijn weggehaald. + Commando {0} heeft geen cooldown meer, en alle bestaande cooldowns zijn weggehaald. - Geen commando afkoeltijden ingesteld. + Geen commando cooldowns ingesteld. Command kosten - Uitgeschakelde gebruik van {0} {1} in kanaal {2}. + Gebruik van {0} {1} uitgeschakeld in kanaal {2}. - Ingeschakelde gebruik van {0} {1} in kanaal {2}. + Gebruik van {0} {1} ingeschakeld in kanaal {2}. Geweigerd - Woord {0} tegevoegd aan de lijst met foute woorden. + Woord {0} toegevoegd aan de lijst met gefilterde woorden. - Lijst van gefilterde worden + Lijst van gefilterde woorden - Woord {0} verwijderd van de lijst met foute woorden. + Woord {0} verwijderd van de lijst met gefilterde woorden. - Ongeldige tweede parameter.(Moet een number zijn tussen {0} en {1}) + Ongeldige tweede parameter (moet een nummer zijn tussen {0} en {1}). - Uitnodiging filter uitgeschakeld in dit kanaal. + Uitnodigingfilter uitgeschakeld in dit kanaal. - Uitnodiging filter ingeschakeld in dit kanaal. + Uitnodigingfilter ingeschakeld in dit kanaal. - Uitnodiging filter uitgeschakeld in deze server. + Uitnodigingfilter uitgeschakeld in deze server. - Uitnodiging filter ingeschakeld in deze server. + Uitnodigingfilter ingeschakeld in deze server. - Verplaat toestemming {0} voor #{1} naar #{2} + Toestemming {0} verplaatst van #{1} naar #{2} - Kan geen toestemming vinden in inhoudsopgave #{0} + Kan de toestemming niet vinden in inhoudsopgave #{0} Geen kosten ingesteld. - Commando + commando Gen (of command) - Module + module Gen. (of module) Rechten pagina {0} - Actueel toestemming rol is {0}. + Actuele toestemmingsrol is {0}. Gebruiker heeft nu {0} rol om toestemmingen te veranderen. @@ -1643,20 +1610,20 @@ Fuzzy Verwijderd toestemming #{0} - {1} - Uitgeschakelde gebruik van {0} {1} voor rol {2}. + Gebruik van {0} {1} uitgeschakeld voor rol {2}. - Ingeschakelde gebruik van {0} {1} voor rol {2}. + Gebruik van {0} {1} ingeschakeld voor rol {2}. - Seconden + sec. Short of seconds. - Uitgeschakelde gebruik van {0} {1} op deze server. + Gebruik van {0} {1} uitgeschakeld op deze server. - Ingeschakelde gebruik van {0} {1} op deze server. + Gebruik van {0} {1} ingeschakeld op deze server. Unblacklisted {0} met ID {1} @@ -1671,31 +1638,31 @@ Fuzzy Ingeschakelde gebruik van {0} {1} voor gebruiker {2}. - Ik zal geen permissie waarschuwingen meer weergeven. + Ik zal geen permissiewaarschuwingen meer weergeven. - Ik zal permissie waarschuwingen weergeven. + Ik zal permissiewaarschuwingen weergeven. - Woord filter gedeactiveerd in dit kanaal. + Woordfilter gedeactiveerd in dit kanaal. - Woord filter geactiveerd in dit kanaal. + Woordfilter geactiveerd in dit kanaal. - Woord filter gedeactiveerd in deze server. + Woordfilter gedeactiveerd in deze server. - Woord filter geactiveerd in deze server. + Woordfilter geactiveerd in deze server. - Talenten + Begaafdheid Nog geen favoriete anime - Gestart met het automatisch vertalen van berichten op dit kanaal. Gebruiker berichten worden automatisch verwijderd. + Gestart met het automatisch vertalen van berichten op dit kanaal. Berichten van gebruikers worden automatisch verwijderd. Jouw automatisch translatie taal is verwijderd. @@ -2211,7 +2178,7 @@ Eigenaar ID: {2} Geen speciale emojis gevonden. - {0} liedjes aan het spelen, {1} in de wachtrij + {0} tracks aan het spelen, {1} in de wachtrij Tekst Kanalen From 5996dc3ecf67f10fce3d6ba1641177f3cf05c2e0 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:16 +0200 Subject: [PATCH 21/42] Update ResponseStrings.en-US.resx (POEditor.com) --- .../Resources/ResponseStrings.en-US.resx | 4328 ++++++++--------- 1 file changed, 2164 insertions(+), 2164 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.en-US.resx b/src/NadekoBot/Resources/ResponseStrings.en-US.resx index 3fb0ba18..ccff686e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.en-US.resx +++ b/src/NadekoBot/Resources/ResponseStrings.en-US.resx @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 そのベースはもう要求・破壊されました。 @@ -856,7 +856,7 @@ Fuzzy ユーザー{1}にロール{0}を追加しました - Typo- "successfully" should be 'Successfully' + Typo- "Sucessfully" should be 'Successfully' ロールの追加に失敗しました。アクセス権が足りません。 From bb2e647dbd8e090db75c18b14b99f1abe5a2948c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:27 +0200 Subject: [PATCH 25/42] Update ResponseStrings.nb-NO.resx (POEditor.com) --- .../Resources/ResponseStrings.nb-NO.resx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx index f566494b..08aa81fa 100644 --- a/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx +++ b/src/NadekoBot/Resources/ResponseStrings.nb-NO.resx @@ -2305,34 +2305,34 @@ Eier ID: {2} Stemmekanal-roller - + Meldingen som aktiverer reaksjonen med ID {0} vil ikke bli automatisk slettet. - + Meldingen som aktiverer reaksjonen med ID {0} vil bli automatisk slettet. - + Respons-meldingen for tilpasset reaksjon med ID {0} vil ikke bli sendt som DM. - + Respons-meldingen for tilpasset reaksjon med ID {0} vil bli sendt som DM - + Ingen alias funnet - + {0} er nå alias for {1} - + Liste over alias - + {0} har ikke lenger noe alias - + {0} hadde ikke noe alias - + Kompetitiv spilltid \ No newline at end of file From b84eeb055606982cfd95dd71ad32dc7f81119b2e Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:29 +0200 Subject: [PATCH 26/42] Update ResponseStrings.pl-PL.resx (POEditor.com) --- .../Resources/ResponseStrings.pl-PL.resx | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx index 013b1cd8..2d71a47b 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pl-PL.resx @@ -486,7 +486,7 @@ Powód: {1} - + Język bota ustawiony na {0} - {1} @@ -501,7 +501,8 @@ Powód: {1} Opuścił serwer {0} - + Logowanie wydarzenia {0} na tym kanale. + Fuzzy Logowanie wszystkich wydarzeń na tym kanale. @@ -513,7 +514,7 @@ Powód: {1} - + Logowanie będzie ignorowało {0} Logowanie nie będzie ignorowało {0} @@ -1816,7 +1817,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Oryginalny URL - + Klucz osu! API jest wymagany. @@ -1825,10 +1826,10 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Znaleziono {0} obrazków. Pokazuję przypadkowe {0} - + Nie znaleziono użytkownika! Proszę sprawdzić Region i BattleTag zanim znowu spróbujesz. - + Planowane Platforma @@ -1876,7 +1877,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Status - + Url sklepu Streamer {0} jest niedostępny. @@ -1898,7 +1899,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Stream prawdopodobnie nie istnieje. - + Usunięto stream użytkownika {0} ({1}) z powiadomień. @@ -1934,7 +1935,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Widzowie: - + Oglądane @@ -1949,7 +1950,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś Szybkość wiatru - + Najczęściej banowane postacie w {0} Problem z napisaniem Twojego zdania w stylu Yody @@ -1966,7 +1967,7 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + Łącznie {0} użytkowników. Autor @@ -1987,13 +1988,13 @@ Nie zapomnij zostawić swojej discordowej nazwy użytkownika albo ID w wiadomoś - + {0} {1} wynosi {2} {3} - + Jednostki które mogą być przekonwertwane - + Nie można przekonwertować {0} na {1}: nie znaleziono jednostki @@ -2077,13 +2078,13 @@ ID właściciela: {2} - + Brak roli na tej stronie. - + Brak tematu. Właściciel @@ -2100,10 +2101,10 @@ ID właściciela: {2} {2} kanałów tekstowych - + Usunięto wszystkie cytaty ze słowem {0}. - + {0} strona cytatów @@ -2112,10 +2113,10 @@ ID właściciela: {2} - + Dodano cytat - + Usunięto cytat #{0} Region @@ -2184,7 +2185,7 @@ ID właściciela: {2} - + **Nazwa:** {0} **Link:** {1} Nie znaleziono żadnych specjalnych emotikon @@ -2196,7 +2197,7 @@ ID właściciela: {2} Kanały głosowe - + Twój link do pokoju: From 2ef207e4dc20c32cf8d8ac0477d3a714a3a69e1c Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:32 +0200 Subject: [PATCH 27/42] Update ResponseStrings.pt-BR.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.pt-BR.resx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx index f24177e0..abbdde18 100644 --- a/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.pt-BR.resx @@ -583,7 +583,7 @@ Razão: {1} Nenhum shard com aquele ID foi encontrado. - Mensagem Antiga + Mensagem Anterior Fuzzy @@ -794,14 +794,12 @@ __Canais Ignorados__: {2} Nome de usuário alterado - Fuzzy Usuários Usuário Banido - Fuzzy {0} foi **mutado** @@ -1134,7 +1132,7 @@ Não esqueça de deixar seu nome ou id do discord na mensagem. O segundo número deve ser maior que o primeiro. - Mudanças no Coração + Mudanças de ideia Fuzzy @@ -1918,7 +1916,7 @@ Fuzzy Pontuação: - Busca Por: + Buscar Por: Fuzzy @@ -2094,8 +2092,7 @@ Fuzzy Índice fora de alcance. - Aqui está uma lista de usuários nestes cargos: - Fuzzy + Lista de usuários no cargo {0} você não tem permissão de usar esse comando em cargos com muitos usuários para prevenir abuso. @@ -2189,7 +2186,7 @@ OwnerID: {2} Citação adicionada - Uma citação aleatória foi removida. + Citação #{0} Deletada. Fuzzy From dd7e657900e1855ef41c213103e756b94f7b7953 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:35 +0200 Subject: [PATCH 28/42] Update ResponseStrings.ru-RU.resx (POEditor.com) --- src/NadekoBot/Resources/ResponseStrings.ru-RU.resx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx index b1039c13..8edacbe6 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ru-RU.resx @@ -1422,7 +1422,6 @@ Fuzzy Плейлист с таким номером не существует. - Fuzzy Добавление плейлиста в очередь завершено. @@ -1526,7 +1525,6 @@ Fuzzy {0} добавлено в чёрный список под номером {1} - Fuzzy У команды {0} теперь есть время перезарядки {1}c @@ -1624,7 +1622,6 @@ Fuzzy {0} с номером {1} убраны из черного списка. - Fuzzy нередактируемое @@ -2268,11 +2265,11 @@ Fuzzy Fuzzy - Ответное сообщение для настраеваемой реакцией с номером {0} не будет отправлено в ЛС. + Ответное сообщение для настраеваемой реакции с номером {0} не будет отправлено в ЛС. Fuzzy - Ответное сообщение для настраиваемой реакцией с номером {0} будет отправлено в ЛС. + Ответное сообщение для настраиваемой реакции с номером {0} будет отправлено в ЛС. Fuzzy From 616003d83122d9778f390764e6ed2004a9df5bca Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:38 +0200 Subject: [PATCH 29/42] Update ResponseStrings.sr-cyrl-rs.resx (POEditor.com) --- .../Resources/ResponseStrings.sr-cyrl-rs.resx | 240 +++++++++--------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx index 8c3dd6c5..8fe7d18e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sr-cyrl-rs.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Та база је већ под захетвом или је уништена. @@ -364,7 +364,7 @@ Reason: {1} Content - successfully created role {0} + Sucessfully created role {0} Text channel {0} created. @@ -394,7 +394,7 @@ Reason: {1} DM from - successfully added a new donator.Total donated amount from this user: {0} 👑 + Sucessfully added a new donator.Total donated amount from this user: {0} 👑 Thanks to the people listed below for making this project hjappen! @@ -712,7 +712,7 @@ Reason: {1} You now have {0} role. - successfully added role {0} to user {1} + Sucessfully added role {0} to user {1} Failed to add role. I have insufficient permissions. From f8f23f9d3079184b452bd798099b6d08cddc4b93 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:40 +0200 Subject: [PATCH 30/42] Update ResponseStrings.es-ES.resx (POEditor.com) From 7190c56751d45eedbfa20a902c197faa93db2b73 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:43 +0200 Subject: [PATCH 31/42] Update ResponseStrings.sv-SE.resx (POEditor.com) --- .../Resources/ResponseStrings.sv-SE.resx | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx index bd3d6093..6ee45f0f 100644 --- a/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx +++ b/src/NadekoBot/Resources/ResponseStrings.sv-SE.resx @@ -156,7 +156,7 @@ Fuzzy - Lista Över Aktiva Krig + Lista över aktiva krig Fuzzy @@ -209,7 +209,7 @@ Nya egengjorda Reaktioner - Inga egnagjorde reaktioner hittades. + Inga custom reaktioner hittades. Fuzzy @@ -536,11 +536,11 @@ Anledning: {1} {0} flyttad från {1] till {2} - Meddelande Raderat i #{0} + Meddelande raderat i #{0} Fuzzy - Meddelande Uppdaterat i #{0} + Meddelande uppdaterat i #{0} Fuzzy @@ -561,19 +561,19 @@ Anledning: {1} Jag behöver **Administration** tillåtelse för att göra det där. - Nytt Meddelande + Ny meddelande Fuzzy - Nytt Smeknamn + Ny smeknamn Fuzzy - Nytt Ämne + Ny ämne Fuzzy - Smeknamn Ändrat + Smeknamn ändrat Fuzzy @@ -583,15 +583,15 @@ Anledning: {1} Ingen shard med den ID funnen - Gammalt Meddelande + Gammal meddelande Fuzzy - Gammalt Smeknamn + Gammal smeknamn Fuzzy - Gammalt Ämne + Gammal ämne Fuzzy @@ -601,7 +601,7 @@ Anledning: {1} Tillstånd för denna server har blivit återställt. - Aktiva Skydd + Aktiva skydd Fuzzy @@ -2342,7 +2342,7 @@ Medlemmar: {1} Meddelandet som triggrar den egengjorda reaktion med id {0} kommer bli - + Svar meddelande för custom reaktion med id {0} kommer inte att skickas som ett DM. @@ -2358,10 +2358,10 @@ Medlemmar: {1} Lista av aliaser - + Aktivering {0} har inte längre någon alias. - + Trigger {0} hade ingen alias. Kompetitiv speltid From 87514da13472042a2ae093e6eb6e1153bc044283 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:46 +0200 Subject: [PATCH 32/42] Update ResponseStrings.tr-TR.resx (POEditor.com) From 2623af5e658bfa88c30ea3bf86b8fc4120028996 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:48 +0200 Subject: [PATCH 33/42] Update ResponseStrings.it-IT.resx (POEditor.com) --- .../Resources/ResponseStrings.it-IT.resx | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx index 7a09ef5d..5a922057 100644 --- a/src/NadekoBot/Resources/ResponseStrings.it-IT.resx +++ b/src/NadekoBot/Resources/ResponseStrings.it-IT.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Quella base è già rivendicata o distrutta. From ccb90c7d154120797e96bd1fe70119390731a5b0 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:51 +0200 Subject: [PATCH 34/42] Update ResponseStrings.he-IL.resx (POEditor.com) --- .../Resources/ResponseStrings.he-IL.resx | 234 +++++++++--------- 1 file changed, 117 insertions(+), 117 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.he-IL.resx b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx index 5ddf049e..7f42401e 100644 --- a/src/NadekoBot/Resources/ResponseStrings.he-IL.resx +++ b/src/NadekoBot/Resources/ResponseStrings.he-IL.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 הבסיס הזה נתפס או נהרס. From ff74c861f45e50e60748f47b9282cfb3daedd486 Mon Sep 17 00:00:00 2001 From: Master Kwoth Date: Mon, 27 Mar 2017 14:45:53 +0200 Subject: [PATCH 35/42] Update ResponseStrings.ko-KR.resx (POEditor.com) --- .../Resources/ResponseStrings.ko-KR.resx | 236 +++++++++--------- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx index cf1c65d5..223b9397 100644 --- a/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx +++ b/src/NadekoBot/Resources/ResponseStrings.ko-KR.resx @@ -1,121 +1,121 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 기지가 이미 요청되었거나 파괴되었습니다. @@ -794,7 +794,7 @@ Fuzzy 텍스트 채널이 삭제되었습니다. - destroyed means deleted? + destroyed means deleted? 디스트로이드 뜻이 삭제됬다는 건가요? From 81aec75d066c2b7fe7b95c412645ac4629ecc803 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Mon, 27 Mar 2017 14:55:25 +0200 Subject: [PATCH 36/42] upped version --- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index 676d7407..ba0f5e37 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.25a"; + public const string BotVersion = "1.26"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From 1bf1dc90779f92f38657360e57fcf9627567be01 Mon Sep 17 00:00:00 2001 From: Hubcapp Date: Mon, 27 Mar 2017 08:26:11 -0500 Subject: [PATCH 37/42] Add more articles, mostly sourced from the ancient fortunes program for posix os's. Please review and reject any you find objectionable. I wasn't given any guidelines on how to pick these. I may add more after some feedback. --- src/NadekoBot/data/typing_articles.json | 272 ++++++++++++++++++++++++ 1 file changed, 272 insertions(+) diff --git a/src/NadekoBot/data/typing_articles.json b/src/NadekoBot/data/typing_articles.json index 9850103f..4666a5e7 100644 --- a/src/NadekoBot/data/typing_articles.json +++ b/src/NadekoBot/data/typing_articles.json @@ -262,4 +262,276 @@ { "Title":"A Dictionary of Psychology", "Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text." + }, + { + "Title":"darbian regarding how fast you can learn to speedrun" + "Text":"This depends on a number of factors. The answer will be very different for someone who doesn't have a lot of experience with videogames compared to someone who is already decent at retro platformers. In my case, it took about a year of playing on and off to get pretty competitive at the game, but there have been others who did it much faster. With some practice you can get a time that would really impress your friends after only a few days of practice." + }, + { + "Title":"Memes" + "Text":"The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start." + }, + { + "Title":"Literature quotes" + "Text":"A banker is a fellow who lends you his umbrella when the sun is shining and wants it back the minute it begins to rain. -- Mark Twain" + }, + { + "Title":"Literature quotes" + "Text":"A classic is something that everyone wants to have read and nobody wants to read. -- Mark Twain" + }, + { + "Title":"Literature quotes" + "Text":"After all, all he did was string together a lot of old, well-known quotations. -- H. L. Mencken, on Shakespeare" + }, + { + "Title":"Literature quotes" + "Text":"All generalizations are false, including this one. -- Mark Twain" + }, + { + "Title":"Literature quotes" + "Text":"All I know is what the words know, and dead things, and that makes a handsome little sum, with a beginning and a middle and an end, as in the well-built phrase and the long sonata of the dead. -- Samuel Beckett" + }, + { + "Title":"Literature quotes" + "Text":"All say, \"How hard it is that we have to die\" -- a strange complaint to come from the mouths of people who have had to live. -- Mark Twain" + }, + { + "Title":"Literature quotes" + "Text":"At once it struck me what quality went to form a man of achievement, especially in literature, and which Shakespeare possessed so enormously -- I mean negative capability, that is, when a man is capable of being in uncertainties, mysteries, doubts, without any irritable reaching after fact and reason. -- John Keats" + }, + { + "Title":"Pat Cadigan, \"Mindplayers\"" + "Text":"A morgue is a morgue is a morgue. They can paint the walls with aggressively cheerful primary colors and splashy bold graphics, but it's still a holding place for the dead until they can be parted out to organ banks. Not that I would have cared normally but my viewpoint was skewed. The relentless pleasance of the room I sat in seemed only grotesque." + }, + { + "Title":"Men & Women" + "Text":"A diplomatic husband said to his wife, \"How do you expect me to remember your birthday when you never look any older?\"" + }, + { + "Title":"James L. Collymore, \"Perfect Woman\"" + "Text":"I began many years ago, as so many young men do, in searching for the perfect woman. I believed that if I looked long enough, and hard enough, I would find her and then I would be secure for life. Well, the years and romances came and went, and I eventually ended up settling for someone a lot less than my idea of perfection. But one day, after many years together, I lay there on our bed recovering from a slight illness. My wife was sitting on a chair next to the bed, humming softly and watching the late afternoon sun filtering through the trees. The only sounds to be heard elsewhere were the clock ticking, the kettle downstairs starting to boil, and an occasional schoolchild passing beneath our window. And as I looked up into my wife's now wrinkled face, but still warm and twinkling eyes, I realized something about perfection... It comes only with time." + }, + { + "Title":"Famous quotes" + "Text":"I have now come to the conclusion never again to think of marrying, and for this reason: I can never be satisfied with anyone who would be blockhead enough to have me. -- Abraham Lincoln" + }, + { + "Title":"Men & Women" + "Text":"In the midst of one of the wildest parties he'd ever been to, the young man noticed a very prim and pretty girl sitting quietly apart from the rest of the revelers. Approaching her, he introduced himself and, after some quiet conversation, said, \"I'm afraid you and I don't really fit in with this jaded group. Why don't I take you home?\" \"Fine,\" said the girl, smiling up at him demurely. \"Where do you live?\"" + }, + { + "Title":"Encyclopadia Apocryphia, 1990 ed." + "Text":"There is no realizable power that man cannot, in time, fashion the tools to attain, nor any power so secure that the naked ape will not abuse it. So it is written in the genetic cards -- only physics and war hold him in check. And also the wife who wants him home by five, of course." + }, + { + "Title":"Susan Gordon" + "Text":"What publishers are looking for these days isn't radical feminism. It's corporate feminism -- a brand of feminism designed to sell books and magazines, three-piece suits, airline tickets, Scotch, cigarettes and, most important, corporate America's message, which runs: Yes, women were discriminated against in the past, but that unfortunate mistake has been remedied; now every woman can attain wealth, prestige and power by dint of individual rather than collective effort." + }, + { + "Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"" + "Text":"When my freshman roommate at Cornell found out I was Jewish, she was, at her request, moved to a different room. She told me she didn't think she had ever seen a Jew before. My only response was to begin wearing a small Star of David on a chain around my neck. I had not become a more observing Jew; rather, discovering that the label of Jew was offensive to others made me want to let people know who I was and what I believed in. Similarly, after talking to these young women -- one of whom told me that she didn't think she had ever met a feminist -- I've taken to identifying myself as a feminist in the most unlikely of situations." + }, + { + "Title":"Medicine" + "Text":"Never die while in your doctor's prescence or under his direct care. This will only cause him needless inconvenience and embarassment." + }, + { + "Title":"Medicine" + "Text":"Human cardiac catheterization was introduced by Werner Forssman in 1929. Ignoring his department chief, and tying his assistant to an operating table to prevent her interference, he placed a ureteral catheter into a vein in his arm, advanced it to the right atrium [of his heart], and walked upstairs to the x-ray department where he took the confirmatory x-ray film. In 1956, Dr. Forssman was awarded the Nobel Prize." + }, + { + "Title":"The C Programming Language" + "Text":"In Chapter 3 we presented a Shell sort function that would sort an array of integers, and in Chapter 4 we improved on it with a quicksort. The same algorithms will work, except that now we have to deal with lines of text, which are of different lengths, and which, unlike integers, can't be compared or moved in a single operation." + }, + { + "Title":"Religious Texts" + "Text":"O ye who believe! Avoid suspicion as much (as possible): for suspicion in some cases in a sin: And spy not on each other behind their backs. Quran 49:12" + }, + { + "Title":"Religious Texts" + "Text":"If you want to destroy any nation without war, make adultery & nudity common in the next generation. -- Salahuddin Ayyubi" + }, + { + "Title":"Religious Texts" + "Text":"Whoever recommends and helps a good cause becomes a partner therein, and whoever recommends and helps an evil cause shares in its burdens. Quran 4:85" + }, + { + "Title":"Religious Texts" + "Text":"No servant can serve two masters. Either he will hate the one and love the other, or he will be devoted to the one and despise the other. You cannot serve both God and Money. Luke 16:13" + }, + { + "Title":"Religious Texts" + "Text":"So we do not lose heart. Though our outer man is wasting away, our inner self is being renewed day by day. For this light momentary affliction is preparing for us an eternal weight of glory beyond all comparison, as we look not to the things that are seen but to the things that are unseen. For the things that are seen are transient, but the things that are unseen are eternal. 2 Corinthians 4:16-18" + }, + { + "Title":"Religious Texts" + "Text":"And out of that hopeless attempt has come nearly all that we call human history -- money, poverty, ambition, war, prostitution, classes, empires, slavery -- the long terrible story of man trying to find something other than God which will make him happy. -- C.S. Lewis" + }, + { + "Title":"Medicine" + "Text":"Your digestive system is your body's Fun House, whereby food goes on a long, dark, scary ride, taking all kinds of unexpected twists and turns, being attacked by vicious secretions along the way, and not knowing until the last minute whether it will be turned into a useful body part or ejected into the Dark Hole by Mister Sphincter. We Americans live in a nation where the medical-care system is second to none in the world, unless you count maybe 25 or 30 little scuzzball countries like Scotland that we could vaporize in seconds if we felt like it. -- Dave Barry" + }, + { + "Title":"Medicine" + "Text":"The trouble with heart disease is that the first symptom is often hard to deal with: death. -- Michael Phelps" + }, + { + "Title":"Medicine" + "Text":"Never go to a doctor whose office plants have died -- Erma Bombeck" + }, + { + "Title":"Science" + "Text":"Albert Einstein, when asked to describe radio, replied: \"You see, wire telegraph is a kind of a very, very long cat. You pull his tail in NewYork and his head is meowing in Los Angeles. Do you understand this? And radio operates exactly the same way: you send signals here, they receive them there. The only difference is that there is no cat.\"" + }, + { + "Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"" + "Text":"At the heart of science is an essential tension between two seemingly contradictory attitudes -- an openness to new ideas, no matter how bizarre or counterintuitive they may be, and the most ruthless skeptical scrutiny of all ideas, old and new. This is how deep truths are winnowed from deep nonsense. Of course, scientists make mistakes in trying to understand the world, but there is a built-in error-correcting mechanism: The collective enterprise of creative thinking and skeptical thinking together keeps the field on track." + }, + { + "Title":"#Octalthorpe" + "Text":"Back in the early 60's, touch tone phones only had 10 buttons. Some military versions had 16, while the 12 button jobs were used only by people who had \"diva\" (digital inquiry, voice answerback) systems -- mainly banks. Since in those days, only Western Electric made \"data sets\" (modems) the problems of terminology were all Bell System. We used to struggle with written descriptions of dial pads that were unfamiliar to most people (most phones were rotary then.) Partly in jest, some AT&T engineering types (there was no marketing in the good old days, which is why they were the good old days) made up the term \"octalthorpe\" (note spelling) to denote the \"pound sign.\" Presumably because it has 8 points sticking out. It never really caught on." + }, + { + "Title":"Science -- Edgar R. Fiedler" + "Text":"Economists state their GDP growth projections to the nearest tenth of a percentage point to prove they have a sense of humor." + }, + { + "Title":"Science -- R. Buckminster Fuller" + "Text":"Everything you've learned in school as \"obvious\" becomes less and less obvious as you begin to study the universe. For example, there are no solids in the universe. There's not even a suggestion of a solid. There are no absolute continuums. There are no surfaces. There are no straight lines." + }, + { + "Title":"Math" + "Text":"Factorials were someone's attempt to make math LOOK exciting." + }, + { + "Title":"Science -- Thomas L. Creed" + "Text":"Fortunately, the responsibility for providing evidence is on the part of the person making the claim, not the critic. It is not the responsibility of UFO skeptics to prove that a UFO has never existed, nor is it the responsibility of paranormal-health-claims skeptics to prove that crystals or colored lights never healed anyone. The skeptic's role is to point out claims that are not adequately supported by acceptable evidcence and to provide plausible alternative explanations that are more in keeping with the accepted body of scientific evidence." + }, + { + "Title":"Science -- H. L. Mencken, 1930" + "Text":"There is, in fact, no reason to believe that any given natural phenomenon, however marvelous it may seem today, will remain forever inexplicable. Soon or late the laws governing the production of life itself will be discovered in the laboratory, and man may set up business as a creator on his own account. The thing, indeed, is not only conceivable; it is even highly probable." + }, + { + "Title":"Science" + "Text":"When Alexander Graham Bell died in 1922, the telephone people interrupted service for one minute in his honor. They've been honoring him intermittently ever since, I believe." + }, + { + "Title":"Science -- Stanislaw Lem" + "Text":"When the Universe was not so out of whack as it is today, and all the stars were lined up in their proper places, you could easily count them from left to right, or top to bottom, and the larger and bluer ones were set apart, and the smaller yellowing types pushed off to the corners as bodies of a lower grade..." + }, + { + "Title":"Science -- Dave Barry" + "Text":"You should not use your fireplace, because scientists now believe that, contrary to popular opinion, fireplaces actually remove heat from houses. Really, that's what scientists believe. In fact many scientists actually use their fireplaces to cool their houses in the summer. If you visit a scientist's house on a sultry August day, you'll find a cheerful fire roaring on the hearth and the scientist sitting nearby, remarking on how cool he is and drinking heavily." + }, + { + "Title":"Sports" + "Text":"Although golf was originally restricted to wealthy, overweight Protestants, today it's open to anybody who owns hideous clothing. -- Dave Barry" + }, + { + "Title":"Sports" + "Text":"Now there's three things you can do in a baseball game: you can win, you can lose, or it can rain. -- Casey Stengel" + }, + { + "Title":"Sports" + "Text":"Once there was this conductor see, who had a bass problem. You see, during a portion of Beethovan's Ninth Symphony in which there are no bass violin parts, one of the bassists always passed a bottle of scotch around. So, to remind himself that the basses usually required an extra cue towards the end of the symphony, the conductor would fasten a piece of string around the page of the score before the bass cue. As the basses grew more and more inebriated, two of them fell asleep. The conductor grew quite nervous (he was very concerned about the pitch) because it was the bottom of the ninth; the score was tied and the basses were loaded with two out." + }, + { + "Title":"Sports" + "Text":"When I'm gone, boxing will be nothing again. The fans with the cigars and the hats turned down'll be there, but no more housewives and little men in the street and foreign presidents. It's goin' to be back to the fighter who comes to town, smells a flower, visits a hospital, blows a horn and says he's in shape. Old hat. I was the onliest boxer in history people asked questions like a senator. -- Muhammad Ali" + }, + { + "Title":"Sports" + "Text":"The surest way to remain a winner is to win once, and then not play any more." + }, + { + "Title":"Sports" + "Text":"The real problem with hunting elephants is carrying the decoys" + }, + { + "Title":"Sports -- Dizzy Dean" + "Text":"The pitcher wound up and he flang the ball at the batter. The batter swang and missed. The pitcher flang the ball again and this time the batter connected. He hit a high fly right to the center fielder. The center fielder was all set to catch the ball, but at the last minute his eyes were blound by the sun and he dropped it." + }, + { + "Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium" + "Text":"The only real game in the world, I think, is baseball... You've got to start way down, at the bottom, when you're six or seven years old. You can't wait until you're fifteen or sixteen. You've got to let it grow up with you, and if you're successful and you try hard enough, you're bound to come out on top, just like these boys have come to the top now." + }, + { + "Title":"Sports" + "Text":"The one sure way to make a lazy man look respectable is to put a fishing rod in his hand." + }, + { + "Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"" + "Text":"No. That's it. The cool name, that is. We worked very hard on creating a name that would appeal to the majority of people, and it certainly paid off: thousands of people are using linux just to be able to say \"OS/2? Hah. I've got Linux. What a cool name\". 386BSD made the mistake of putting a lot of numbers and weird abbreviations into the name, and is scaring away a lot of people just because it sounds too technical." + }, + { + "Title":"Smart House" + "Text":"A teenager wins a fully automated dream house in a competition, but soon the computer controlling it begins to take over and everything gets out of control, then Ben the teenager calms down the computer named Pat and everything goes back to normal." + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"Writing non-free software is not an ethically legitimate activity, so if people who do this run into trouble, that's good! All businesses based on non-free software ought to fail, and the sooner the better. -- Richard Stallman" + }, + { + "Title":"Linux -- Jim Wright" + "Text":"You know, if Red Hat was smart, they'd have a fake front on their office building just for visitors, where you would board a magical trolley that took you past the smiling singing oompah loompahs who take the raw linux sugar and make it into Red Hat candy goodness. Then they could use it as a motivator for employees... Shape up, or you're spending time working \"the ride\"!" + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"Free software is software that gives you the user the freedom to share, study and modify it. We call this free software because the user is free." + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"To use free software is to make a political and ethical choice asserting the right to learn, and share what we learn with others. Free software has become the foundation of a learning society where we share our knowledge in a way that others can build upon and enjoy." + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"Currently, many people use proprietary software that denies users these freedoms and benefits. If we make a copy and give it to a friend, if we try to figure out how the program works, if we put a copy on more than one of our own computers in our own home, we could be caught and fined or put in jail. That's what's in the fine print of the license agreement you accept when using proprietary software." + }, + { + "Title":"True Words of a Genius Philosopher" + "Text":"The corporations behind proprietary software will often spy on your activities and restrict you from sharing with others. And because our computers control much of our personal information and daily activities, proprietary software represents an unacceptable danger to a free society." + }, + { + "Title":"Politics -- Donald Trump" + "Text":"When Mexico sends its people, they're not sending their best. They're not sending you. They're sending people that have lots of problems, and they're bringing those problems with us. They're bringing drugs. They're bringing crime. Their rapists. And some, I assume, are good people." + }, + { + "Title":"Politics -- Sir Winston Churchill, 1952" + "Text":"A prisoner of war is a man who tries to kill you and fails, and then asks you not to kill him." + }, + { + "Title":"Politics -- Johnny Hart" + "Text":"Cutting the space budget really restores my faith in humanity. It eliminates dreams, goals, and ideals and lets us get straight to the business of hate, debauchery, and self-annihilation." + }, + { + "Title":"Politics -- Winston Churchill" + "Text":"Democracy is the worst form of government except all those other forms that have been tried from time to time." + }, + { + "Title":"Politics" + "Text":"Each person has the right to take part in the management of public affairs in his country, provided he has prior experience, a will to succeed, a university degree, influential parents, good looks, a curriculum vitae, two 3x4 snapshots, and a good tax record." + }, + { + "Title":"Politics -- A Yippie Proverb" + "Text":"Free Speech Is The Right To Shout 'Theater' In A Crowded Fire." + }, + { + "Title":"Politics -- Boss Tweed" + "Text":"I don't care who does the electing as long as I get to do the nominating." + }, + { + "Title":"Politics -- Francis Bellamy, 1892" + "Text":"I pledge allegiance to the flag of the United States of America and to the republic for which it stands, one nation, indivisible, with liberty and justice for all." + }, + { + "Title":"Politics -- Napoleon" + "Text":"It follows that any commander in chief who undertakes to carry out a plan which he considers defective is at fault; he must put forth his reasons, insist of the plan being changed, and finally tender his resignation rather than be the instrument of his army's downfall." + }, + { + "Title":"Politics" + "Text":"Only two kinds of witnesses exist. The first live in a neighborhood where a crime has been committed and in no circumstances have ever seen anything or even heard a shot. The second category are the neighbors of anyone who happens to be accused of the crime. These have always looked out of their windows when the shot was fired, and have noticed the accused person standing peacefully on his balcony a few yards away." + }, + { + "Title":"Politics -- Frederick Douglass" + "Text":"Slaves are generally expected to sing as well as to work ... I did not, when a slave, understand the deep meanings of those rude, and apparently incoherent songs. I was myself within the circle, so that I neither saw nor heard as those without might see and hear. They told a tale which was then altogether beyond my feeble comprehension: they were tones, loud, long and deep, breathing the prayer and complaint of souls boiling over with the bitterest anguish. Every tone was a testimony against slavery, and a prayer to God for deliverance from chains." }] From 13d6775b2f1d2f265ba45dde752b1cb29a660eef Mon Sep 17 00:00:00 2001 From: Hubcapp Date: Mon, 27 Mar 2017 08:45:58 -0500 Subject: [PATCH 38/42] I think you'll need these. --- src/NadekoBot/data/typing_articles.json | 136 ++++++++++++------------ 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/src/NadekoBot/data/typing_articles.json b/src/NadekoBot/data/typing_articles.json index 4666a5e7..054573a0 100644 --- a/src/NadekoBot/data/typing_articles.json +++ b/src/NadekoBot/data/typing_articles.json @@ -264,274 +264,274 @@ "Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text." }, { - "Title":"darbian regarding how fast you can learn to speedrun" + "Title":"darbian regarding how fast you can learn to speedrun", "Text":"This depends on a number of factors. The answer will be very different for someone who doesn't have a lot of experience with videogames compared to someone who is already decent at retro platformers. In my case, it took about a year of playing on and off to get pretty competitive at the game, but there have been others who did it much faster. With some practice you can get a time that would really impress your friends after only a few days of practice." }, { - "Title":"Memes" + "Title":"Memes", "Text":"The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start." }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"A banker is a fellow who lends you his umbrella when the sun is shining and wants it back the minute it begins to rain. -- Mark Twain" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"A classic is something that everyone wants to have read and nobody wants to read. -- Mark Twain" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"After all, all he did was string together a lot of old, well-known quotations. -- H. L. Mencken, on Shakespeare" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"All generalizations are false, including this one. -- Mark Twain" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"All I know is what the words know, and dead things, and that makes a handsome little sum, with a beginning and a middle and an end, as in the well-built phrase and the long sonata of the dead. -- Samuel Beckett" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"All say, \"How hard it is that we have to die\" -- a strange complaint to come from the mouths of people who have had to live. -- Mark Twain" }, { - "Title":"Literature quotes" + "Title":"Literature quotes", "Text":"At once it struck me what quality went to form a man of achievement, especially in literature, and which Shakespeare possessed so enormously -- I mean negative capability, that is, when a man is capable of being in uncertainties, mysteries, doubts, without any irritable reaching after fact and reason. -- John Keats" }, { - "Title":"Pat Cadigan, \"Mindplayers\"" + "Title":"Pat Cadigan, \"Mindplayers\"", "Text":"A morgue is a morgue is a morgue. They can paint the walls with aggressively cheerful primary colors and splashy bold graphics, but it's still a holding place for the dead until they can be parted out to organ banks. Not that I would have cared normally but my viewpoint was skewed. The relentless pleasance of the room I sat in seemed only grotesque." }, { - "Title":"Men & Women" + "Title":"Men & Women", "Text":"A diplomatic husband said to his wife, \"How do you expect me to remember your birthday when you never look any older?\"" }, { - "Title":"James L. Collymore, \"Perfect Woman\"" + "Title":"James L. Collymore, \"Perfect Woman\"", "Text":"I began many years ago, as so many young men do, in searching for the perfect woman. I believed that if I looked long enough, and hard enough, I would find her and then I would be secure for life. Well, the years and romances came and went, and I eventually ended up settling for someone a lot less than my idea of perfection. But one day, after many years together, I lay there on our bed recovering from a slight illness. My wife was sitting on a chair next to the bed, humming softly and watching the late afternoon sun filtering through the trees. The only sounds to be heard elsewhere were the clock ticking, the kettle downstairs starting to boil, and an occasional schoolchild passing beneath our window. And as I looked up into my wife's now wrinkled face, but still warm and twinkling eyes, I realized something about perfection... It comes only with time." }, { - "Title":"Famous quotes" + "Title":"Famous quotes", "Text":"I have now come to the conclusion never again to think of marrying, and for this reason: I can never be satisfied with anyone who would be blockhead enough to have me. -- Abraham Lincoln" }, { - "Title":"Men & Women" + "Title":"Men & Women", "Text":"In the midst of one of the wildest parties he'd ever been to, the young man noticed a very prim and pretty girl sitting quietly apart from the rest of the revelers. Approaching her, he introduced himself and, after some quiet conversation, said, \"I'm afraid you and I don't really fit in with this jaded group. Why don't I take you home?\" \"Fine,\" said the girl, smiling up at him demurely. \"Where do you live?\"" }, { - "Title":"Encyclopadia Apocryphia, 1990 ed." + "Title":"Encyclopadia Apocryphia, 1990 ed.", "Text":"There is no realizable power that man cannot, in time, fashion the tools to attain, nor any power so secure that the naked ape will not abuse it. So it is written in the genetic cards -- only physics and war hold him in check. And also the wife who wants him home by five, of course." }, { - "Title":"Susan Gordon" + "Title":"Susan Gordon", "Text":"What publishers are looking for these days isn't radical feminism. It's corporate feminism -- a brand of feminism designed to sell books and magazines, three-piece suits, airline tickets, Scotch, cigarettes and, most important, corporate America's message, which runs: Yes, women were discriminated against in the past, but that unfortunate mistake has been remedied; now every woman can attain wealth, prestige and power by dint of individual rather than collective effort." }, { - "Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"" + "Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"", "Text":"When my freshman roommate at Cornell found out I was Jewish, she was, at her request, moved to a different room. She told me she didn't think she had ever seen a Jew before. My only response was to begin wearing a small Star of David on a chain around my neck. I had not become a more observing Jew; rather, discovering that the label of Jew was offensive to others made me want to let people know who I was and what I believed in. Similarly, after talking to these young women -- one of whom told me that she didn't think she had ever met a feminist -- I've taken to identifying myself as a feminist in the most unlikely of situations." }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"Never die while in your doctor's prescence or under his direct care. This will only cause him needless inconvenience and embarassment." }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"Human cardiac catheterization was introduced by Werner Forssman in 1929. Ignoring his department chief, and tying his assistant to an operating table to prevent her interference, he placed a ureteral catheter into a vein in his arm, advanced it to the right atrium [of his heart], and walked upstairs to the x-ray department where he took the confirmatory x-ray film. In 1956, Dr. Forssman was awarded the Nobel Prize." }, { - "Title":"The C Programming Language" + "Title":"The C Programming Language", "Text":"In Chapter 3 we presented a Shell sort function that would sort an array of integers, and in Chapter 4 we improved on it with a quicksort. The same algorithms will work, except that now we have to deal with lines of text, which are of different lengths, and which, unlike integers, can't be compared or moved in a single operation." }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"O ye who believe! Avoid suspicion as much (as possible): for suspicion in some cases in a sin: And spy not on each other behind their backs. Quran 49:12" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"If you want to destroy any nation without war, make adultery & nudity common in the next generation. -- Salahuddin Ayyubi" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"Whoever recommends and helps a good cause becomes a partner therein, and whoever recommends and helps an evil cause shares in its burdens. Quran 4:85" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"No servant can serve two masters. Either he will hate the one and love the other, or he will be devoted to the one and despise the other. You cannot serve both God and Money. Luke 16:13" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"So we do not lose heart. Though our outer man is wasting away, our inner self is being renewed day by day. For this light momentary affliction is preparing for us an eternal weight of glory beyond all comparison, as we look not to the things that are seen but to the things that are unseen. For the things that are seen are transient, but the things that are unseen are eternal. 2 Corinthians 4:16-18" }, { - "Title":"Religious Texts" + "Title":"Religious Texts", "Text":"And out of that hopeless attempt has come nearly all that we call human history -- money, poverty, ambition, war, prostitution, classes, empires, slavery -- the long terrible story of man trying to find something other than God which will make him happy. -- C.S. Lewis" }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"Your digestive system is your body's Fun House, whereby food goes on a long, dark, scary ride, taking all kinds of unexpected twists and turns, being attacked by vicious secretions along the way, and not knowing until the last minute whether it will be turned into a useful body part or ejected into the Dark Hole by Mister Sphincter. We Americans live in a nation where the medical-care system is second to none in the world, unless you count maybe 25 or 30 little scuzzball countries like Scotland that we could vaporize in seconds if we felt like it. -- Dave Barry" }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"The trouble with heart disease is that the first symptom is often hard to deal with: death. -- Michael Phelps" }, { - "Title":"Medicine" + "Title":"Medicine", "Text":"Never go to a doctor whose office plants have died -- Erma Bombeck" }, { - "Title":"Science" + "Title":"Science", "Text":"Albert Einstein, when asked to describe radio, replied: \"You see, wire telegraph is a kind of a very, very long cat. You pull his tail in NewYork and his head is meowing in Los Angeles. Do you understand this? And radio operates exactly the same way: you send signals here, they receive them there. The only difference is that there is no cat.\"" }, { - "Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"" + "Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"", "Text":"At the heart of science is an essential tension between two seemingly contradictory attitudes -- an openness to new ideas, no matter how bizarre or counterintuitive they may be, and the most ruthless skeptical scrutiny of all ideas, old and new. This is how deep truths are winnowed from deep nonsense. Of course, scientists make mistakes in trying to understand the world, but there is a built-in error-correcting mechanism: The collective enterprise of creative thinking and skeptical thinking together keeps the field on track." }, { - "Title":"#Octalthorpe" + "Title":"#Octalthorpe", "Text":"Back in the early 60's, touch tone phones only had 10 buttons. Some military versions had 16, while the 12 button jobs were used only by people who had \"diva\" (digital inquiry, voice answerback) systems -- mainly banks. Since in those days, only Western Electric made \"data sets\" (modems) the problems of terminology were all Bell System. We used to struggle with written descriptions of dial pads that were unfamiliar to most people (most phones were rotary then.) Partly in jest, some AT&T engineering types (there was no marketing in the good old days, which is why they were the good old days) made up the term \"octalthorpe\" (note spelling) to denote the \"pound sign.\" Presumably because it has 8 points sticking out. It never really caught on." }, { - "Title":"Science -- Edgar R. Fiedler" + "Title":"Science -- Edgar R. Fiedler", "Text":"Economists state their GDP growth projections to the nearest tenth of a percentage point to prove they have a sense of humor." }, { - "Title":"Science -- R. Buckminster Fuller" + "Title":"Science -- R. Buckminster Fuller", "Text":"Everything you've learned in school as \"obvious\" becomes less and less obvious as you begin to study the universe. For example, there are no solids in the universe. There's not even a suggestion of a solid. There are no absolute continuums. There are no surfaces. There are no straight lines." }, { - "Title":"Math" + "Title":"Math", "Text":"Factorials were someone's attempt to make math LOOK exciting." }, { - "Title":"Science -- Thomas L. Creed" + "Title":"Science -- Thomas L. Creed", "Text":"Fortunately, the responsibility for providing evidence is on the part of the person making the claim, not the critic. It is not the responsibility of UFO skeptics to prove that a UFO has never existed, nor is it the responsibility of paranormal-health-claims skeptics to prove that crystals or colored lights never healed anyone. The skeptic's role is to point out claims that are not adequately supported by acceptable evidcence and to provide plausible alternative explanations that are more in keeping with the accepted body of scientific evidence." }, { - "Title":"Science -- H. L. Mencken, 1930" + "Title":"Science -- H. L. Mencken, 1930", "Text":"There is, in fact, no reason to believe that any given natural phenomenon, however marvelous it may seem today, will remain forever inexplicable. Soon or late the laws governing the production of life itself will be discovered in the laboratory, and man may set up business as a creator on his own account. The thing, indeed, is not only conceivable; it is even highly probable." }, { - "Title":"Science" + "Title":"Science", "Text":"When Alexander Graham Bell died in 1922, the telephone people interrupted service for one minute in his honor. They've been honoring him intermittently ever since, I believe." }, { - "Title":"Science -- Stanislaw Lem" + "Title":"Science -- Stanislaw Lem", "Text":"When the Universe was not so out of whack as it is today, and all the stars were lined up in their proper places, you could easily count them from left to right, or top to bottom, and the larger and bluer ones were set apart, and the smaller yellowing types pushed off to the corners as bodies of a lower grade..." }, { - "Title":"Science -- Dave Barry" + "Title":"Science -- Dave Barry", "Text":"You should not use your fireplace, because scientists now believe that, contrary to popular opinion, fireplaces actually remove heat from houses. Really, that's what scientists believe. In fact many scientists actually use their fireplaces to cool their houses in the summer. If you visit a scientist's house on a sultry August day, you'll find a cheerful fire roaring on the hearth and the scientist sitting nearby, remarking on how cool he is and drinking heavily." }, { - "Title":"Sports" + "Title":"Sports", "Text":"Although golf was originally restricted to wealthy, overweight Protestants, today it's open to anybody who owns hideous clothing. -- Dave Barry" }, { - "Title":"Sports" + "Title":"Sports", "Text":"Now there's three things you can do in a baseball game: you can win, you can lose, or it can rain. -- Casey Stengel" }, { - "Title":"Sports" + "Title":"Sports", "Text":"Once there was this conductor see, who had a bass problem. You see, during a portion of Beethovan's Ninth Symphony in which there are no bass violin parts, one of the bassists always passed a bottle of scotch around. So, to remind himself that the basses usually required an extra cue towards the end of the symphony, the conductor would fasten a piece of string around the page of the score before the bass cue. As the basses grew more and more inebriated, two of them fell asleep. The conductor grew quite nervous (he was very concerned about the pitch) because it was the bottom of the ninth; the score was tied and the basses were loaded with two out." }, { - "Title":"Sports" + "Title":"Sports", "Text":"When I'm gone, boxing will be nothing again. The fans with the cigars and the hats turned down'll be there, but no more housewives and little men in the street and foreign presidents. It's goin' to be back to the fighter who comes to town, smells a flower, visits a hospital, blows a horn and says he's in shape. Old hat. I was the onliest boxer in history people asked questions like a senator. -- Muhammad Ali" }, { - "Title":"Sports" + "Title":"Sports", "Text":"The surest way to remain a winner is to win once, and then not play any more." }, { - "Title":"Sports" + "Title":"Sports", "Text":"The real problem with hunting elephants is carrying the decoys" }, { - "Title":"Sports -- Dizzy Dean" + "Title":"Sports -- Dizzy Dean", "Text":"The pitcher wound up and he flang the ball at the batter. The batter swang and missed. The pitcher flang the ball again and this time the batter connected. He hit a high fly right to the center fielder. The center fielder was all set to catch the ball, but at the last minute his eyes were blound by the sun and he dropped it." }, { - "Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium" + "Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium", "Text":"The only real game in the world, I think, is baseball... You've got to start way down, at the bottom, when you're six or seven years old. You can't wait until you're fifteen or sixteen. You've got to let it grow up with you, and if you're successful and you try hard enough, you're bound to come out on top, just like these boys have come to the top now." }, { - "Title":"Sports" + "Title":"Sports", "Text":"The one sure way to make a lazy man look respectable is to put a fishing rod in his hand." }, { - "Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"" + "Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"", "Text":"No. That's it. The cool name, that is. We worked very hard on creating a name that would appeal to the majority of people, and it certainly paid off: thousands of people are using linux just to be able to say \"OS/2? Hah. I've got Linux. What a cool name\". 386BSD made the mistake of putting a lot of numbers and weird abbreviations into the name, and is scaring away a lot of people just because it sounds too technical." }, { - "Title":"Smart House" + "Title":"Smart House", "Text":"A teenager wins a fully automated dream house in a competition, but soon the computer controlling it begins to take over and everything gets out of control, then Ben the teenager calms down the computer named Pat and everything goes back to normal." }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"Writing non-free software is not an ethically legitimate activity, so if people who do this run into trouble, that's good! All businesses based on non-free software ought to fail, and the sooner the better. -- Richard Stallman" }, { - "Title":"Linux -- Jim Wright" + "Title":"Linux -- Jim Wright", "Text":"You know, if Red Hat was smart, they'd have a fake front on their office building just for visitors, where you would board a magical trolley that took you past the smiling singing oompah loompahs who take the raw linux sugar and make it into Red Hat candy goodness. Then they could use it as a motivator for employees... Shape up, or you're spending time working \"the ride\"!" }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"Free software is software that gives you the user the freedom to share, study and modify it. We call this free software because the user is free." }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"To use free software is to make a political and ethical choice asserting the right to learn, and share what we learn with others. Free software has become the foundation of a learning society where we share our knowledge in a way that others can build upon and enjoy." }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"Currently, many people use proprietary software that denies users these freedoms and benefits. If we make a copy and give it to a friend, if we try to figure out how the program works, if we put a copy on more than one of our own computers in our own home, we could be caught and fined or put in jail. That's what's in the fine print of the license agreement you accept when using proprietary software." }, { - "Title":"True Words of a Genius Philosopher" + "Title":"True Words of a Genius Philosopher", "Text":"The corporations behind proprietary software will often spy on your activities and restrict you from sharing with others. And because our computers control much of our personal information and daily activities, proprietary software represents an unacceptable danger to a free society." }, { - "Title":"Politics -- Donald Trump" + "Title":"Politics -- Donald Trump", "Text":"When Mexico sends its people, they're not sending their best. They're not sending you. They're sending people that have lots of problems, and they're bringing those problems with us. They're bringing drugs. They're bringing crime. Their rapists. And some, I assume, are good people." }, { - "Title":"Politics -- Sir Winston Churchill, 1952" + "Title":"Politics -- Sir Winston Churchill, 1952", "Text":"A prisoner of war is a man who tries to kill you and fails, and then asks you not to kill him." }, { - "Title":"Politics -- Johnny Hart" + "Title":"Politics -- Johnny Hart", "Text":"Cutting the space budget really restores my faith in humanity. It eliminates dreams, goals, and ideals and lets us get straight to the business of hate, debauchery, and self-annihilation." }, { - "Title":"Politics -- Winston Churchill" + "Title":"Politics -- Winston Churchill", "Text":"Democracy is the worst form of government except all those other forms that have been tried from time to time." }, { - "Title":"Politics" + "Title":"Politics", "Text":"Each person has the right to take part in the management of public affairs in his country, provided he has prior experience, a will to succeed, a university degree, influential parents, good looks, a curriculum vitae, two 3x4 snapshots, and a good tax record." }, { - "Title":"Politics -- A Yippie Proverb" + "Title":"Politics -- A Yippie Proverb", "Text":"Free Speech Is The Right To Shout 'Theater' In A Crowded Fire." }, { - "Title":"Politics -- Boss Tweed" + "Title":"Politics -- Boss Tweed", "Text":"I don't care who does the electing as long as I get to do the nominating." }, { - "Title":"Politics -- Francis Bellamy, 1892" + "Title":"Politics -- Francis Bellamy, 1892", "Text":"I pledge allegiance to the flag of the United States of America and to the republic for which it stands, one nation, indivisible, with liberty and justice for all." }, { - "Title":"Politics -- Napoleon" + "Title":"Politics -- Napoleon", "Text":"It follows that any commander in chief who undertakes to carry out a plan which he considers defective is at fault; he must put forth his reasons, insist of the plan being changed, and finally tender his resignation rather than be the instrument of his army's downfall." }, { - "Title":"Politics" + "Title":"Politics", "Text":"Only two kinds of witnesses exist. The first live in a neighborhood where a crime has been committed and in no circumstances have ever seen anything or even heard a shot. The second category are the neighbors of anyone who happens to be accused of the crime. These have always looked out of their windows when the shot was fired, and have noticed the accused person standing peacefully on his balcony a few yards away." }, { - "Title":"Politics -- Frederick Douglass" + "Title":"Politics -- Frederick Douglass", "Text":"Slaves are generally expected to sing as well as to work ... I did not, when a slave, understand the deep meanings of those rude, and apparently incoherent songs. I was myself within the circle, so that I neither saw nor heard as those without might see and hear. They told a tale which was then altogether beyond my feeble comprehension: they were tones, loud, long and deep, breathing the prayer and complaint of souls boiling over with the bitterest anguish. Every tone was a testimony against slavery, and a prayer to God for deliverance from chains." }] From ec24ac38864b78faa6340bde78f29524667c4cbf Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Mar 2017 08:34:35 +0200 Subject: [PATCH 39/42] Added a big part of basic patreon stuff, but can't activate it yet, waiting for their email reply to check some things --- .../Utility/Commands/PatreonCommands.cs | 182 ++++++++++-------- .../Modules/Utility/Models/PatreonData.cs | 31 ++- .../Modules/Utility/Models/PatreonPledge.cs | 68 +++++++ .../Modules/Utility/Models/PatreonUser.cs | 70 +++++++ .../Database/Models/PatreonRewards.cs | 15 ++ 5 files changed, 271 insertions(+), 95 deletions(-) create mode 100644 src/NadekoBot/Modules/Utility/Models/PatreonPledge.cs create mode 100644 src/NadekoBot/Modules/Utility/Models/PatreonUser.cs create mode 100644 src/NadekoBot/Services/Database/Models/PatreonRewards.cs diff --git a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs index b347330f..c8908abe 100644 --- a/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/PatreonCommands.cs @@ -1,78 +1,110 @@ -using System.Collections.Generic; -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; -using Discord.Commands; -using Discord; -using NadekoBot.Attributes; -using NadekoBot.Modules.Utility.Models; -using Newtonsoft.Json; +//using System.Collections.Generic; +//using System.Linq; +//using System.Net.Http; +//using System.Threading.Tasks; +//using Discord.Commands; +//using NadekoBot.Attributes; +//using NadekoBot.Modules.Utility.Models; +//using Newtonsoft.Json; +//using System.Threading; +//using System; +//using System.Collections.Immutable; -namespace NadekoBot.Modules.Utility -{ - public partial class Utility - { - //[Group] - //public class PatreonCommands : NadekoSubmodule - //{ - // [NadekoCommand, Usage, Description, Aliases] - // [RequireContext(ContextType.Guild)] - // public async Task ClaimPatreonRewards([Remainder] string arg) - // { - // var pledges = await GetPledges2(); - // } +//namespace NadekoBot.Modules.Utility +//{ +// public partial class Utility +// { +// [Group] +// public class PatreonCommands : NadekoSubmodule +// { +// [NadekoCommand, Usage, Description, Aliases] +// public async Task ClaimPatreonRewards() +// { +// var patreon = PatreonThingy.Instance; - // private static async Task GetPledges() - // { - // var pledges = new List(); - // using (var http = new HttpClient()) - // { - // http.DefaultRequestHeaders.Clear(); - // http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); - // var data = new PatreonData() - // { - // Links = new Links() - // { - // Next = "https://api.patreon.com/oauth2/api/campaigns/334038/pledges" - // } - // }; - // do - // { - // var res = - // await http.GetStringAsync(data.Links.Next) - // .ConfigureAwait(false); - // data = JsonConvert.DeserializeObject(res); - // pledges.AddRange(data.Data); - // } while (!string.IsNullOrWhiteSpace(data.Links.Next)); - // } - // return pledges.Where(x => string.IsNullOrWhiteSpace(x.Attributes.declined_since)).ToArray(); - // } +// var pledges = (await patreon.GetPledges().ConfigureAwait(false)) +// .OrderByDescending(x => x.Reward.attributes.amount_cents); - // private static async Task GetPledges2() - // { - // var pledges = new List(); - // using (var http = new HttpClient()) - // { - // http.DefaultRequestHeaders.Clear(); - // http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); - // var data = new PatreonData() - // { - // Links = new Links() - // { - // Next = "https://api.patreon.com/oauth2/api/current_user/campaigns?include=pledges" - // } - // }; - // do - // { - // var res = - // await http.GetStringAsync(data.Links.Next) - // .ConfigureAwait(false); - // data = JsonConvert.DeserializeObject(res); - // pledges.AddRange(data.Data); - // } while (!string.IsNullOrWhiteSpace(data.Links.Next)); - // } - // return pledges.Where(x => string.IsNullOrWhiteSpace(x.Attributes.declined_since)).ToArray(); - // } - //} - } -} +// if (pledges == null) +// { +// await ReplyErrorLocalized("pledges_loading").ConfigureAwait(false); +// return; +// } + +// } +// } + +// public class PatreonThingy +// { +// public static PatreonThingy _instance = new PatreonThingy(); +// public static PatreonThingy Instance => _instance; + +// private readonly SemaphoreSlim getPledgesLocker = new SemaphoreSlim(1, 1); + +// private ImmutableArray pledges; + +// static PatreonThingy() { } + +// public async Task> GetPledges() +// { +// try +// { +// await LoadPledges().ConfigureAwait(false); +// return pledges; +// } +// catch (OperationCanceledException) +// { +// return pledges; +// } +// } + +// public async Task LoadPledges() +// { +// await getPledgesLocker.WaitAsync(1000).ConfigureAwait(false); +// try +// { +// var rewards = new List(); +// var users = new List(); +// using (var http = new HttpClient()) +// { +// http.DefaultRequestHeaders.Clear(); +// http.DefaultRequestHeaders.Add("Authorization", "Bearer " + NadekoBot.Credentials.PatreonAccessToken); +// var data = new PatreonData() +// { +// Links = new PatreonDataLinks() +// { +// next = "https://api.patreon.com/oauth2/api/campaigns/334038/pledges" +// } +// }; +// do +// { +// var res = await http.GetStringAsync(data.Links.next) +// .ConfigureAwait(false); +// data = JsonConvert.DeserializeObject(res); +// var pledgers = data.Data.Where(x => x["type"].ToString() == "pledge"); +// rewards.AddRange(pledgers.Select(x => JsonConvert.DeserializeObject(x.ToString())) +// .Where(x => x.attributes.declined_since == null)); +// users.AddRange(data.Included +// .Where(x => x["type"].ToString() == "user") +// .Select(x => JsonConvert.DeserializeObject(x.ToString()))); +// } while (!string.IsNullOrWhiteSpace(data.Links.next)); +// } +// pledges = rewards.Join(users, (r) => r.relationships?.patron?.data?.id, (u) => u.id, (x, y) => new PatreonUserAndReward() +// { +// User = y, +// Reward = x, +// }).ToImmutableArray(); +// } +// finally +// { +// var _ = Task.Run(async () => +// { +// await Task.Delay(TimeSpan.FromMinutes(5)).ConfigureAwait(false); +// getPledgesLocker.Release(); +// }); + +// } +// } +// } +// } +//} diff --git a/src/NadekoBot/Modules/Utility/Models/PatreonData.cs b/src/NadekoBot/Modules/Utility/Models/PatreonData.cs index 381666e8..87ab3f91 100644 --- a/src/NadekoBot/Modules/Utility/Models/PatreonData.cs +++ b/src/NadekoBot/Modules/Utility/Models/PatreonData.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json.Linq; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,32 +7,22 @@ using System.Threading.Tasks; namespace NadekoBot.Modules.Utility.Models { - public class PatreonData { - public Pledge[] Data { get; set; } - public Links Links { get; set; } + public JObject[] Included { get; set; } + public JObject[] Data { get; set; } + public PatreonDataLinks Links { get; set; } } - public class Attributes + public class PatreonDataLinks { - public int amount_cents { get; set; } - public string created_at { get; set; } - public string declined_since { get; set; } - public bool is_twitch_pledge { get; set; } - public bool patron_pays_fees { get; set; } - public int pledge_cap_cents { get; set; } + public string first { get; set; } + public string next { get; set; } } - public class Pledge + public class PatreonUserAndReward { - public Attributes Attributes { get; set; } - public int Id { get; set; } - } - - public class Links - { - public string First { get; set; } - public string Next { get; set; } + public PatreonUser User { get; set; } + public PatreonPledge Reward { get; set; } } } diff --git a/src/NadekoBot/Modules/Utility/Models/PatreonPledge.cs b/src/NadekoBot/Modules/Utility/Models/PatreonPledge.cs new file mode 100644 index 00000000..1ea3bd3a --- /dev/null +++ b/src/NadekoBot/Modules/Utility/Models/PatreonPledge.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Modules.Utility.Models +{ + public class Attributes + { + public int amount_cents { get; set; } + public string created_at { get; set; } + public object declined_since { get; set; } + public bool is_twitch_pledge { get; set; } + public bool patron_pays_fees { get; set; } + public int pledge_cap_cents { get; set; } + } + + public class Address + { + public object data { get; set; } + } + + public class Data + { + public string id { get; set; } + public string type { get; set; } + } + + public class Links + { + public string related { get; set; } + } + + public class Creator + { + public Data data { get; set; } + public Links links { get; set; } + } + + public class Patron + { + public Data data { get; set; } + public Links links { get; set; } + } + + public class Reward + { + public Data data { get; set; } + public Links links { get; set; } + } + + public class Relationships + { + public Address address { get; set; } + public Creator creator { get; set; } + public Patron patron { get; set; } + public Reward reward { get; set; } + } + + public class PatreonPledge + { + public Attributes attributes { get; set; } + public string id { get; set; } + public Relationships relationships { get; set; } + public string type { get; set; } + } +} diff --git a/src/NadekoBot/Modules/Utility/Models/PatreonUser.cs b/src/NadekoBot/Modules/Utility/Models/PatreonUser.cs new file mode 100644 index 00000000..353a493a --- /dev/null +++ b/src/NadekoBot/Modules/Utility/Models/PatreonUser.cs @@ -0,0 +1,70 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Modules.Utility.Models +{ + public class DiscordConnection + { + public string user_id { get; set; } + } + + public class SocialConnections + { + public object deviantart { get; set; } + public DiscordConnection discord { get; set; } + public object facebook { get; set; } + public object spotify { get; set; } + public object twitch { get; set; } + public object twitter { get; set; } + public object youtube { get; set; } + } + + public class UserAttributes + { + public string about { get; set; } + public string created { get; set; } + public object discord_id { get; set; } + public string email { get; set; } + public object facebook { get; set; } + public object facebook_id { get; set; } + public string first_name { get; set; } + public string full_name { get; set; } + public int gender { get; set; } + public bool has_password { get; set; } + public string image_url { get; set; } + public bool is_deleted { get; set; } + public bool is_nuked { get; set; } + public bool is_suspended { get; set; } + public string last_name { get; set; } + public SocialConnections social_connections { get; set; } + public int status { get; set; } + public string thumb_url { get; set; } + public object twitch { get; set; } + public string twitter { get; set; } + public string url { get; set; } + public string vanity { get; set; } + public object youtube { get; set; } + } + + public class Campaign + { + public Data data { get; set; } + public Links links { get; set; } + } + + public class UserRelationships + { + public Campaign campaign { get; set; } + } + + public class PatreonUser + { + public UserAttributes attributes { get; set; } + public string id { get; set; } + public UserRelationships relationships { get; set; } + public string type { get; set; } + } +} diff --git a/src/NadekoBot/Services/Database/Models/PatreonRewards.cs b/src/NadekoBot/Services/Database/Models/PatreonRewards.cs new file mode 100644 index 00000000..0e1532b3 --- /dev/null +++ b/src/NadekoBot/Services/Database/Models/PatreonRewards.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace NadekoBot.Services.Database.Models +{ + public class PatreonRewards : DbEntity + { + public ulong UserId { get; set; } + public ulong PledgeCents { get; set; } + public ulong Awarded { get; set; } + } +} From 1704f93218ecf7e40a953b42abc63456b878d606 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Mar 2017 10:55:45 +0200 Subject: [PATCH 40/42] Typing articles updated --- .../Games/Commands/SpeedTypingCommands.cs | 2 +- src/NadekoBot/data/typing_articles.json | 537 ------------------ src/NadekoBot/data/typing_articles2.json | 1 + 3 files changed, 2 insertions(+), 538 deletions(-) delete mode 100644 src/NadekoBot/data/typing_articles.json create mode 100644 src/NadekoBot/data/typing_articles2.json diff --git a/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs b/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs index 7dec0992..048aab0f 100644 --- a/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs +++ b/src/NadekoBot/Modules/Games/Commands/SpeedTypingCommands.cs @@ -151,7 +151,7 @@ namespace NadekoBot.Modules.Games { public static List TypingArticles { get; } = new List(); - private const string _typingArticlesPath = "data/typing_articles.json"; + private const string _typingArticlesPath = "data/typing_articles2.json"; static SpeedTypingCommands() { diff --git a/src/NadekoBot/data/typing_articles.json b/src/NadekoBot/data/typing_articles.json deleted file mode 100644 index 054573a0..00000000 --- a/src/NadekoBot/data/typing_articles.json +++ /dev/null @@ -1,537 +0,0 @@ -[ - { - "Title":"The Gender of Psychology", - "Text":"This book addresses the diversity of psychological knowledge and practice through the lens of gender." - }, - { - "Title":"Unto Others: The Evolution and Psychology of Unselfish", - "Text":"In Unto Others philosopher Elliott Sober and biologist David Sloan Wilson demonstrate once and for all that unselfish behavior is in fact an important feature of both biological and human nature." - }, - { - "Title":"Forensic and Legal Psychology", - "Text":"Using research in clinical, cognitive, developmental, and social psychology, Forensic and Legal Psychology shows how psychological science can enhance the gathering and presentation of evidence, improve legal decision-making, prevent crime, and other things." - }, - { - "Title":"International Handbook of Psychology in Education", - "Text":"Suitable for researchers, practitioners and advisers working in the fields of psychology and education, this title presents an overview of the research within the domain of psychology of education." - }, - { - "Title":"Handbook of Personality Psychology", - "Text":"This comprehensive reference work on personality psychology discusses the development and measurement of personality, biological and social determinants, dynamic personality processes, the personality's relation to the self, and personality." - }, - { - "Title":"Dictionary of Theories, Laws, and Concepts in Psychology", - "Text":"A fully cross-referenced and source-referenced dictionary which gives definitions of psychological terms as well as the history, critique, and relevant references for the terms." - }, - { - "Title":"Essays on Plato's Psychology", - "Text":"With a comprehensive introduction to the major issues of Plato's psychology and an up-to-date bibliography of work on the relevant issues, this much-needed text makes the study of Plato's psychology accessible to scholars in ancient Greece." - }, - { - "Title":"A History of Psychology", - "Text":"First published in 2002. Routledge is an imprint of Taylor & Francis, an informa company." - }, - { - "Title":"An Introduction to the Psychology of Religion", - "Text":"The third edition of this successful book, which applies the science of psychology to problems of religion. Dr Thouless explores such questions as: why do people believe? Why are their beliefs often held with irrational strength?" - }, - { - "Title":"Psychology of Champions: How to Win at Sports and Life", - "Text":"In this unprecedented book, two psychologist researchers interview sports legends and super-athletes across sports to explain the thinking that powers stellar performers, pushing them to amazing and historic successes." - }, - { - "Title":"The Psychology of Humor: An Integrative Approach", - "Text":"This is a singly authored monograph that provides in one source, a summary of information researchers might wish to know about research into the psychology of humor." - }, - { - "Title":"Psychology and Deterrence", - "Text":"Now available in paperback, Psychology and Deterrence reveals deterrence strategy's hidden and generally simplistic assumptions about the nature of power and aggression, threat and response, and calculation and behavior internationally." - }, - { - "Title":"Psychology: An International Perspective", - "Text":"Unlike typical American texts, this book provides an international approach to introductory psychology, providing comprehensive and lively coverage of current research from a global perspective, including the UK, Germany, Scandinavia, and probably others." - }, - { - "Title":"Psychology, Briefer Course", - "Text":"Despite its title, \"Psychology: Briefer Course\" is more than a simple condensation of the great Principles of Psychology." - }, - { - "Title":"Psychology, Seventh Edition (High School)", - "Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field cognition, gender and diversity studies, neuroscience and more." - }, - { - "Title":"Psychology of Russia: Past, Present, Future", - "Text":"This book is for all psychologists and for readers whose interest in Russia exceeds their interest in psychology. Readers of this book will quickly discover a new world of thought." - }, - { - "Title":"Barron's AP Psychology", - "Text":"Provides information on scoring and structure of the test, offers tips on test-taking strategies, and includes practice examinations and subject review." - }, - { - "Title":"Applied Psychology: Putting Theory Into Practice", - "Text":"Applied Psychology: Putting theory into practice demonstrates how psychology theory is applied in the real world." - }, - { - "Title":"Filipino American Psychology: A Handbook of Theory,", - "Text":"This book is the first of its kind and aims to promote visibility of this invisible group, so that 2.4 million Filipino Americans will have their voices heard." - }, - { - "Title":"The Psychology of Visual Illusion", - "Text":"Well-rounded perspective on the ambiguities of visual display emphasizes geometrical optical illusions: framing and contrast effects, distortion of angles and direction, and apparent \"movement\" of images. 240 drawings. 1972 edition." - }, - { - "Title":"The Psychology of Women", - "Text":"This highly respected text offers students an enjoyable, extraordinarily well-written introduction to the psychology of women with an up-to-date examination of the field and comprehensive coverage of topics." - }, - { - "Title":"Psychology and Race", - "Text":"Psychology and Race is divided into two major parts. The first half of the book looks at the interracial situation itself. The second half is a mystery." - }, - { - "Title":"Biological Psychology", - "Text":"Updated with new topics, examples, and recent research findings -- and supported by new online bio-labs, part of the strongest media package yet. This text speaks to today's students and instructors." - }, - { - "Title":"Psychology: Concepts & Connections", - "Text":"The theme of this book is applying theories and research to learning and to contemporary life." - }, - { - "Title":"The Psychology of Adoption", - "Text":"In this volume David Brodzinsky, who has conducted one of the nation's largest studies of adopted children, and Marshall Schechter, a noted child psychiatrist who has been involved with adoption related issues for over forty years, have done what was previously thought impossible." - }, - { - "Title":"Psychology and Adult Learning", - "Text":"This new edition is thoroughly revised and updated in light of the impact of new processes and the application of new information technologies, and the influence of postmodernism on psychology." - }, - { - "Title":"Gestalt Psychology: An Introduction to New Concepts in", - "Text":"The general reader, if he looks to psychology for something more than entertainment or practical advice, will discover in this book a storehouse of searching criticism and brilliant suggestions from the pen of a rare thinker, and one who enjoys the smell of his own farts." - }, - { - "Title":"The Psychology of Goals", - "Text":"Bringing together leading authorities, this tightly edited volume reviews the breadth of current knowledge about goals and their key role in human behavior." - }, - { - "Title":"Metaphors in the History of Psychology", - "Text":"Through the identification of these metaphors, the contributors to this volume have provided a remarkably useful guide to the history, current orientations, and future prospects of modern psychology." - }, - { - "Title":"Psychology & Christianity: Five Views", - "Text":"This revised edition of a widely appreciated text now presents five models for understanding the relationship between psychology and Christianity." - }, - { - "Title":"The Psychology of Hope: You Can Get There from Here", - "Text":"Why do some people lead positive, hope-filled lives, while others wallow in pessimism? In \"The Psychology of Hope\", a professor of psychology reveals the specific character traits that produce highly hopeful individuals." - }, - { - "Title":"Perspectives on Psychology", - "Text":"This is a title in the modular \"Principles in Psychology Series\", designed for A-level and other introductory courses, aiming to provide students embarking on psychology courses with the necessary background and context." - }, - { - "Title":"Ethics in Psychology: Professional Standards and Cases", - "Text":"In this book, their main intent is to present the full range of contemporary ethical issues in psychology as not only relevant and intriguing, but also as integral and unavoidable aspects of the profession." - }, - { - "Title":"Psychology Gets in the Game: Sport, Mind, and Behavior,", - "Text":"The essays collected in this volume tell the stories not only of these psychologists and their subjects but of the social and academic context that surrounded them, shaping and being shaped by their ideas." - }, - { - "Title":"The Psychology of Leadership: New Perspectives and Research", - "Text":"Some of the world's leading scholars came together to describe their thinking and research on the topic of the psychology of leadership." - }, - { - "Title":"The Psychology of Interpersonal Relations", - "Text":"As the title suggests, this book examines the psychology of interpersonal relations. In the context of this book, the term \"interpersonal relations\" denotes relations between a few, usually between two, people." - }, - { - "Title":"Psychology", - "Text":"An exciting read for anyone interested in psychology and research; because of its comprehensive appendix, glossary, and reference section, this book is a must-have desk reference for psychologists and others in the field." - }, - { - "Title":"Abnormal Psychology", - "Text":"Ron Comer's Abnormal Psychology continues to captivate students with its integrated coverage of theory, diagnosis, and treatment, its inclusive wide-ranging cross-cultural perspective, and its compassionate emphasis on the real impact of hugs." - }, - { - "Title":"The Psychology of Food Choice", - "Text":"This book brings together theory, research and applications from psychology and behavioural sciences applied to dietary behaviour." - }, - { - "Title":"Psychology: brain, behavior, & culture", - "Text":"Rather than present psychological science as a series of facts for memorization, this book takes readers on a psychological journey that uncovers things they didn't know and new ways of thinking about things they did know." - }, - { - "Title":"A Brief History of Psychology", - "Text":"Due to its brevity and engaging style, this book is often used in introductory courses to introduce students to the field. The enormous index and substantial glossary make this volume a useful desk reference for the entire field." - }, - { - "Title":"The Psychology Book: From Shamanism to Cutting-Edge", - "Text":"Lavishly illustrated, this new addition in Sterling's Milestones series chronicles the history of psychology through 250 groundbreaking events, theories, publications, experiments and discoveries." - }, - { - "Title":"The Psychology Book", - "Text":"All the big ideas, simply explained - an innovative and accessible guide to the study of human nature The Psychology Book clearly explains more than 100 groundbreaking ideas in this fascinating field of science." - }, - { - "Title":"Handbook of Positive Psychology", - "Text":"The Handbook of Positive Psychology provides a forum for a more positive view of the human condition. In its pages, readers are treated to an analysis of what the foremost experts believe to be the fundamental strengths of humankind." - }, - { - "Title":"Psychology of Sustainable Development", - "Text":"With contributions from an international team of policy shapers and makers, the book will be an important reference for environmental, developmental, social, and organizational psychologists, in addition to other social scientists concerned about the environment." - }, - { - "Title":"An Introduction to the History of Psychology", - "Text":"In this Fifth Edition, B.R. Hergenhahn demonstrates that most of the concerns of contemporary psychologists are manifestations of themes that have been part of psychology for thousands of years." - }, - { - "Title":"Careers in Psychology: Opportunities in a Changing World", - "Text":"This text addresses the growing need among students and faculty for information about the careers available in psychology at the bachelors and graduate level." - }, - { - "Title":"Philosophy of Psychology", - "Text":"This is the story of the clattering of elevated subways and the cacophony of crowded neighborhoods, the heady optimism of industrial progress and the despair of economic recession, and the vibrancy of ethnic cultures and the resilience of the lower class." - }, - { - "Title":"The Psychology of Risk Taking Behavior", - "Text":"This book aims to help the reader to understand what motivates people to engage in risk taking behavior, such as participating in traffic, sports, financial investments, or courtship." - }, - { - "Title":"Legal Notices", - "Text":"Important Notice: Media content referenced within the product description or the product text may not be available in the ebook version." - }, - { - "Title":"Handbook of Psychology, Experimental Psychology", - "Text":"Includes established theories and cutting-edge developments. Presents the work of an international group of experts. Presents the nature, origin, implications, and future course of major unresolved issues in the area." - }, - { - "Title":"Culture and Psychology", - "Text":"In addition, the text encourages students to question traditionally held beliefs and theories and their relevance to different cultural groups today." - }, - { - "Title":"Exploring the Psychology of Interest", - "Text":"The most comprehensive work of its kind, Exploring the Psychology of Interest will be a valuable resource for student and professional researchers in cognitive, social, and developmental psychology." - }, - { - "Title":"Handbook of Adolescent Psychology", - "Text":"The study of adolescence in the field of psychology has grown tremendously over the last two decades, necessitating a comprehensive and up-to-date revision of this seminal work." - }, - { - "Title":"The Psychology of Diplomacy", - "Text":"World class clinicians, researchers, and activists present the psychological dimensions to diplomacy drawn from examples set in the United Nations, Camp David, the Middle East, Japan, South Africa, and elsewhere." - }, - { - "Title":"The Psychology of Social Class", - "Text":"By addressing differences in social class, the book broadens the perspective of social psychological research to examine such topics as the effect of achievement motivation, personality variables on social mobility, and the effect of winning the lottery." - }, - { - "Title":"Popular Psychology: An Encyclopedia", - "Text":"Entries cover a variety of topics in the field of popular psychology, including acupuncture, emotional intelligence, brainwashing, chemical inbalance, and seasonal affective disorder." - }, - { - "Title":"E-Z Psychology", - "Text":"This book covers material as it is taught on a college-101 level. There is no substance in this book that the casual observer of humans would not already know." - }, - { - "Title":"Psychology and Health", - "Text":"Part of a series of textbooks which have been written to support A levels in psychology. The books use real life applications to make theories come alive for students and teach them what they need to know." - }, - { - "Title":"Influence", - "Text":"Influence is the classic book on persuasion. It explains the psychology of why people say 'yes' and how to apply these understandings. Dr. Robert Cialdini is the seminal expert in the rapidly expanding field of influence and persuasion." - }, - { - "Title":"Psychology and Policing", - "Text":"The book should draw attention to the often unrecognized and valuable contribution that mainstream psychology can make to the knowledge base underpinning a wide variety of policing practices." - }, - { - "Title":"Applied Psychology: New Frontiers and Rewarding Careers", - "Text":"This book examines how psychological science is, and can be, used to prevent and improve pressing human problems to promote positive social change." - }, - { - "Title":"Foundations of Sport and Exercise Psychology, 6E: ", - "Text":"This text offers both students and new practitioners a comprehensive view of sport and exercise psychology, drawing connections between research and practice and capturing the excitement of the world of sport and exercise." - }, - { - "Title":"Biographical Dictionary of Psychology", - "Text":"This dictionary provides biographical and bibliographical information on over 500 psychologists from all over the world from 1850 to the present day. All branches of psychology and its related disciplines are featured." - }, - { - "Title":"Psychology: A Self-Teaching Guide", - "Text":"Frank Bruno explains all the major psychological theories and terms in this book, covering perception, motivation, thinking, personality, sensation, intelligence, research methods, and much more." - }, - { - "Title":"A Dictionary of Psychology", - "Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text." - }, - { - "Title":"darbian regarding how fast you can learn to speedrun", - "Text":"This depends on a number of factors. The answer will be very different for someone who doesn't have a lot of experience with videogames compared to someone who is already decent at retro platformers. In my case, it took about a year of playing on and off to get pretty competitive at the game, but there have been others who did it much faster. With some practice you can get a time that would really impress your friends after only a few days of practice." - }, - { - "Title":"Memes", - "Text":"The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start." - }, - { - "Title":"Literature quotes", - "Text":"A banker is a fellow who lends you his umbrella when the sun is shining and wants it back the minute it begins to rain. -- Mark Twain" - }, - { - "Title":"Literature quotes", - "Text":"A classic is something that everyone wants to have read and nobody wants to read. -- Mark Twain" - }, - { - "Title":"Literature quotes", - "Text":"After all, all he did was string together a lot of old, well-known quotations. -- H. L. Mencken, on Shakespeare" - }, - { - "Title":"Literature quotes", - "Text":"All generalizations are false, including this one. -- Mark Twain" - }, - { - "Title":"Literature quotes", - "Text":"All I know is what the words know, and dead things, and that makes a handsome little sum, with a beginning and a middle and an end, as in the well-built phrase and the long sonata of the dead. -- Samuel Beckett" - }, - { - "Title":"Literature quotes", - "Text":"All say, \"How hard it is that we have to die\" -- a strange complaint to come from the mouths of people who have had to live. -- Mark Twain" - }, - { - "Title":"Literature quotes", - "Text":"At once it struck me what quality went to form a man of achievement, especially in literature, and which Shakespeare possessed so enormously -- I mean negative capability, that is, when a man is capable of being in uncertainties, mysteries, doubts, without any irritable reaching after fact and reason. -- John Keats" - }, - { - "Title":"Pat Cadigan, \"Mindplayers\"", - "Text":"A morgue is a morgue is a morgue. They can paint the walls with aggressively cheerful primary colors and splashy bold graphics, but it's still a holding place for the dead until they can be parted out to organ banks. Not that I would have cared normally but my viewpoint was skewed. The relentless pleasance of the room I sat in seemed only grotesque." - }, - { - "Title":"Men & Women", - "Text":"A diplomatic husband said to his wife, \"How do you expect me to remember your birthday when you never look any older?\"" - }, - { - "Title":"James L. Collymore, \"Perfect Woman\"", - "Text":"I began many years ago, as so many young men do, in searching for the perfect woman. I believed that if I looked long enough, and hard enough, I would find her and then I would be secure for life. Well, the years and romances came and went, and I eventually ended up settling for someone a lot less than my idea of perfection. But one day, after many years together, I lay there on our bed recovering from a slight illness. My wife was sitting on a chair next to the bed, humming softly and watching the late afternoon sun filtering through the trees. The only sounds to be heard elsewhere were the clock ticking, the kettle downstairs starting to boil, and an occasional schoolchild passing beneath our window. And as I looked up into my wife's now wrinkled face, but still warm and twinkling eyes, I realized something about perfection... It comes only with time." - }, - { - "Title":"Famous quotes", - "Text":"I have now come to the conclusion never again to think of marrying, and for this reason: I can never be satisfied with anyone who would be blockhead enough to have me. -- Abraham Lincoln" - }, - { - "Title":"Men & Women", - "Text":"In the midst of one of the wildest parties he'd ever been to, the young man noticed a very prim and pretty girl sitting quietly apart from the rest of the revelers. Approaching her, he introduced himself and, after some quiet conversation, said, \"I'm afraid you and I don't really fit in with this jaded group. Why don't I take you home?\" \"Fine,\" said the girl, smiling up at him demurely. \"Where do you live?\"" - }, - { - "Title":"Encyclopadia Apocryphia, 1990 ed.", - "Text":"There is no realizable power that man cannot, in time, fashion the tools to attain, nor any power so secure that the naked ape will not abuse it. So it is written in the genetic cards -- only physics and war hold him in check. And also the wife who wants him home by five, of course." - }, - { - "Title":"Susan Gordon", - "Text":"What publishers are looking for these days isn't radical feminism. It's corporate feminism -- a brand of feminism designed to sell books and magazines, three-piece suits, airline tickets, Scotch, cigarettes and, most important, corporate America's message, which runs: Yes, women were discriminated against in the past, but that unfortunate mistake has been remedied; now every woman can attain wealth, prestige and power by dint of individual rather than collective effort." - }, - { - "Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"", - "Text":"When my freshman roommate at Cornell found out I was Jewish, she was, at her request, moved to a different room. She told me she didn't think she had ever seen a Jew before. My only response was to begin wearing a small Star of David on a chain around my neck. I had not become a more observing Jew; rather, discovering that the label of Jew was offensive to others made me want to let people know who I was and what I believed in. Similarly, after talking to these young women -- one of whom told me that she didn't think she had ever met a feminist -- I've taken to identifying myself as a feminist in the most unlikely of situations." - }, - { - "Title":"Medicine", - "Text":"Never die while in your doctor's prescence or under his direct care. This will only cause him needless inconvenience and embarassment." - }, - { - "Title":"Medicine", - "Text":"Human cardiac catheterization was introduced by Werner Forssman in 1929. Ignoring his department chief, and tying his assistant to an operating table to prevent her interference, he placed a ureteral catheter into a vein in his arm, advanced it to the right atrium [of his heart], and walked upstairs to the x-ray department where he took the confirmatory x-ray film. In 1956, Dr. Forssman was awarded the Nobel Prize." - }, - { - "Title":"The C Programming Language", - "Text":"In Chapter 3 we presented a Shell sort function that would sort an array of integers, and in Chapter 4 we improved on it with a quicksort. The same algorithms will work, except that now we have to deal with lines of text, which are of different lengths, and which, unlike integers, can't be compared or moved in a single operation." - }, - { - "Title":"Religious Texts", - "Text":"O ye who believe! Avoid suspicion as much (as possible): for suspicion in some cases in a sin: And spy not on each other behind their backs. Quran 49:12" - }, - { - "Title":"Religious Texts", - "Text":"If you want to destroy any nation without war, make adultery & nudity common in the next generation. -- Salahuddin Ayyubi" - }, - { - "Title":"Religious Texts", - "Text":"Whoever recommends and helps a good cause becomes a partner therein, and whoever recommends and helps an evil cause shares in its burdens. Quran 4:85" - }, - { - "Title":"Religious Texts", - "Text":"No servant can serve two masters. Either he will hate the one and love the other, or he will be devoted to the one and despise the other. You cannot serve both God and Money. Luke 16:13" - }, - { - "Title":"Religious Texts", - "Text":"So we do not lose heart. Though our outer man is wasting away, our inner self is being renewed day by day. For this light momentary affliction is preparing for us an eternal weight of glory beyond all comparison, as we look not to the things that are seen but to the things that are unseen. For the things that are seen are transient, but the things that are unseen are eternal. 2 Corinthians 4:16-18" - }, - { - "Title":"Religious Texts", - "Text":"And out of that hopeless attempt has come nearly all that we call human history -- money, poverty, ambition, war, prostitution, classes, empires, slavery -- the long terrible story of man trying to find something other than God which will make him happy. -- C.S. Lewis" - }, - { - "Title":"Medicine", - "Text":"Your digestive system is your body's Fun House, whereby food goes on a long, dark, scary ride, taking all kinds of unexpected twists and turns, being attacked by vicious secretions along the way, and not knowing until the last minute whether it will be turned into a useful body part or ejected into the Dark Hole by Mister Sphincter. We Americans live in a nation where the medical-care system is second to none in the world, unless you count maybe 25 or 30 little scuzzball countries like Scotland that we could vaporize in seconds if we felt like it. -- Dave Barry" - }, - { - "Title":"Medicine", - "Text":"The trouble with heart disease is that the first symptom is often hard to deal with: death. -- Michael Phelps" - }, - { - "Title":"Medicine", - "Text":"Never go to a doctor whose office plants have died -- Erma Bombeck" - }, - { - "Title":"Science", - "Text":"Albert Einstein, when asked to describe radio, replied: \"You see, wire telegraph is a kind of a very, very long cat. You pull his tail in NewYork and his head is meowing in Los Angeles. Do you understand this? And radio operates exactly the same way: you send signals here, they receive them there. The only difference is that there is no cat.\"" - }, - { - "Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"", - "Text":"At the heart of science is an essential tension between two seemingly contradictory attitudes -- an openness to new ideas, no matter how bizarre or counterintuitive they may be, and the most ruthless skeptical scrutiny of all ideas, old and new. This is how deep truths are winnowed from deep nonsense. Of course, scientists make mistakes in trying to understand the world, but there is a built-in error-correcting mechanism: The collective enterprise of creative thinking and skeptical thinking together keeps the field on track." - }, - { - "Title":"#Octalthorpe", - "Text":"Back in the early 60's, touch tone phones only had 10 buttons. Some military versions had 16, while the 12 button jobs were used only by people who had \"diva\" (digital inquiry, voice answerback) systems -- mainly banks. Since in those days, only Western Electric made \"data sets\" (modems) the problems of terminology were all Bell System. We used to struggle with written descriptions of dial pads that were unfamiliar to most people (most phones were rotary then.) Partly in jest, some AT&T engineering types (there was no marketing in the good old days, which is why they were the good old days) made up the term \"octalthorpe\" (note spelling) to denote the \"pound sign.\" Presumably because it has 8 points sticking out. It never really caught on." - }, - { - "Title":"Science -- Edgar R. Fiedler", - "Text":"Economists state their GDP growth projections to the nearest tenth of a percentage point to prove they have a sense of humor." - }, - { - "Title":"Science -- R. Buckminster Fuller", - "Text":"Everything you've learned in school as \"obvious\" becomes less and less obvious as you begin to study the universe. For example, there are no solids in the universe. There's not even a suggestion of a solid. There are no absolute continuums. There are no surfaces. There are no straight lines." - }, - { - "Title":"Math", - "Text":"Factorials were someone's attempt to make math LOOK exciting." - }, - { - "Title":"Science -- Thomas L. Creed", - "Text":"Fortunately, the responsibility for providing evidence is on the part of the person making the claim, not the critic. It is not the responsibility of UFO skeptics to prove that a UFO has never existed, nor is it the responsibility of paranormal-health-claims skeptics to prove that crystals or colored lights never healed anyone. The skeptic's role is to point out claims that are not adequately supported by acceptable evidcence and to provide plausible alternative explanations that are more in keeping with the accepted body of scientific evidence." - }, - { - "Title":"Science -- H. L. Mencken, 1930", - "Text":"There is, in fact, no reason to believe that any given natural phenomenon, however marvelous it may seem today, will remain forever inexplicable. Soon or late the laws governing the production of life itself will be discovered in the laboratory, and man may set up business as a creator on his own account. The thing, indeed, is not only conceivable; it is even highly probable." - }, - { - "Title":"Science", - "Text":"When Alexander Graham Bell died in 1922, the telephone people interrupted service for one minute in his honor. They've been honoring him intermittently ever since, I believe." - }, - { - "Title":"Science -- Stanislaw Lem", - "Text":"When the Universe was not so out of whack as it is today, and all the stars were lined up in their proper places, you could easily count them from left to right, or top to bottom, and the larger and bluer ones were set apart, and the smaller yellowing types pushed off to the corners as bodies of a lower grade..." - }, - { - "Title":"Science -- Dave Barry", - "Text":"You should not use your fireplace, because scientists now believe that, contrary to popular opinion, fireplaces actually remove heat from houses. Really, that's what scientists believe. In fact many scientists actually use their fireplaces to cool their houses in the summer. If you visit a scientist's house on a sultry August day, you'll find a cheerful fire roaring on the hearth and the scientist sitting nearby, remarking on how cool he is and drinking heavily." - }, - { - "Title":"Sports", - "Text":"Although golf was originally restricted to wealthy, overweight Protestants, today it's open to anybody who owns hideous clothing. -- Dave Barry" - }, - { - "Title":"Sports", - "Text":"Now there's three things you can do in a baseball game: you can win, you can lose, or it can rain. -- Casey Stengel" - }, - { - "Title":"Sports", - "Text":"Once there was this conductor see, who had a bass problem. You see, during a portion of Beethovan's Ninth Symphony in which there are no bass violin parts, one of the bassists always passed a bottle of scotch around. So, to remind himself that the basses usually required an extra cue towards the end of the symphony, the conductor would fasten a piece of string around the page of the score before the bass cue. As the basses grew more and more inebriated, two of them fell asleep. The conductor grew quite nervous (he was very concerned about the pitch) because it was the bottom of the ninth; the score was tied and the basses were loaded with two out." - }, - { - "Title":"Sports", - "Text":"When I'm gone, boxing will be nothing again. The fans with the cigars and the hats turned down'll be there, but no more housewives and little men in the street and foreign presidents. It's goin' to be back to the fighter who comes to town, smells a flower, visits a hospital, blows a horn and says he's in shape. Old hat. I was the onliest boxer in history people asked questions like a senator. -- Muhammad Ali" - }, - { - "Title":"Sports", - "Text":"The surest way to remain a winner is to win once, and then not play any more." - }, - { - "Title":"Sports", - "Text":"The real problem with hunting elephants is carrying the decoys" - }, - { - "Title":"Sports -- Dizzy Dean", - "Text":"The pitcher wound up and he flang the ball at the batter. The batter swang and missed. The pitcher flang the ball again and this time the batter connected. He hit a high fly right to the center fielder. The center fielder was all set to catch the ball, but at the last minute his eyes were blound by the sun and he dropped it." - }, - { - "Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium", - "Text":"The only real game in the world, I think, is baseball... You've got to start way down, at the bottom, when you're six or seven years old. You can't wait until you're fifteen or sixteen. You've got to let it grow up with you, and if you're successful and you try hard enough, you're bound to come out on top, just like these boys have come to the top now." - }, - { - "Title":"Sports", - "Text":"The one sure way to make a lazy man look respectable is to put a fishing rod in his hand." - }, - { - "Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"", - "Text":"No. That's it. The cool name, that is. We worked very hard on creating a name that would appeal to the majority of people, and it certainly paid off: thousands of people are using linux just to be able to say \"OS/2? Hah. I've got Linux. What a cool name\". 386BSD made the mistake of putting a lot of numbers and weird abbreviations into the name, and is scaring away a lot of people just because it sounds too technical." - }, - { - "Title":"Smart House", - "Text":"A teenager wins a fully automated dream house in a competition, but soon the computer controlling it begins to take over and everything gets out of control, then Ben the teenager calms down the computer named Pat and everything goes back to normal." - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"Writing non-free software is not an ethically legitimate activity, so if people who do this run into trouble, that's good! All businesses based on non-free software ought to fail, and the sooner the better. -- Richard Stallman" - }, - { - "Title":"Linux -- Jim Wright", - "Text":"You know, if Red Hat was smart, they'd have a fake front on their office building just for visitors, where you would board a magical trolley that took you past the smiling singing oompah loompahs who take the raw linux sugar and make it into Red Hat candy goodness. Then they could use it as a motivator for employees... Shape up, or you're spending time working \"the ride\"!" - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"Free software is software that gives you the user the freedom to share, study and modify it. We call this free software because the user is free." - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"To use free software is to make a political and ethical choice asserting the right to learn, and share what we learn with others. Free software has become the foundation of a learning society where we share our knowledge in a way that others can build upon and enjoy." - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"Currently, many people use proprietary software that denies users these freedoms and benefits. If we make a copy and give it to a friend, if we try to figure out how the program works, if we put a copy on more than one of our own computers in our own home, we could be caught and fined or put in jail. That's what's in the fine print of the license agreement you accept when using proprietary software." - }, - { - "Title":"True Words of a Genius Philosopher", - "Text":"The corporations behind proprietary software will often spy on your activities and restrict you from sharing with others. And because our computers control much of our personal information and daily activities, proprietary software represents an unacceptable danger to a free society." - }, - { - "Title":"Politics -- Donald Trump", - "Text":"When Mexico sends its people, they're not sending their best. They're not sending you. They're sending people that have lots of problems, and they're bringing those problems with us. They're bringing drugs. They're bringing crime. Their rapists. And some, I assume, are good people." - }, - { - "Title":"Politics -- Sir Winston Churchill, 1952", - "Text":"A prisoner of war is a man who tries to kill you and fails, and then asks you not to kill him." - }, - { - "Title":"Politics -- Johnny Hart", - "Text":"Cutting the space budget really restores my faith in humanity. It eliminates dreams, goals, and ideals and lets us get straight to the business of hate, debauchery, and self-annihilation." - }, - { - "Title":"Politics -- Winston Churchill", - "Text":"Democracy is the worst form of government except all those other forms that have been tried from time to time." - }, - { - "Title":"Politics", - "Text":"Each person has the right to take part in the management of public affairs in his country, provided he has prior experience, a will to succeed, a university degree, influential parents, good looks, a curriculum vitae, two 3x4 snapshots, and a good tax record." - }, - { - "Title":"Politics -- A Yippie Proverb", - "Text":"Free Speech Is The Right To Shout 'Theater' In A Crowded Fire." - }, - { - "Title":"Politics -- Boss Tweed", - "Text":"I don't care who does the electing as long as I get to do the nominating." - }, - { - "Title":"Politics -- Francis Bellamy, 1892", - "Text":"I pledge allegiance to the flag of the United States of America and to the republic for which it stands, one nation, indivisible, with liberty and justice for all." - }, - { - "Title":"Politics -- Napoleon", - "Text":"It follows that any commander in chief who undertakes to carry out a plan which he considers defective is at fault; he must put forth his reasons, insist of the plan being changed, and finally tender his resignation rather than be the instrument of his army's downfall." - }, - { - "Title":"Politics", - "Text":"Only two kinds of witnesses exist. The first live in a neighborhood where a crime has been committed and in no circumstances have ever seen anything or even heard a shot. The second category are the neighbors of anyone who happens to be accused of the crime. These have always looked out of their windows when the shot was fired, and have noticed the accused person standing peacefully on his balcony a few yards away." - }, - { - "Title":"Politics -- Frederick Douglass", - "Text":"Slaves are generally expected to sing as well as to work ... I did not, when a slave, understand the deep meanings of those rude, and apparently incoherent songs. I was myself within the circle, so that I neither saw nor heard as those without might see and hear. They told a tale which was then altogether beyond my feeble comprehension: they were tones, loud, long and deep, breathing the prayer and complaint of souls boiling over with the bitterest anguish. Every tone was a testimony against slavery, and a prayer to God for deliverance from chains." - }] diff --git a/src/NadekoBot/data/typing_articles2.json b/src/NadekoBot/data/typing_articles2.json new file mode 100644 index 00000000..78214ea2 --- /dev/null +++ b/src/NadekoBot/data/typing_articles2.json @@ -0,0 +1 @@ +[{"Title":"The Gender of Psychology","Text":"This book addresses the diversity of psychological knowledge and practice through the lens of gender."},{"Title":"Unto Others: The Evolution and Psychology of Unselfish","Text":"In Unto Others philosopher Elliott Sober and biologist David Sloan Wilson demonstrate once and for all that unselfish behavior is in fact an important feature of both biological and human nature."},{"Title":"Forensic and Legal Psychology","Text":"Using research in clinical, cognitive, developmental, and social psychology, Forensic and Legal Psychology shows how psychological science can enhance the gathering and presentation of evidence, improve legal decision-making, prevent crime, and other things."},{"Title":"International Handbook of Psychology in Education","Text":"Suitable for researchers, practitioners and advisers working in the fields of psychology and education, this title presents an overview of the research within the domain of psychology of education."},{"Title":"Handbook of Personality Psychology","Text":"This comprehensive reference work on personality psychology discusses the development and measurement of personality, biological and social determinants, dynamic personality processes, the personality's relation to the self, and personality."},{"Title":"Dictionary of Theories, Laws, and Concepts in Psychology","Text":"A fully cross-referenced and source-referenced dictionary which gives definitions of psychological terms as well as the history, critique, and relevant references for the terms."},{"Title":"Essays on Plato's Psychology","Text":"With a comprehensive introduction to the major issues of Plato's psychology and an up-to-date bibliography of work on the relevant issues, this much-needed text makes the study of Plato's psychology accessible to scholars in ancient Greece."},{"Title":"A History of Psychology","Text":"First published in 2002. Routledge is an imprint of Taylor & Francis, an informa company."},{"Title":"An Introduction to the Psychology of Religion","Text":"The third edition of this successful book, which applies the science of psychology to problems of religion. Dr Thouless explores such questions as: why do people believe? Why are their beliefs often held with irrational strength?"},{"Title":"Psychology of Champions: How to Win at Sports and Life","Text":"In this unprecedented book, two psychologist researchers interview sports legends and super-athletes across sports to explain the thinking that powers stellar performers, pushing them to amazing and historic successes."},{"Title":"The Psychology of Humor: An Integrative Approach","Text":"This is a singly authored monograph that provides in one source, a summary of information researchers might wish to know about research into the psychology of humor."},{"Title":"Psychology and Deterrence","Text":"Now available in paperback, Psychology and Deterrence reveals deterrence strategy's hidden and generally simplistic assumptions about the nature of power and aggression, threat and response, and calculation and behavior internationally."},{"Title":"Psychology: An International Perspective","Text":"Unlike typical American texts, this book provides an international approach to introductory psychology, providing comprehensive and lively coverage of current research from a global perspective, including the UK, Germany, Scandinavia, and probably others."},{"Title":"Psychology, Briefer Course","Text":"Despite its title, \"Psychology: Briefer Course\" is more than a simple condensation of the great Principles of Psychology."},{"Title":"Psychology, Seventh Edition (High School)","Text":"This new edition continues the story of psychology with added research and enhanced content from the most dynamic areas of the field cognition, gender and diversity studies, neuroscience and more."},{"Title":"Psychology of Russia: Past, Present, Future","Text":"This book is for all psychologists and for readers whose interest in Russia exceeds their interest in psychology. Readers of this book will quickly discover a new world of thought."},{"Title":"Barron's AP Psychology","Text":"Provides information on scoring and structure of the test, offers tips on test-taking strategies, and includes practice examinations and subject review."},{"Title":"Applied Psychology: Putting Theory Into Practice","Text":"Applied Psychology: Putting theory into practice demonstrates how psychology theory is applied in the real world."},{"Title":"Filipino American Psychology: A Handbook of Theory,","Text":"This book is the first of its kind and aims to promote visibility of this invisible group, so that 2.4 million Filipino Americans will have their voices heard."},{"Title":"The Psychology of Visual Illusion","Text":"Well-rounded perspective on the ambiguities of visual display emphasizes geometrical optical illusions: framing and contrast effects, distortion of angles and direction, and apparent \"movement\" of images. 240 drawings. 1972 edition."},{"Title":"The Psychology of Women","Text":"This highly respected text offers students an enjoyable, extraordinarily well-written introduction to the psychology of women with an up-to-date examination of the field and comprehensive coverage of topics."},{"Title":"Psychology and Race","Text":"Psychology and Race is divided into two major parts. The first half of the book looks at the interracial situation itself. The second half is a mystery."},{"Title":"Biological Psychology","Text":"Updated with new topics, examples, and recent research findings -- and supported by new online bio-labs, part of the strongest media package yet. This text speaks to today's students and instructors."},{"Title":"Psychology: Concepts & Connections","Text":"The theme of this book is applying theories and research to learning and to contemporary life."},{"Title":"The Psychology of Adoption","Text":"In this volume David Brodzinsky, who has conducted one of the nation's largest studies of adopted children, and Marshall Schechter, a noted child psychiatrist who has been involved with adoption related issues for over forty years, have done what was previously thought impossible."},{"Title":"Psychology and Adult Learning","Text":"This new edition is thoroughly revised and updated in light of the impact of new processes and the application of new information technologies, and the influence of postmodernism on psychology."},{"Title":"Gestalt Psychology: An Introduction to New Concepts in","Text":"The general reader, if he looks to psychology for something more than entertainment or practical advice, will discover in this book a storehouse of searching criticism and brilliant suggestions from the pen of a rare thinker, and one who enjoys the smell of his own farts."},{"Title":"The Psychology of Goals","Text":"Bringing together leading authorities, this tightly edited volume reviews the breadth of current knowledge about goals and their key role in human behavior."},{"Title":"Metaphors in the History of Psychology","Text":"Through the identification of these metaphors, the contributors to this volume have provided a remarkably useful guide to the history, current orientations, and future prospects of modern psychology."},{"Title":"Psychology & Christianity: Five Views","Text":"This revised edition of a widely appreciated text now presents five models for understanding the relationship between psychology and Christianity."},{"Title":"The Psychology of Hope: You Can Get There from Here","Text":"Why do some people lead positive, hope-filled lives, while others wallow in pessimism? In \"The Psychology of Hope\", a professor of psychology reveals the specific character traits that produce highly hopeful individuals."},{"Title":"Perspectives on Psychology","Text":"This is a title in the modular \"Principles in Psychology Series\", designed for A-level and other introductory courses, aiming to provide students embarking on psychology courses with the necessary background and context."},{"Title":"Ethics in Psychology: Professional Standards and Cases","Text":"In this book, their main intent is to present the full range of contemporary ethical issues in psychology as not only relevant and intriguing, but also as integral and unavoidable aspects of the profession."},{"Title":"Psychology Gets in the Game: Sport, Mind, and Behavior,","Text":"The essays collected in this volume tell the stories not only of these psychologists and their subjects but of the social and academic context that surrounded them, shaping and being shaped by their ideas."},{"Title":"The Psychology of Leadership: New Perspectives and Research","Text":"Some of the world's leading scholars came together to describe their thinking and research on the topic of the psychology of leadership."},{"Title":"The Psychology of Interpersonal Relations","Text":"As the title suggests, this book examines the psychology of interpersonal relations. In the context of this book, the term \"interpersonal relations\" denotes relations between a few, usually between two, people."},{"Title":"Psychology","Text":"An exciting read for anyone interested in psychology and research; because of its comprehensive appendix, glossary, and reference section, this book is a must-have desk reference for psychologists and others in the field."},{"Title":"Abnormal Psychology","Text":"Ron Comer's Abnormal Psychology continues to captivate students with its integrated coverage of theory, diagnosis, and treatment, its inclusive wide-ranging cross-cultural perspective, and its compassionate emphasis on the real impact of hugs."},{"Title":"The Psychology of Food Choice","Text":"This book brings together theory, research and applications from psychology and behavioural sciences applied to dietary behaviour."},{"Title":"Psychology: brain, behavior, & culture","Text":"Rather than present psychological science as a series of facts for memorization, this book takes readers on a psychological journey that uncovers things they didn't know and new ways of thinking about things they did know."},{"Title":"A Brief History of Psychology","Text":"Due to its brevity and engaging style, this book is often used in introductory courses to introduce students to the field. The enormous index and substantial glossary make this volume a useful desk reference for the entire field."},{"Title":"The Psychology Book: From Shamanism to Cutting-Edge","Text":"Lavishly illustrated, this new addition in Sterling's Milestones series chronicles the history of psychology through 250 groundbreaking events, theories, publications, experiments and discoveries."},{"Title":"The Psychology Book","Text":"All the big ideas, simply explained - an innovative and accessible guide to the study of human nature The Psychology Book clearly explains more than 100 groundbreaking ideas in this fascinating field of science."},{"Title":"Handbook of Positive Psychology","Text":"The Handbook of Positive Psychology provides a forum for a more positive view of the human condition. In its pages, readers are treated to an analysis of what the foremost experts believe to be the fundamental strengths of humankind."},{"Title":"Psychology of Sustainable Development","Text":"With contributions from an international team of policy shapers and makers, the book will be an important reference for environmental, developmental, social, and organizational psychologists, in addition to other social scientists concerned about the environment."},{"Title":"An Introduction to the History of Psychology","Text":"In this Fifth Edition, B.R. Hergenhahn demonstrates that most of the concerns of contemporary psychologists are manifestations of themes that have been part of psychology for thousands of years."},{"Title":"Careers in Psychology: Opportunities in a Changing World","Text":"This text addresses the growing need among students and faculty for information about the careers available in psychology at the bachelors and graduate level."},{"Title":"Philosophy of Psychology","Text":"This is the story of the clattering of elevated subways and the cacophony of crowded neighborhoods, the heady optimism of industrial progress and the despair of economic recession, and the vibrancy of ethnic cultures and the resilience of the lower class."},{"Title":"The Psychology of Risk Taking Behavior","Text":"This book aims to help the reader to understand what motivates people to engage in risk taking behavior, such as participating in traffic, sports, financial investments, or courtship."},{"Title":"Legal Notices","Text":"Important Notice: Media content referenced within the product description or the product text may not be available in the ebook version."},{"Title":"Handbook of Psychology, Experimental Psychology","Text":"Includes established theories and cutting-edge developments. Presents the work of an international group of experts. Presents the nature, origin, implications, and future course of major unresolved issues in the area."},{"Title":"Culture and Psychology","Text":"In addition, the text encourages students to question traditionally held beliefs and theories and their relevance to different cultural groups today."},{"Title":"Exploring the Psychology of Interest","Text":"The most comprehensive work of its kind, Exploring the Psychology of Interest will be a valuable resource for student and professional researchers in cognitive, social, and developmental psychology."},{"Title":"Handbook of Adolescent Psychology","Text":"The study of adolescence in the field of psychology has grown tremendously over the last two decades, necessitating a comprehensive and up-to-date revision of this seminal work."},{"Title":"The Psychology of Diplomacy","Text":"World class clinicians, researchers, and activists present the psychological dimensions to diplomacy drawn from examples set in the United Nations, Camp David, the Middle East, Japan, South Africa, and elsewhere."},{"Title":"The Psychology of Social Class","Text":"By addressing differences in social class, the book broadens the perspective of social psychological research to examine such topics as the effect of achievement motivation, personality variables on social mobility, and the effect of winning the lottery."},{"Title":"Popular Psychology: An Encyclopedia","Text":"Entries cover a variety of topics in the field of popular psychology, including acupuncture, emotional intelligence, brainwashing, chemical inbalance, and seasonal affective disorder."},{"Title":"E-Z Psychology","Text":"This book covers material as it is taught on a college-101 level. There is no substance in this book that the casual observer of humans would not already know."},{"Title":"Psychology and Health","Text":"Part of a series of textbooks which have been written to support A levels in psychology. The books use real life applications to make theories come alive for students and teach them what they need to know."},{"Title":"Influence","Text":"Influence is the classic book on persuasion. It explains the psychology of why people say 'yes' and how to apply these understandings. Dr. Robert Cialdini is the seminal expert in the rapidly expanding field of influence and persuasion."},{"Title":"Psychology and Policing","Text":"The book should draw attention to the often unrecognized and valuable contribution that mainstream psychology can make to the knowledge base underpinning a wide variety of policing practices."},{"Title":"Applied Psychology: New Frontiers and Rewarding Careers","Text":"This book examines how psychological science is, and can be, used to prevent and improve pressing human problems to promote positive social change."},{"Title":"Foundations of Sport and Exercise Psychology, 6E: ","Text":"This text offers both students and new practitioners a comprehensive view of sport and exercise psychology, drawing connections between research and practice and capturing the excitement of the world of sport and exercise."},{"Title":"Biographical Dictionary of Psychology","Text":"This dictionary provides biographical and bibliographical information on over 500 psychologists from all over the world from 1850 to the present day. All branches of psychology and its related disciplines are featured."},{"Title":"Psychology: A Self-Teaching Guide","Text":"Frank Bruno explains all the major psychological theories and terms in this book, covering perception, motivation, thinking, personality, sensation, intelligence, research methods, and much more."},{"Title":"A Dictionary of Psychology","Text":"Entries are extensively cross-referenced for ease of use, and cover word origins and derivations as well as definitions. Over 80 illustrations complement the text."},{"Title":"darbian regarding how fast you can learn to speedrun","Text":"This depends on a number of factors. The answer will be very different for someone who doesn't have a lot of experience with videogames compared to someone who is already decent at retro platformers. In my case, it took about a year of playing on and off to get pretty competitive at the game, but there have been others who did it much faster. With some practice you can get a time that would really impress your friends after only a few days of practice."},{"Title":"Memes","Text":"The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start."},{"Title":"Literature quotes","Text":"A banker is a fellow who lends you his umbrella when the sun is shining and wants it back the minute it begins to rain. -- Mark Twain"},{"Title":"Literature quotes","Text":"A classic is something that everyone wants to have read and nobody wants to read. -- Mark Twain"},{"Title":"Literature quotes","Text":"After all, all he did was string together a lot of old, well-known quotations. -- H. L. Mencken, on Shakespeare"},{"Title":"Literature quotes","Text":"All generalizations are false, including this one. -- Mark Twain"},{"Title":"Literature quotes","Text":"All I know is what the words know, and dead things, and that makes a handsome little sum, with a beginning and a middle and an end, as in the well-built phrase and the long sonata of the dead. -- Samuel Beckett"},{"Title":"Literature quotes","Text":"All say, \"How hard it is that we have to die\" -- a strange complaint to come from the mouths of people who have had to live. -- Mark Twain"},{"Title":"Literature quotes","Text":"At once it struck me what quality went to form a man of achievement, especially in literature, and which Shakespeare possessed so enormously -- I mean negative capability, that is, when a man is capable of being in uncertainties, mysteries, doubts, without any irritable reaching after fact and reason. -- John Keats"},{"Title":"Pat Cadigan, \"Mindplayers\"","Text":"A morgue is a morgue is a morgue. They can paint the walls with aggressively cheerful primary colors and splashy bold graphics, but it's still a holding place for the dead until they can be parted out to organ banks. Not that I would have cared normally but my viewpoint was skewed. The relentless pleasance of the room I sat in seemed only grotesque."},{"Title":"Men & Women","Text":"A diplomatic husband said to his wife, \"How do you expect me to remember your birthday when you never look any older?\""},{"Title":"James L. Collymore, \"Perfect Woman\"","Text":"I began many years ago, as so many young men do, in searching for the perfect woman. I believed that if I looked long enough, and hard enough, I would find her and then I would be secure for life. Well, the years and romances came and went, and I eventually ended up settling for someone a lot less than my idea of perfection. But one day, after many years together, I lay there on our bed recovering from a slight illness. My wife was sitting on a chair next to the bed, humming softly and watching the late afternoon sun filtering through the trees. The only sounds to be heard elsewhere were the clock ticking, the kettle downstairs starting to boil, and an occasional schoolchild passing beneath our window. And as I looked up into my wife's now wrinkled face, but still warm and twinkling eyes, I realized something about perfection... It comes only with time."},{"Title":"Famous quotes","Text":"I have now come to the conclusion never again to think of marrying, and for this reason: I can never be satisfied with anyone who would be blockhead enough to have me. -- Abraham Lincoln"},{"Title":"Men & Women","Text":"In the midst of one of the wildest parties he'd ever been to, the young man noticed a very prim and pretty girl sitting quietly apart from the rest of the revelers. Approaching her, he introduced himself and, after some quiet conversation, said, \"I'm afraid you and I don't really fit in with this jaded group. Why don't I take you home?\" \"Fine,\" said the girl, smiling up at him demurely. \"Where do you live?\""},{"Title":"Encyclopadia Apocryphia, 1990 ed.","Text":"There is no realizable power that man cannot, in time, fashion the tools to attain, nor any power so secure that the naked ape will not abuse it. So it is written in the genetic cards -- only physics and war hold him in check. And also the wife who wants him home by five, of course."},{"Title":"Susan Gordon","Text":"What publishers are looking for these days isn't radical feminism. It's corporate feminism -- a brand of feminism designed to sell books and magazines, three-piece suits, airline tickets, Scotch, cigarettes and, most important, corporate America's message, which runs: Yes, women were discriminated against in the past, but that unfortunate mistake has been remedied; now every woman can attain wealth, prestige and power by dint of individual rather than collective effort."},{"Title":"Susan Bolotin, \"Voices From the Post-Feminist Generation\"","Text":"When my freshman roommate at Cornell found out I was Jewish, she was, at her request, moved to a different room. She told me she didn't think she had ever seen a Jew before. My only response was to begin wearing a small Star of David on a chain around my neck. I had not become a more observing Jew; rather, discovering that the label of Jew was offensive to others made me want to let people know who I was and what I believed in. Similarly, after talking to these young women -- one of whom told me that she didn't think she had ever met a feminist -- I've taken to identifying myself as a feminist in the most unlikely of situations."},{"Title":"Medicine","Text":"Never die while in your doctor's prescence or under his direct care. This will only cause him needless inconvenience and embarassment."},{"Title":"Medicine","Text":"Human cardiac catheterization was introduced by Werner Forssman in 1929. Ignoring his department chief, and tying his assistant to an operating table to prevent her interference, he placed a ureteral catheter into a vein in his arm, advanced it to the right atrium [of his heart], and walked upstairs to the x-ray department where he took the confirmatory x-ray film. In 1956, Dr. Forssman was awarded the Nobel Prize."},{"Title":"The C Programming Language","Text":"In Chapter 3 we presented a Shell sort function that would sort an array of integers, and in Chapter 4 we improved on it with a quicksort. The same algorithms will work, except that now we have to deal with lines of text, which are of different lengths, and which, unlike integers, can't be compared or moved in a single operation."},{"Title":"Religious Texts","Text":"O ye who believe! Avoid suspicion as much (as possible): for suspicion in some cases in a sin: And spy not on each other behind their backs. Quran 49:12"},{"Title":"Religious Texts","Text":"If you want to destroy any nation without war, make adultery & nudity common in the next generation. -- Salahuddin Ayyubi"},{"Title":"Religious Texts","Text":"Whoever recommends and helps a good cause becomes a partner therein, and whoever recommends and helps an evil cause shares in its burdens. Quran 4:85"},{"Title":"Religious Texts","Text":"No servant can serve two masters. Either he will hate the one and love the other, or he will be devoted to the one and despise the other. You cannot serve both God and Money. Luke 16:13"},{"Title":"Religious Texts","Text":"So we do not lose heart. Though our outer man is wasting away, our inner self is being renewed day by day. For this light momentary affliction is preparing for us an eternal weight of glory beyond all comparison, as we look not to the things that are seen but to the things that are unseen. For the things that are seen are transient, but the things that are unseen are eternal. 2 Corinthians 4:16-18"},{"Title":"Religious Texts","Text":"And out of that hopeless attempt has come nearly all that we call human history -- money, poverty, ambition, war, prostitution, classes, empires, slavery -- the long terrible story of man trying to find something other than God which will make him happy. -- C.S. Lewis"},{"Title":"Medicine","Text":"Your digestive system is your body's Fun House, whereby food goes on a long, dark, scary ride, taking all kinds of unexpected twists and turns, being attacked by vicious secretions along the way, and not knowing until the last minute whether it will be turned into a useful body part or ejected into the Dark Hole by Mister Sphincter. We Americans live in a nation where the medical-care system is second to none in the world, unless you count maybe 25 or 30 little scuzzball countries like Scotland that we could vaporize in seconds if we felt like it. -- Dave Barry"},{"Title":"Medicine","Text":"The trouble with heart disease is that the first symptom is often hard to deal with: death. -- Michael Phelps"},{"Title":"Medicine","Text":"Never go to a doctor whose office plants have died -- Erma Bombeck"},{"Title":"Science","Text":"Albert Einstein, when asked to describe radio, replied: \"You see, wire telegraph is a kind of a very, very long cat. You pull his tail in NewYork and his head is meowing in Los Angeles. Do you understand this? And radio operates exactly the same way: you send signals here, they receive them there. The only difference is that there is no cat.\""},{"Title":"Carl Sagan, \"The Fine Art of Baloney Detection\"","Text":"At the heart of science is an essential tension between two seemingly contradictory attitudes -- an openness to new ideas, no matter how bizarre or counterintuitive they may be, and the most ruthless skeptical scrutiny of all ideas, old and new. This is how deep truths are winnowed from deep nonsense. Of course, scientists make mistakes in trying to understand the world, but there is a built-in error-correcting mechanism: The collective enterprise of creative thinking and skeptical thinking together keeps the field on track."},{"Title":"#Octalthorpe","Text":"Back in the early 60's, touch tone phones only had 10 buttons. Some military versions had 16, while the 12 button jobs were used only by people who had \"diva\" (digital inquiry, voice answerback) systems -- mainly banks. Since in those days, only Western Electric made \"data sets\" (modems) the problems of terminology were all Bell System. We used to struggle with written descriptions of dial pads that were unfamiliar to most people (most phones were rotary then.) Partly in jest, some AT&T engineering types (there was no marketing in the good old days, which is why they were the good old days) made up the term \"octalthorpe\" (note spelling) to denote the \"pound sign.\" Presumably because it has 8 points sticking out. It never really caught on."},{"Title":"Science -- Edgar R. Fiedler","Text":"Economists state their GDP growth projections to the nearest tenth of a percentage point to prove they have a sense of humor."},{"Title":"Science -- R. Buckminster Fuller","Text":"Everything you've learned in school as \"obvious\" becomes less and less obvious as you begin to study the universe. For example, there are no solids in the universe. There's not even a suggestion of a solid. There are no absolute continuums. There are no surfaces. There are no straight lines."},{"Title":"Math","Text":"Factorials were someone's attempt to make math LOOK exciting."},{"Title":"Science -- Thomas L. Creed","Text":"Fortunately, the responsibility for providing evidence is on the part of the person making the claim, not the critic. It is not the responsibility of UFO skeptics to prove that a UFO has never existed, nor is it the responsibility of paranormal-health-claims skeptics to prove that crystals or colored lights never healed anyone. The skeptic's role is to point out claims that are not adequately supported by acceptable evidcence and to provide plausible alternative explanations that are more in keeping with the accepted body of scientific evidence."},{"Title":"Science -- H. L. Mencken, 1930","Text":"There is, in fact, no reason to believe that any given natural phenomenon, however marvelous it may seem today, will remain forever inexplicable. Soon or late the laws governing the production of life itself will be discovered in the laboratory, and man may set up business as a creator on his own account. The thing, indeed, is not only conceivable; it is even highly probable."},{"Title":"Science","Text":"When Alexander Graham Bell died in 1922, the telephone people interrupted service for one minute in his honor. They've been honoring him intermittently ever since, I believe."},{"Title":"Science -- Stanislaw Lem","Text":"When the Universe was not so out of whack as it is today, and all the stars were lined up in their proper places, you could easily count them from left to right, or top to bottom, and the larger and bluer ones were set apart, and the smaller yellowing types pushed off to the corners as bodies of a lower grade..."},{"Title":"Science -- Dave Barry","Text":"You should not use your fireplace, because scientists now believe that, contrary to popular opinion, fireplaces actually remove heat from houses. Really, that's what scientists believe. In fact many scientists actually use their fireplaces to cool their houses in the summer. If you visit a scientist's house on a sultry August day, you'll find a cheerful fire roaring on the hearth and the scientist sitting nearby, remarking on how cool he is and drinking heavily."},{"Title":"Sports","Text":"Although golf was originally restricted to wealthy, overweight Protestants, today it's open to anybody who owns hideous clothing. -- Dave Barry"},{"Title":"Sports","Text":"Now there's three things you can do in a baseball game: you can win, you can lose, or it can rain. -- Casey Stengel"},{"Title":"Sports","Text":"Once there was this conductor see, who had a bass problem. You see, during a portion of Beethovan's Ninth Symphony in which there are no bass violin parts, one of the bassists always passed a bottle of scotch around. So, to remind himself that the basses usually required an extra cue towards the end of the symphony, the conductor would fasten a piece of string around the page of the score before the bass cue. As the basses grew more and more inebriated, two of them fell asleep. The conductor grew quite nervous (he was very concerned about the pitch) because it was the bottom of the ninth; the score was tied and the basses were loaded with two out."},{"Title":"Sports","Text":"When I'm gone, boxing will be nothing again. The fans with the cigars and the hats turned down'll be there, but no more housewives and little men in the street and foreign presidents. It's goin' to be back to the fighter who comes to town, smells a flower, visits a hospital, blows a horn and says he's in shape. Old hat. I was the onliest boxer in history people asked questions like a senator. -- Muhammad Ali"},{"Title":"Sports","Text":"The surest way to remain a winner is to win once, and then not play any more."},{"Title":"Sports","Text":"The real problem with hunting elephants is carrying the decoys"},{"Title":"Sports -- Dizzy Dean","Text":"The pitcher wound up and he flang the ball at the batter. The batter swang and missed. The pitcher flang the ball again and this time the batter connected. He hit a high fly right to the center fielder. The center fielder was all set to catch the ball, but at the last minute his eyes were blound by the sun and he dropped it."},{"Title":"Sports -- Babe Ruth, in his 1948 farewell speech at Yankee Stadium","Text":"The only real game in the world, I think, is baseball... You've got to start way down, at the bottom, when you're six or seven years old. You can't wait until you're fifteen or sixteen. You've got to let it grow up with you, and if you're successful and you try hard enough, you're bound to come out on top, just like these boys have come to the top now."},{"Title":"Sports","Text":"The one sure way to make a lazy man look respectable is to put a fishing rod in his hand."},{"Title":"Linux -- Linus Torvalds in response to \"Other than the fact Linux has a cool name, could someone explain why I should use Linux over BSD?\"","Text":"No. That's it. The cool name, that is. We worked very hard on creating a name that would appeal to the majority of people, and it certainly paid off: thousands of people are using linux just to be able to say \"OS/2? Hah. I've got Linux. What a cool name\". 386BSD made the mistake of putting a lot of numbers and weird abbreviations into the name, and is scaring away a lot of people just because it sounds too technical."},{"Title":"Smart House","Text":"A teenager wins a fully automated dream house in a competition, but soon the computer controlling it begins to take over and everything gets out of control, then Ben the teenager calms down the computer named Pat and everything goes back to normal."},{"Title":"True Words of a Genius Philosopher","Text":"Writing non-free software is not an ethically legitimate activity, so if people who do this run into trouble, that's good! All businesses based on non-free software ought to fail, and the sooner the better. -- Richard Stallman"},{"Title":"Linux -- Jim Wright","Text":"You know, if Red Hat was smart, they'd have a fake front on their office building just for visitors, where you would board a magical trolley that took you past the smiling singing oompah loompahs who take the raw linux sugar and make it into Red Hat candy goodness. Then they could use it as a motivator for employees... Shape up, or you're spending time working \"the ride\"!"},{"Title":"True Words of a Genius Philosopher","Text":"Free software is software that gives you the user the freedom to share, study and modify it. We call this free software because the user is free."},{"Title":"True Words of a Genius Philosopher","Text":"To use free software is to make a political and ethical choice asserting the right to learn, and share what we learn with others. Free software has become the foundation of a learning society where we share our knowledge in a way that others can build upon and enjoy."},{"Title":"True Words of a Genius Philosopher","Text":"Currently, many people use proprietary software that denies users these freedoms and benefits. If we make a copy and give it to a friend, if we try to figure out how the program works, if we put a copy on more than one of our own computers in our own home, we could be caught and fined or put in jail. That's what's in the fine print of the license agreement you accept when using proprietary software."},{"Title":"True Words of a Genius Philosopher","Text":"The corporations behind proprietary software will often spy on your activities and restrict you from sharing with others. And because our computers control much of our personal information and daily activities, proprietary software represents an unacceptable danger to a free society."},{"Title":"Politics -- Donald Trump","Text":"When Mexico sends its people, they're not sending their best. They're not sending you. They're sending people that have lots of problems, and they're bringing those problems with us. They're bringing drugs. They're bringing crime. Their rapists. And some, I assume, are good people."},{"Title":"Politics -- Sir Winston Churchill, 1952","Text":"A prisoner of war is a man who tries to kill you and fails, and then asks you not to kill him."},{"Title":"Politics -- Johnny Hart","Text":"Cutting the space budget really restores my faith in humanity. It eliminates dreams, goals, and ideals and lets us get straight to the business of hate, debauchery, and self-annihilation."},{"Title":"Politics -- Winston Churchill","Text":"Democracy is the worst form of government except all those other forms that have been tried from time to time."},{"Title":"Politics","Text":"Each person has the right to take part in the management of public affairs in his country, provided he has prior experience, a will to succeed, a university degree, influential parents, good looks, a curriculum vitae, two 3x4 snapshots, and a good tax record."},{"Title":"Politics -- A Yippie Proverb","Text":"Free Speech Is The Right To Shout 'Theater' In A Crowded Fire."},{"Title":"Politics -- Boss Tweed","Text":"I don't care who does the electing as long as I get to do the nominating."},{"Title":"Politics -- Francis Bellamy, 1892","Text":"I pledge allegiance to the flag of the United States of America and to the republic for which it stands, one nation, indivisible, with liberty and justice for all."},{"Title":"Politics -- Napoleon","Text":"It follows that any commander in chief who undertakes to carry out a plan which he considers defective is at fault; he must put forth his reasons, insist of the plan being changed, and finally tender his resignation rather than be the instrument of his army's downfall."},{"Title":"Politics","Text":"Only two kinds of witnesses exist. The first live in a neighborhood where a crime has been committed and in no circumstances have ever seen anything or even heard a shot. The second category are the neighbors of anyone who happens to be accused of the crime. These have always looked out of their windows when the shot was fired, and have noticed the accused person standing peacefully on his balcony a few yards away."},{"Title":"Politics -- Frederick Douglass","Text":"Slaves are generally expected to sing as well as to work ... I did not, when a slave, understand the deep meanings of those rude, and apparently incoherent songs. I was myself within the circle, so that I neither saw nor heard as those without might see and hear. They told a tale which was then altogether beyond my feeble comprehension: they were tones, loud, long and deep, breathing the prayer and complaint of souls boiling over with the bitterest anguish. Every tone was a testimony against slavery, and a prayer to God for deliverance from chains."}] \ No newline at end of file From e982b0fc1895ffbeb5fa465e77e20c06946728c3 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Mar 2017 10:56:51 +0200 Subject: [PATCH 41/42] forgot to up the version --- src/NadekoBot/Services/Impl/StatsService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/Impl/StatsService.cs b/src/NadekoBot/Services/Impl/StatsService.cs index ba0f5e37..f18845ad 100644 --- a/src/NadekoBot/Services/Impl/StatsService.cs +++ b/src/NadekoBot/Services/Impl/StatsService.cs @@ -16,7 +16,7 @@ namespace NadekoBot.Services.Impl private readonly DiscordShardedClient _client; private readonly DateTime _started; - public const string BotVersion = "1.26"; + public const string BotVersion = "1.26a"; public string Author => "Kwoth#2560"; public string Library => "Discord.Net"; From ca05b14f3e1e0da07f10e79256cb3e868ac9cb19 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 28 Mar 2017 11:56:31 +0200 Subject: [PATCH 42/42] Updated commandlist --- docs/Commands List.md | 130 ++++++++++++++++++++++-------------------- 1 file changed, 68 insertions(+), 62 deletions(-) diff --git a/docs/Commands List.md b/docs/Commands List.md index 1317f263..0ce3438d 100644 --- a/docs/Commands List.md +++ b/docs/Commands List.md @@ -1,6 +1,6 @@ You can support the project on patreon: or paypal: -##Table Of Contents +##Table of contents - [Help](#help) - [Administration](#administration) - [ClashOfClans](#clashofclans) @@ -16,7 +16,7 @@ You can support the project on patreon: or paypa ### Administration -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `.resetperms` | Resets the bot's permissions module on this server to the default value. **Requires Administrator server permission.** | `.resetperms` `.delmsgoncmd` | Toggles the automatic deletion of the user's successful command message to prevent chat flood. **Requires Administrator server permission.** | `.delmsgoncmd` @@ -40,27 +40,27 @@ Command and aliases | Description | Usage `.prune` `.clr` | `.prune` removes all Nadeko's messages in the last 100 messages. `.prune X` removes last `X` number of messages from the channel (up to 100). `.prune @Someone` removes all Someone's messages in the last 100 messages. `.prune @Someone X` removes last `X` number of 'Someone's' messages in the channel. | `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X` `.mentionrole` `.menro` | Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have the mention everyone permission. **Requires MentionEveryone server permission.** | `.menro RoleName` `.donators` | List of the lovely people who donated to keep this project alive. | `.donators` -`.donadd` | Add a donator to the database. **Bot Owner Only** | `.donadd Donate Amount` +`.donadd` | Add a donator to the database. **Bot owner only** | `.donadd Donate Amount` `.autoassignrole` `.aar` | Automaticaly assigns a specified role to every user who joins the server. **Requires ManageRoles server permission.** | `.aar` to disable, `.aar Role Name` to enable `.languageset` `.langset` | Sets this server's response language. If bot's response strings have been translated to that language, bot will use that language in this server. Reset by using `default` as the locale name. Provide no arguments to see currently set language. | `.langset de-DE ` or `.langset default` `.langsetdefault` `.langsetd` | Sets the bot's default response language. All servers which use a default locale will use this one. Setting to `default` will use the host's current culture. Provide no arguments to see currently set language. | `.langsetd en-US` or `.langsetd default` `.languageslist` `.langli` | List of languages for which translation (or part of it) exist atm. | `.langli` -`.logserver` | Enables or Disables ALL log events. If enabled, all log events will log to this channel. **Requires Administrator server permission.** **Bot Owner Only** | `.logserver enable` or `.logserver disable` -`.logignore` | Toggles whether the `.logserver` command ignores this channel. Useful if you have hidden admin channel and public log channel. **Requires Administrator server permission.** **Bot Owner Only** | `.logignore` -`.logevents` | Shows a list of all events you can subscribe to with `.log` **Requires Administrator server permission.** **Bot Owner Only** | `.logevents` -`.log` | Toggles logging event. Disables it if it is active anywhere on the server. Enables if it isn't active. Use `.logevents` to see a list of all events you can subscribe to. **Requires Administrator server permission.** **Bot Owner Only** | `.log userpresence` or `.log userbanned` -`.migratedata` | Migrate data from old bot configuration **Bot Owner Only** | `.migratedata` +`.logserver` | Enables or Disables ALL log events. If enabled, all log events will log to this channel. **Requires Administrator server permission.** **Bot owner only** | `.logserver enable` or `.logserver disable` +`.logignore` | Toggles whether the `.logserver` command ignores this channel. Useful if you have hidden admin channel and public log channel. **Requires Administrator server permission.** **Bot owner only** | `.logignore` +`.logevents` | Shows a list of all events you can subscribe to with `.log` **Requires Administrator server permission.** **Bot owner only** | `.logevents` +`.log` | Toggles logging event. Disables it if it is active anywhere on the server. Enables if it isn't active. Use `.logevents` to see a list of all events you can subscribe to. **Requires Administrator server permission.** **Bot owner only** | `.log userpresence` or `.log userbanned` +`.migratedata` | Migrate data from old bot configuration **Bot owner only** | `.migratedata` `.setmuterole` | Sets a name of the role which will be assigned to people who should be muted. Default is nadeko-mute. **Requires ManageRoles server permission.** | `.setmuterole Silenced` -`.mute` | Mutes a mentioned user both from speaking and chatting. **Requires ManageRoles server permission.** **Requires MuteMembers server permission.** | `.mute @Someone` +`.mute` | Mutes a mentioned user both from speaking and chatting. You can also specify time in minutes (up to 1440) for how long the user should be muted. **Requires ManageRoles server permission.** **Requires MuteMembers server permission.** | `.mute @Someone` or `.mute 30 @Someone` `.unmute` | Unmutes a mentioned user previously muted with `.mute` command. **Requires ManageRoles server permission.** **Requires MuteMembers server permission.** | `.unmute @Someone` `.chatmute` | Prevents a mentioned user from chatting in text channels. **Requires ManageRoles server permission.** | `.chatmute @Someone` `.chatunmute` | Removes a mute role previously set on a mentioned user with `.chatmute` which prevented him from chatting in text channels. **Requires ManageRoles server permission.** | `.chatunmute @Someone` `.voicemute` | Prevents a mentioned user from speaking in voice channels. **Requires MuteMembers server permission.** | `.voicemute @Someone` `.voiceunmute` | Gives a previously voice-muted user a permission to speak. **Requires MuteMembers server permission.** | `.voiceunmute @Someguy` -`.rotateplaying` `.ropl` | Toggles rotation of playing status of the dynamic strings you previously specified. **Bot Owner Only** | `.ropl` -`.addplaying` `.adpl` | Adds a specified string to the list of playing strings to rotate. Supported placeholders: `%servers%`, `%users%`, `%playing%`, `%queued%`, `%time%`, `%shardid%`, `%shardcount%`, `%shardguilds%`. **Bot Owner Only** | `.adpl` -`.listplaying` `.lipl` | Lists all playing statuses with their corresponding number. **Bot Owner Only** | `.lipl` -`.removeplaying` `.rmpl` `.repl` | Removes a playing string on a given number. **Bot Owner Only** | `.rmpl` +`.rotateplaying` `.ropl` | Toggles rotation of playing status of the dynamic strings you previously specified. **Bot owner only** | `.ropl` +`.addplaying` `.adpl` | Adds a specified string to the list of playing strings to rotate. Supported placeholders: `%servers%`, `%users%`, `%playing%`, `%queued%`, `%time%`, `%shardid%`, `%shardcount%`, `%shardguilds%`. **Bot owner only** | `.adpl` +`.listplaying` `.lipl` | Lists all playing statuses with their corresponding number. **Bot owner only** | `.lipl` +`.removeplaying` `.rmpl` `.repl` | Removes a playing string on a given number. **Bot owner only** | `.rmpl` `.antiraid` | Sets an anti-raid protection on the server. First argument is number of people which will trigger the protection. Second one is a time interval in which that number of people needs to join in order to trigger the protection, and third argument is punishment for those people (Kick, Ban, Mute) **Requires Administrator server permission.** | `.antiraid 5 20 Kick` `.antispam` | Stops people from repeating same message X times in a row. You can specify to either mute, kick or ban the offenders. Max message count is 10. **Requires Administrator server permission.** | `.antispam 3 Mute` or `.antispam 4 Kick` or `.antispam 6 Ban` `.antispamignore` | Toggles whether antispam ignores current channel. Antispam must be enabled. | `.antispamignore` @@ -73,19 +73,19 @@ Command and aliases | Description | Usage `.togglexclsar` `.tesar` | Toggles whether the self-assigned roles are exclusive. (So that any person can have only one of the self assignable roles) **Requires ManageRoles server permission.** | `.tesar` `.iam` | Adds a role to you that you choose. Role must be on a list of self-assignable roles. | `.iam Gamer` `.iamnot` `.iamn` | Removes a role to you that you choose. Role must be on a list of self-assignable roles. | `.iamn Gamer` -`.fwmsgs` | Toggles forwarding of non-command messages sent to bot's DM to the bot owners **Bot Owner Only** | `.fwmsgs` -`.fwtoall` | Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json file **Bot Owner Only** | `.fwtoall` -`.connectshard` | Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. **Bot Owner Only** | `.connectshard 2` -`.leave` | Makes Nadeko leave the server. Either server name or server ID is required. **Bot Owner Only** | `.leave 123123123331` -`.die` | Shuts the bot down. **Bot Owner Only** | `.die` -`.setname` `.newnm` | Gives the bot a new name. **Bot Owner Only** | `.newnm BotName` -`.setstatus` | Sets the bot's status. (Online/Idle/Dnd/Invisible) **Bot Owner Only** | `.setstatus Idle` -`.setavatar` `.setav` | Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot Owner Only** | `.setav http://i.imgur.com/xTG3a1I.jpg` -`.setgame` | Sets the bots game. **Bot Owner Only** | `.setgame with snakes` -`.setstream` | Sets the bots stream. First argument is the twitch link, second argument is stream name. **Bot Owner Only** | `.setstream TWITCHLINK Hello` -`.send` | Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prefix the channel id with `c:` and the user id with `u:`. **Bot Owner Only** | `.send serverid|c:channelid message` or `.send serverid|u:userid message` -`.announce` | Sends a message to all servers' default channel that bot is connected to. **Bot Owner Only** | `.announce Useless spam` -`.reloadimages` | Reloads images bot is using. Safe to use even when bot is being used heavily. **Bot Owner Only** | `.reloadimages` +`.fwmsgs` | Toggles forwarding of non-command messages sent to bot's DM to the bot owners **Bot owner only** | `.fwmsgs` +`.fwtoall` | Toggles whether messages will be forwarded to all bot owners or only to the first one specified in the credentials.json file **Bot owner only** | `.fwtoall` +`.connectshard` | Try (re)connecting a shard with a certain shardid when it dies. No one knows will it work. Keep an eye on the console for errors. **Bot owner only** | `.connectshard 2` +`.leave` | Makes Nadeko leave the server. Either server name or server ID is required. **Bot owner only** | `.leave 123123123331` +`.die` | Shuts the bot down. **Bot owner only** | `.die` +`.setname` `.newnm` | Gives the bot a new name. **Bot owner only** | `.newnm BotName` +`.setstatus` | Sets the bot's status. (Online/Idle/Dnd/Invisible) **Bot owner only** | `.setstatus Idle` +`.setavatar` `.setav` | Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot owner only** | `.setav http://i.imgur.com/xTG3a1I.jpg` +`.setgame` | Sets the bots game. **Bot owner only** | `.setgame with snakes` +`.setstream` | Sets the bots stream. First argument is the twitch link, second argument is stream name. **Bot owner only** | `.setstream TWITCHLINK Hello` +`.send` | Sends a message to someone on a different server through the bot. Separate server and channel/user ids with `|` and prefix the channel id with `c:` and the user id with `u:`. **Bot owner only** | `.send serverid|c:channelid message` or `.send serverid|u:userid message` +`.announce` | Sends a message to all servers' default channel that bot is connected to. **Bot owner only** | `.announce Useless spam` +`.reloadimages` | Reloads images bot is using. Safe to use even when bot is being used heavily. **Bot owner only** | `.reloadimages` `.greetdel` `.grdel` | Sets the time it takes (in seconds) for greet messages to be auto-deleted. Set it to 0 to disable automatic deletion. **Requires ManageServer server permission.** | `.greetdel 0` or `.greetdel 30` `.greet` | Toggles anouncements on the current channel when someone joins the server. **Requires ManageServer server permission.** | `.greet` `.greetmsg` | Sets a new join announcement message which will be shown in the server's channel. Type `%user%` if you want to mention the new member. Using it with no message will show the current greet message. You can use embed json from instead of a regular text, if you want the message to be embedded. **Requires ManageServer server permission.** | `.greetmsg Welcome, %user%.` @@ -94,13 +94,15 @@ Command and aliases | Description | Usage `.bye` | Toggles anouncements on the current channel when someone leaves the server. **Requires ManageServer server permission.** | `.bye` `.byemsg` | Sets a new leave announcement message. Type `%user%` if you want to show the name the user who left. Type `%id%` to show id. Using this command with no message will show the current bye message. You can use embed json from instead of a regular text, if you want the message to be embedded. **Requires ManageServer server permission.** | `.byemsg %user% has left.` `.byedel` | Sets the time it takes (in seconds) for bye messages to be auto-deleted. Set it to `0` to disable automatic deletion. **Requires ManageServer server permission.** | `.byedel 0` or `.byedel 30` +`.vcrole` | Sets or resets a role which will be given to users who join the voice channel you're in when you run this command. Provide no role name to disable. You must be in a voice channel to run this command. **Requires ManageRoles server permission.** **Requires ManageChannels server permission.** | `.vcrole SomeRole` or `.vcrole` +`.vcrolelist` | Shows a list of currently set voice channel roles. | `.vcrolelist` `.voice+text` `.v+t` | Creates a text channel for each voice channel only users in that voice channel can see. If you are server owner, keep in mind you will see them all the time regardless. **Requires ManageRoles server permission.** **Requires ManageChannels server permission.** | `.v+t` `.cleanvplust` `.cv+t` | Deletes all text channels ending in `-voice` for which voicechannels are not found. Use at your own risk. **Requires ManageChannels server permission.** **Requires ManageRoles server permission.** | `.cleanv+t` ###### [Back to ToC](#table-of-contents) ### ClashOfClans -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `,createwar` `,cw` | Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. **Requires ManageMessages server permission.** | `,cw 15 The Enemy Clan` `,startwar` `,sw` | Starts a war with a given number. | `,sw 15` @@ -115,31 +117,33 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### CustomReactions -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `.addcustreact` `.acr` | Add a custom reaction with a trigger and a response. Running this command in server requires the Administration permission. Running this command in DM is Bot Owner only and adds a new global custom reaction. Guide here: | `.acr "hello" Hi there %user%` `.listcustreact` `.lcr` | Lists global or server custom reactions (20 commands per page). Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. Specifying `all` argument instead of the number will DM you a text file with a list of all custom reactions. | `.lcr 1` or `.lcr all` `.listcustreactg` `.lcrg` | Lists global or server custom reactions (20 commands per page) grouped by trigger, and show a number of responses for each. Running the command in DM will list global custom reactions, while running it in server will list that server's custom reactions. | `.lcrg 1` `.showcustreact` `.scr` | Shows a custom reaction's response on a given ID. | `.scr 1` `.delcustreact` `.dcr` | Deletes a custom reaction on a specific index. If ran in DM, it is bot owner only and deletes a global custom reaction. If ran in a server, it requires Administration privileges and removes server custom reaction. | `.dcr 5` -`.crstatsclear` | Resets the counters on `.crstats`. You can specify a trigger to clear stats only for that trigger. **Bot Owner Only** | `.crstatsclear` or `.crstatsclear rng` +`.crdm` | Toggles whether the response message of the custom reaction will be sent as a direct message. | `.crad 44` +`.crad` | Toggles whether the message triggering the custom reaction will be automatically deleted. | `.crad 59` +`.crstatsclear` | Resets the counters on `.crstats`. You can specify a trigger to clear stats only for that trigger. **Bot owner only** | `.crstatsclear` or `.crstatsclear rng` `.crstats` | Shows a list of custom reactions and the number of times they have been executed. Paginated with 10 per page. Use `.crstatsclear` to reset the counters. | `.crstats` or `.crstats 3` ###### [Back to ToC](#table-of-contents) ### Gambling -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `$raffle` | Prints a name and ID of a random user from the online list from the (optional) role. | `$raffle` or `$raffle RoleName` `$cash` `$$$` | Check how much currency a person has. (Defaults to yourself) | `$$$` or `$$$ @SomeGuy` `$give` | Give someone a certain amount of currency. | `$give 1 "@SomeGuy"` -`$award` | Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. **Bot Owner Only** | `$award 100 @person` or `$award 5 Role Of Gamblers` -`$take` | Takes a certain amount of currency from someone. **Bot Owner Only** | `$take 1 "@someguy"` +`$award` | Awards someone a certain amount of currency. You can also specify a role name to award currency to all users in a role. **Bot owner only** | `$award 100 @person` or `$award 5 Role Of Gamblers` +`$take` | Takes a certain amount of currency from someone. **Bot owner only** | `$take 1 "@someguy"` `$betroll` `$br` | Bets a certain amount of currency and rolls a dice. Rolling over 66 yields x2 of your currency, over 90 - x4 and 100 x10. | `$br 5` `$leaderboard` `$lb` | Displays the bot's currency leaderboard. | `$lb` `$race` | Starts a new animal race. | `$race` `$joinrace` `$jr` | Joins a new race. You can specify an amount of currency for betting (optional). You will get YourBet*(participants-1) back if you win. | `$jr` or `$jr 5` -`$startevent` | Starts one of the events seen on public nadeko. **Bot Owner Only** | `$startevent flowerreaction` +`$startevent` | Starts one of the events seen on public nadeko. **Bot owner only** | `$startevent flowerreaction` `$roll` | Rolls 0-100. If you supply a number `X` it rolls up to 30 normal dice. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`. `Y` can be a letter 'F' if you want to roll fate dice instead of dnd. | `$roll` or `$roll 7` or `$roll 3d5` or `$roll 5dF` `$rolluo` | Rolls `X` normal dice (up to 30) unordered. If you split 2 numbers with letter `d` (`xdy`) it will roll `X` dice from 1 to `y`. | `$rolluo` or `$rolluo 7` or `$rolluo 3d5` `$nroll` | Rolls in a given range. | `$nroll 5` (rolls 0-5) or `$nroll 5-15` @@ -147,10 +151,10 @@ Command and aliases | Description | Usage `$shuffle` `$sh` | Reshuffles all cards back into the deck. | `$sh` `$flip` | Flips coin(s) - heads or tails, and shows an image. | `$flip` or `$flip 3` `$betflip` `$bf` | Bet to guess will the result be heads or tails. Guessing awards you 1.95x the currency you've bet (rounded up). Multiplier can be changed by the bot owner. | `$bf 5 heads` or `$bf 3 t` -`$slotstats` | Shows the total stats of the slot command for this bot's session. **Bot Owner Only** | `$slotstats` -`$slottest` | Tests to see how much slots payout for X number of plays. **Bot Owner Only** | `$slottest 1000` +`$slotstats` | Shows the total stats of the slot command for this bot's session. **Bot owner only** | `$slotstats` +`$slottest` | Tests to see how much slots payout for X number of plays. **Bot owner only** | `$slottest 1000` `$slot` | Play Nadeko slots. Max bet is 999. 3 seconds cooldown per user. | `$slot 5` -`$claimwaifu` `$claim` | Claim a waifu for yourself by spending currency. You must spend atleast 10% more than her current value unless she set `$affinity` towards you. | `$claim 50 @Himesama` +`$claimwaifu` `$claim` | Claim a waifu for yourself by spending currency. You must spend at least 10% more than her current value unless she set `$affinity` towards you. | `$claim 50 @Himesama` `$divorce` | Releases your claim on a specific waifu. You will get some of the money you've spent back unless that waifu has an affinity towards you. 6 hours cooldown. | `$divorce @CheatingSloot` `$affinity` | Sets your affinity towards someone you want to be claimed by. Setting affinity will reduce their `$claim` on you by 20%. You can leave second argument empty to clear your affinity. 30 minutes cooldown. | `$affinity @MyHusband` or `$affinity` `$waifus` `$waifulb` | Shows top 9 waifus. | `$waifus` @@ -159,7 +163,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Games -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `>choose` | Chooses a thing from a list of things | `>choose Get up;Sleep;Sleep more` `>8ball` | Ask the 8ball a yes/no question. | `>8ball should I do something` @@ -167,7 +171,7 @@ Command and aliases | Description | Usage `>rategirl` | Use the universal hot-crazy wife zone matrix to determine the girl's worth. It is everything young men need to know about women. At any moment in time, any woman you have previously located on this chart can vanish from that location and appear anywhere else on the chart. | `>rategirl @SomeGurl` `>linux` | Prints a customizable Linux interjection | `>linux Spyware Windows` `>leet` | Converts a text to leetspeak with 6 (1-6) severity levels | `>leet 3 Hello` -`>acrophobia` `>acro` | Starts an Acrophobia game. Second argment is optional round length in seconds. (default is 60) | `>acro` or `>acro 30` +`>acrophobia` `>acro` | Starts an Acrophobia game. Second argument is optional round length in seconds. (default is 60) | `>acro` or `>acro 30` `>cleverbot` | Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Custom reactions starting with %mention% won't work if cleverbot is enabled. **Requires ManageMessages server permission.** | `>cleverbot` `>hangmanlist` | Shows a list of hangman term types. | `> hangmanlist` `>hangman` | Starts a game of hangman in the channel. Use `>hangmanlist` to see a list of available term types. Defaults to 'all'. | `>hangman` or `>hangman movies` @@ -180,9 +184,9 @@ Command and aliases | Description | Usage `>pollend` | Stops active poll on this server and prints the results in this channel. **Requires ManageMessages server permission.** | `>pollend` `>typestart` | Starts a typing contest. | `>typestart` `>typestop` | Stops a typing contest on the current channel. | `>typestop` -`>typeadd` | Adds a new article to the typing contest. **Bot Owner Only** | `>typeadd wordswords` +`>typeadd` | Adds a new article to the typing contest. **Bot owner only** | `>typeadd wordswords` `>typelist` | Lists added typing articles with their IDs. 15 per page. | `>typelist` or `>typelist 3` -`>typedel` | Deletes a typing article given the ID. **Bot Owner Only** | `>typedel 3` +`>typedel` | Deletes a typing article given the ID. **Bot owner only** | `>typedel 3` `>tictactoe` `>ttt` | Starts a game of tic tac toe. Another user must run the command in the same channel in order to accept the challenge. Use numbers 1-9 to play. 15 seconds per move. | >ttt `>trivia` `>t` | Starts a game of trivia. You can add `nohint` to prevent hints. First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. | `>t` or `>t 5 nohint` `>tl` | Shows a current trivia leaderboard. | `>tl` @@ -191,19 +195,19 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Help -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `-modules` `-mdls` | Lists all bot modules. | `-modules` `-commands` `-cmds` | List all of the bot's commands from a certain module. You can either specify the full name or only the first few letters of the module name. | `-commands Administration` or `-cmds Admin` `-help` `-h` | Either shows a help for a single command, or DMs you help link if no arguments are specified. | `-h -cmds` or `-h` -`-hgit` | Generates the commandlist.md file. **Bot Owner Only** | `-hgit` +`-hgit` | Generates the commandlist.md file. **Bot owner only** | `-hgit` `-readme` `-guide` | Sends a readme and a guide links to the channel. | `-readme` or `-guide` `-donate` | Instructions for helping the project financially. | `-donate` ###### [Back to ToC](#table-of-contents) ### Music -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `!!next` `!!n` | Goes to the next song in the queue. You have to be in the same voice channel as the bot. You can skip multiple songs, but in that case songs will not be requeued if !!rcs or !!rpl is enabled. | `!!n` or `!!n 5` `!!stop` `!!s` | Stops the music and clears the playlist. Stays in the channel. | `!!s` @@ -219,9 +223,9 @@ Command and aliases | Description | Usage `!!shuffle` `!!sh` | Shuffles the current playlist. | `!!sh` `!!playlist` `!!pl` | Queues up to 500 songs from a youtube playlist specified by a link, or keywords. | `!!pl playlist link or name` `!!soundcloudpl` `!!scpl` | Queue a Soundcloud playlist using a link. | `!!scpl soundcloudseturl` -`!!localplaylst` `!!lopl` | Queues all songs from a directory. **Bot Owner Only** | `!!lopl C:/music/classical` +`!!localplaylst` `!!lopl` | Queues all songs from a directory. **Bot owner only** | `!!lopl C:/music/classical` `!!radio` `!!ra` | Queues a radio stream from a link. It can be a direct mp3 radio stream, .m3u, .pls .asx or .xspf (Usage Video: ) | `!!ra radio link here` -`!!local` `!!lo` | Queues a local file by specifying a full path. **Bot Owner Only** | `!!lo C:/music/mysong.mp3` +`!!local` `!!lo` | Queues a local file by specifying a full path. **Bot owner only** | `!!lo C:/music/mysong.mp3` `!!remove` `!!rm` | Remove a song by its # in the queue, or 'all' to remove whole queue. | `!!rm 5` `!!movesong` `!!ms` | Moves a song from one position to another. | `!!ms 5>3` `!!setmaxqueue` `!!smq` | Sets a maximum queue size. Supply 0 or no argument to have no limit. | `!!smq 50` or `!!smq` @@ -239,7 +243,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### NSFW -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `~hentai` | Shows a hentai image from a random website (gelbooru or danbooru or konachan or atfbooru or yandere) with a given tag. Tag is optional but preferred. Only 1 tag allowed. | `~hentai yuri` `~autohentai` | Posts a hentai every X seconds with a random tag from the provided tags. Use `|` to separate tags. 20 seconds minimum. Provide no arguments to disable. **Requires ManageMessages channel permission.** | `~autohentai 30 yuri|tail|long_hair` or `~autohentai` @@ -257,7 +261,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Permissions -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `;verbose` `;v` | Sets whether to show when a command/module is blocked. | `;verbose true` `;permrole` `;pr` | Sets a role which can change permissions. Supply no parameters to see the current one. Default is 'Nadeko'. | `;pr role` @@ -276,9 +280,9 @@ Command and aliases | Description | Usage `;allrolemdls` `;arm` | Enable or disable all modules for a specific role. | `;arm [enable/disable] MyRole` `;allusrmdls` `;aum` | Enable or disable all modules for a specific user. | `;aum enable @someone` `;allsrvrmdls` `;asm` | Enable or disable all modules for your server. | `;asm [enable/disable]` -`;ubl` | Either [add]s or [rem]oves a user specified by a Mention or an ID from a blacklist. **Bot Owner Only** | `;ubl add @SomeUser` or `;ubl rem 12312312313` -`;cbl` | Either [add]s or [rem]oves a channel specified by an ID from a blacklist. **Bot Owner Only** | `;cbl rem 12312312312` -`;sbl` | Either [add]s or [rem]oves a server specified by a Name or an ID from a blacklist. **Bot Owner Only** | `;sbl add 12312321312` or `;sbl rem SomeTrashServer` +`;ubl` | Either [add]s or [rem]oves a user specified by a Mention or an ID from a blacklist. **Bot owner only** | `;ubl add @SomeUser` or `;ubl rem 12312312313` +`;cbl` | Either [add]s or [rem]oves a channel specified by an ID from a blacklist. **Bot owner only** | `;cbl rem 12312312312` +`;sbl` | Either [add]s or [rem]oves a server specified by a Name or an ID from a blacklist. **Bot owner only** | `;sbl add 12312321312` or `;sbl rem SomeTrashServer` `;cmdcooldown` `;cmdcd` | Sets a cooldown per user for a command. Set it to 0 to remove the cooldown. | `;cmdcd "some cmd" 5` `;allcmdcooldowns` `;acmdcds` | Shows a list of all commands and their respective cooldowns. | `;acmdcds` `;srvrfilterinv` `;sfi` | Toggles automatic deletion of invites posted in the server. Does not affect the Bot Owner. | `;sfi` @@ -291,7 +295,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Pokemon -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `>attack` | Attacks a target with the given move. Use `>movelist` to see a list of moves your type can use. | `>attack "vine whip" @someguy` `>movelist` `>ml` | Lists the moves you are able to use | `>ml` @@ -302,7 +306,7 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Searches -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- `~weather` `~we` | Shows weather data for a specified city. You can also specify a country after a comma. | `~we Moscow, RU` `~youtube` `~yt` | Searches youtubes and shows the first result | `~yt query` @@ -355,7 +359,7 @@ Command and aliases | Description | Usage `~removestream` `~rms` | Removes notifications of a certain streamer from a certain platform on this channel. **Requires ManageMessages server permission.** | `~rms Twitch SomeGuy` or `~rms Beam SomeOtherGuy` `~checkstream` `~cs` | Checks if a user is online on a certain streaming platform. | `~cs twitch MyFavStreamer` `~translate` `~trans` | Translates from>to text. From the given language to the destination language. | `~trans en>fr Hello` -`~autotrans` `~at` | Starts automatic translation of all messages by users who set their `~atl` in this channel. You can set "del" argument to automatically delete all translated user messages. **Requires Administrator server permission.** **Bot Owner Only** | `~at` or `~at del` +`~autotrans` `~at` | Starts automatic translation of all messages by users who set their `~atl` in this channel. You can set "del" argument to automatically delete all translated user messages. **Requires Administrator server permission.** **Bot owner only** | `~at` or `~at del` `~autotranslang` `~atl` | Sets your source and target language to be used with `~at`. Specify no arguments to remove previously set value. | `~atl en>fr` `~translangs` | Lists the valid languages for translation. | `~translangs` `~xkcd` | Shows a XKCD comic. No arguments will retrieve random one. Number argument will retrieve a specific comic, and "latest" will get the latest one. | `~xkcd` or `~xkcd 1400` or `~xkcd latest` @@ -363,12 +367,12 @@ Command and aliases | Description | Usage ###### [Back to ToC](#table-of-contents) ### Utility -Command and aliases | Description | Usage +Commands and aliases | Description | Usage ----------------|--------------|------- -`.rotaterolecolor` `.rrc` | Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. **Requires ManageRoles server permission.** **Bot Owner Only** | `.rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `.rrc 0 MyLsdRole` +`.rotaterolecolor` `.rrc` | Rotates a roles color on an interval with a list of supplied colors. First argument is interval in seconds (Minimum 60). Second argument is a role, followed by a space-separated list of colors in hex. Provide a rolename with a 0 interval to disable. **Requires ManageRoles server permission.** **Bot owner only** | `.rrc 60 MyLsdRole #ff0000 #00ff00 #0000ff` or `.rrc 0 MyLsdRole` `.togethertube` `.totube` | Creates a new room on and shows the link in the chat. | `.totube` `.whosplaying` `.whpl` | Shows a list of users who are playing the specified game. | `.whpl Overwatch` -`.inrole` | Lists every person from the provided role or roles, separated with space, on this server. You can use role IDs, role names (in quotes if it has multiple words), or role mention If the list is too long for 1 message, you must have Manage Messages permission. | `.inrole Role` or `.inrole Role1 "Role 2" @role3` +`.inrole` | Lists every person from the specified role on this server. You can use role ID, role name. | `.inrole Some Role` `.checkmyperms` | Checks your user-specific permissions on this channel. | `.checkmyperms` `.userid` `.uid` | Shows user ID. | `.uid` or `.uid "@SomeGuy"` `.channelid` `.cid` | Shows current channel ID. | `.cid` @@ -380,12 +384,14 @@ Command and aliases | Description | Usage `.shardid` | Shows which shard is a certain guild on, by guildid. | `.shardid 117523346618318850` `.stats` | Shows some basic stats for Nadeko. | `.stats` `.showemojis` `.se` | Shows a name and a link to every SPECIAL emoji in the message. | `.se A message full of SPECIAL emojis` -`.listservers` | Lists servers the bot is on with some basic info. 15 per page. **Bot Owner Only** | `.listservers 3` -`.savechat` | Saves a number of messages to a text file and sends it to you. **Bot Owner Only** | `.savechat 150` -`.activity` | Checks for spammers. **Bot Owner Only** | `.activity` +`.listservers` | Lists servers the bot is on with some basic info. 15 per page. **Bot owner only** | `.listservers 3` +`.savechat` | Saves a number of messages to a text file and sends it to you. **Bot owner only** | `.savechat 150` +`.activity` | Checks for spammers. **Bot owner only** | `.activity` `.calculate` `.calc` | Evaluate a mathematical expression. | `.calc 1+1` `.calcops` | Shows all available operations in the `.calc` command | `.calcops` -`.scsc` | Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. **Bot Owner Only** | `.scsc` +`.alias` `.cmdmap` | Create a custom alias for a certain Nadeko command. Provide no alias to remove the existing one. **Requires Administrator server permission.** | `.alias allin $bf 100 h` or `.alias "linux thingy" >loonix Spyware Windows` +`.aliaslist` `.cmdmaplist` `.aliases` | Shows the list of currently set aliases. Paginated. | `.aliaslist` or `.aliaslist 3` +`.scsc` | Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. **Bot owner only** | `.scsc` `.jcsc` | Joins current channel to an instance of cross server channel using the token. **Requires ManageServer server permission.** | `.jcsc TokenHere` `.lcsc` | Leaves a cross server channel instance from this channel. **Requires ManageServer server permission.** | `.lcsc` `.serverinfo` `.sinfo` | Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. | `.sinfo Some Server` @@ -399,9 +405,9 @@ Command and aliases | Description | Usage `...` | Shows a random quote with a specified name. | `... abc` `.qsearch` | Shows a random quote for a keyword that contains any text specified in the search. | `.qsearch keyword text` `..` | Adds a new quote with the specified name and message. | `.. sayhi Hi` -`.deletequote` `.delq` | Deletes a random quote with the specified keyword. You have to either be server Administrator or the creator of the quote to delete it. | `.delq abc` +`.deletequote` `.delq` | Deletes a quote with the specified ID. You have to be either server Administrator or the creator of the quote to delete it. | `.delq 123456` `.delallq` `.daq` | Deletes all quotes on a specified keyword. **Requires Administrator server permission.** | `.delallq kek` `.remind` | Sends a message to you or a channel after certain amount of time. First argument is `me`/`here`/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword) message. | `.remind me 1d5h Do something` or `.remind #general 1m Start now!` -`.remindtemplate` | Sets message for when the remind is triggered. Available placeholders are `%user%` - user who ran the command, `%message%` - Message specified in the remind, `%target%` - target channel of the remind. **Bot Owner Only** | `.remindtemplate %user%, do %message%!` +`.remindtemplate` | Sets message for when the remind is triggered. Available placeholders are `%user%` - user who ran the command, `%message%` - Message specified in the remind, `%target%` - target channel of the remind. **Bot owner only** | `.remindtemplate %user%, do %message%!` `.convertlist` | List of the convertible dimensions and currencies. | `.convertlist` `.convert` | Convert quantities. Use `.convertlist` to see supported dimensions and currencies. | `.convert m km 1000`