diff --git a/flashdex.js b/flashdex.js index c9cf6d9..8afd3d1 100644 --- a/flashdex.js +++ b/flashdex.js @@ -8,10 +8,10 @@ $(document).ready(function() { var G5 = [494, 649]; var G6 = [650, 721]; var G7 = [722, 809]; - var G8 = [810, 890] - var MEGA = [891, 940]; - var REG = [941, 971]; - var GIGA = [972, 1000]; + var G8 = [810, 898] + var MEGA = [899, 948]; + var REG = [949, 985]; + var GIGA = [986, 1017]; /************ GAME *************/ /*******************************/ @@ -146,10 +146,10 @@ $(document).ready(function() { // multiple artworks function imageType(result) { var four_types = [351, 386, 585, 586, 676, 741, 800]; - var three_types = [249, 250, 384, 412, 413, 718, 745]; + var three_types = [249, 250, 384, 412, 413, 718, 745, 898]; var two_types = [251, 252, 255, 258, 374, 387, 390, 393, 421, 422, 423, 487, 492, 495, 498, 501, 521, 550, 555, 592, 593, 641, 642, 643, 644, 645, 647, 648, 668, 678, 681, 720, 746, 774, 791, 792, 802, 849, - 876, 877, 888, 889]; + 876, 877, 888, 889, 892, "G892"]; function no_randomizer() { if (result === 25) diff --git a/index.html b/index.html index b0650a5..e8a6a5c 100644 --- a/index.html +++ b/index.html @@ -28,7 +28,7 @@
wooloo

What is Pokétest?

-

There are now almost 900 Pocket Monsters, and a handful number of alternative forms. It's getting pretty tricky to know them all, let alone to catch them all. With Pokétest, you can train yourself and become unbeatable! Filter by generation, language and even by Mega Evolutions or Regional Forms!

+

There are now almost 900 Pocket Monsters, and a handful number of alternative forms. It's getting pretty tricky to know them all, let alone to catch them all. With Pokétest, you can train yourself and become unbeatable! Filter by generation, language and even by Mega Evolutions, Regional or Gigantamax Forms!

You can play with your keyboard: just press 1, 2, 3 or 4 to choose the answer!

@@ -78,11 +78,11 @@
+ (37)
+ (32)
@@ -105,7 +105,7 @@

Number of questions

- + - + seconds diff --git a/pokemon.json b/pokemon.json index 7c14e1e..e3ea1f3 100644 --- a/pokemon.json +++ b/pokemon.json @@ -890,6 +890,14 @@ { "num": 888, "fr": "Zacian", "en": "Zacian", "ja": "ザシアン", "romaji": "Zashian", "de": "Zacian", "kr": "자시안", "cn": "蒼響", "cs": "苍响", "origin": "Galar"}, { "num": 889, "fr": "Zamazenta", "en": "Zamazenta", "ja": "ザマゼンタ", "romaji": "Zamazenta", "de": "Zamazenta", "kr": "자마젠타", "cn": "藏瑪然特", "cs": "藏玛然特", "origin": "Galar"}, { "num": 890, "fr": "Éthernatos", "en": "Eternatus", "ja": "ムゲンダイナ", "romaji": "Mugendaina", "de": "Endynalos", "kr": "무한다이노", "cn": "無極汰那", "cs": "无极汰那", "origin": "Galar"}, +{ "num": 891, "fr": "Wushours", "en": "Kubfu", "ja": "ダクマ", "romaji": "Dakuma", "de": "Dakuma", "kr": "치고마 ", "cn": "熊徒弟", "cs": "熊徒弟", "origin": "Galar"}, +{ "num": 892, "fr": "Shifours", "en": "Urshifu", "ja": "ウーラオス", "romaji": "Ūraosu", "de": "Wulaosu", "kr": "우라오스", "cn": "武道熊師", "cs": "武道熊师", "origin": "Galar"}, +{ "num": 893, "fr": "Zarude", "en": "Zarude", "ja": "ザルード", "romaji": "Zarūdo", "de": "Zarude", "kr": "자루도", "cn": "薩戮德", "cs": "萨戮德", "origin": "Galar"}, +{ "num": 894, "fr": "Regieleki", "en": "Regieleki", "ja": "レジエレキ", "romaji": "Rejiereki", "de": "Regieleki", "kr": "레지에레키", "cn": "雷吉艾勒奇", "cs": "雷吉艾勒奇", "origin": "Galar"}, +{ "num": 895, "fr": "Regidrago", "en": "Regidrago", "ja": "レジドラゴ", "romaji": "Rejidorago", "de": "Regidrago", "kr": "레지드래고", "cn": "雷吉鐸拉戈", "cs": "雷吉铎拉戈", "origin": "Galar"}, +{ "num": 896, "fr": "Blizzeval", "en": "Glastrier", "ja": "ブリザポス", "romaji": "Burizaposu", "de": "Polaross", "kr": "블리자포스", "cn": "雪暴馬", "cs": "雪暴马", "origin": "Galar"}, +{ "num": 897, "fr": "Spectreval", "en": "Spectrier", "ja": " レイスポス", "romaji": "Reisuposu", "de": "Phantoross", "kr": "레이스포스", "cn": "靈幽馬", "cs": "灵幽马", "origin": "Galar"}, +{ "num": 898, "fr": "Sylveroy", "en": "Calyrex", "ja": "バドレックス", "romaji": "Badorekkusu", "de": "Coronospa", "kr": "버드렉스", "cn": "蕾冠王", "cs": "蕾冠王", "origin": "Galar"}, { "num": "M3", "fr": "Méga-Florizarre", "en": "Mega Venusaur", "ja": "メガ フシギバナ", "romaji": "Mega Fushigibana", "de": "Mega-Bisaflor", "kr": "메가이상해꽃", "cn": "超級妙蛙花", "cs": "超级妙蛙花", "type": "mega"}, { "num": "M6X", "fr": "Méga-Dracaufeu X", "en": "Mega Charizard X", "ja": "メガ リザードン X", "romaji": "Mega Lizardon X", "de": "Mega-Glurak X", "kr": "메가리자몽 X", "cn": "超級噴火龍X", "cs": "超级喷火龙X", "type": "mega"}, { "num": "M6Y", "fr": "Méga-Dracaufeu Y", "en": "Mega Charizard Y", "ja": "メガ リザードン Y", "romaji": "Mega Lizardon Y", "de": "Mega-Glurak Y", "kr": "메가리자몽 Y", "cn": "超級噴火龍Y", "cs": "超级喷火龙Y", "type": "mega"}, @@ -961,9 +969,15 @@ { "num": "R52G", "fr": "Miaouss de Galar", "en": "Galarian Meowth", "ja": "ニャース（ガラル）", "romaji": "Nyāsu (Gararu)", "de": "Galar-Mauzi", "kr": "나옹(가라르)", "cn": "喵喵（伽勒爾）", "cs": "喵喵（伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R77", "fr": "Ponyta de Galar", "en": "Galarian Ponyta", "ja": "ポニータ（ガラル）", "romaji": "Ponīta (Gararu)", "de": "Galar-Ponita", "kr": "포니타(가라르)", "cn": "小火馬（伽勒爾）", "cs": "小火马（伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R78", "fr": "Galopa de Galar", "en": "Galarian Rapidash", "ja": "ギャロップ（ガラル）", "romaji": "Gyaroppu (Gararu)", "de": "Galar-Gallopa", "kr": "날쌩마(가라르)", "cn": "烈焰馬（伽勒爾）", "cs": "烈焰马（伽勒尔）", "origin": "Galar", "type": "regional"}, +{ "num": "R79", "fr": "Ramoloss de Galar", "en": "Galarian Slowpoke", "ja": "ヤドン（ガラル）", "romaji": "Yadon (Gararu)", "de": "Galar-Flegmon", "kr": "야돈(가라르)", "cn": "呆呆獸 （伽勒爾）", "cs": "呆呆兽 （伽勒尔）", "origin": "Galar", "type": "regional"}, +{ "num": "R80", "fr": "Flagadoss de Galar", "en": "Galarian Slowbro", "ja": "ヤドラン（ガラル）", "romaji": "Yadoran (Gararu)", "de": "Galar-Lahmus", "kr": "야도란(가라르)", "cn": "呆殼獸 （伽勒爾）", "cs": "呆壳兽 （伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R83", "fr": "Canarticho de Galar", "en": "Galarian Farfetch'd", "ja": "カモネギ（ガラル）", "romaji": "Kamonegi (Gararu)", "de": "Galar-Porenta", "kr": "파오리(가라르)", "cn": "大蔥鴨（伽勒爾）", "cs": "大葱鸭（伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R110", "fr": "Smogogo de Galar", "en": "Galarian Weezing", "ja": "マタドガス（ガラル）", "romaji": "Matadogasu (Gararu)", "de": "Galar-Smogmog", "kr": "또도가스(가라르)", "cn": "雙彈瓦斯（伽勒爾）", "cs": "双弹瓦斯（伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R122", "fr": "M. Mime de Galar", "en": "Galarian Mr. Mime", "ja": "バリヤード（ガラル）", "romaji": "Bariyādo (Gararu)", "de": "Galar-Pantimos", "kr": "마임맨(가라르)", "cn": "魔牆人偶（伽勒爾）", "cs": "魔墙人偶（伽勒尔）", "origin": "Galar", "type": "regional"}, +{ "num": "R144", "fr": "Artikodin de Galar", "en": "Galarian Articuno", "ja": "フリーザー（ガラル）", "romaji": "Furīzā (Gararu)", "de": "Galar-Arktos", "kr": "프리져(가라르)", "cn": "急凍鳥 （伽勒爾）", "cs": " 急冻鸟 （伽勒尔）", "origin": "Galar", "type": "regional"}, +{ "num": "R145", "fr": "Électhor de Galar", "en": "Galarian Zapdos", "ja": "サンダー（ガラル）", "romaji": "Sandā (Gararu)", "de": "Galar-Zapdos", "kr": "썬더(가라르)", "cn": "閃電鳥 （伽勒爾）", "cs": "闪电鸟 （伽勒尔）", "origin": "Galar", "type": "regional"}, +{ "num": "R146", "fr": "Suflura de Galar", "en": "Galarian Moltres", "ja": "ファイヤー（ガラル）", "romaji": "Faiyā (Gararu)", "de": "Galar-Lavados", "kr": "파이어(가라르)", "cn": "（伽勒爾）", "cs": "（伽勒尔）", "origin": "Galar", "type": "regional"}, +{ "num": "R199", "fr": "Roigada de Galar", "en": "Galarian Slowking", "ja": "ヤドキング（ガラル）", "romaji": "Yadokingu (Gararu)", "de": "Galar-Laschoking", "kr": "야도킹(가라르)", "cn": "火焰鳥（伽勒爾）", "cs": "火焰鸟 （伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R222", "fr": "Corayon de Galar", "en": "Galarian Corsola", "ja": "サニーゴ（ガラル）", "romaji": "Sanīgo (Gararu)", "de": "Galar-Corasonn", "kr": "코산호(가라르)", "cn": "太陽珊瑚（伽勒爾）", "cs": "太阳珊瑚（伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R263", "fr": "Zigzaton de Galar", "en": "Galarian Zigzagoon", "ja": "ジグザグマ（ガラル）", "romaji": "Jiguzaguma (Gararu)", "de": "Galar-Zigzachs", "kr": "지그제구리(가라르)", "cn": "蛇紋熊（伽勒爾）", "cs": "蛇纹熊（伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R264", "fr": "Linéon de Galar", "en": "Galarian Linoone", "ja": "マッスグマ（ガラル）", "romaji": "Massuguma (Gararu)", "de": "Galar-Geradaks", "kr": "직구리(가라르)", "cn": "直衝熊（伽勒爾）", "cs": "直冲熊（伽勒尔）", "origin": "Galar", "type": "regional"}, @@ -971,7 +985,9 @@ { "num": "R555", "fr": "Darumacho de Galar", "en": "Galarian Darumanitan", "ja": "ヒヒダルマ（ガラル）", "romaji": "Hihidaruma (Gararu)", "de": "Galar-Flampivian", "kr": "불비달마(가라르)", "cn": "達摩狒狒（伽勒爾）", "cs": "达摩狒狒（伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R562", "fr": "Tutafeh de Galar", "en": "Galarian Yamask", "ja": "デスマス（ガラル）", "romaji": "Desumasu (Gararu)", "de": "Galar-Makabaja", "kr": "데스마스(가라르)", "cn": "哭哭面具（伽勒爾）", "cs": "哭哭面具（伽勒尔）", "origin": "Galar", "type": "regional"}, { "num": "R618", "fr": "Limonde de Galar", "en": "Galarian Stunfisk", "ja": "マッギョ（ガラル）", "romaji": "Maggyo (Gararu)", "de": "Galar-Flunschlik", "kr": "메더(가라르)", "cn": "泥巴魚（伽勒爾）", "cs": "泥巴鱼（伽勒尔）", "origin": "Galar", "type": "regional"}, +{ "num": "G3", "fr": "Florizarre", "en": "Venusaur", "ja": "フシギバナ", "romaji": "Fushigibana", "de": "Bisaflor", "kr": "이상해꽃", "cn": "妙蛙花", "cs": "妙蛙花", "type": "giga"}, { "num": "G6", "fr": "Dracaufeu", "en": "Charizard", "ja": "リザードン", "romaji": "Rizādon", "de": "Glurak", "kr": "리자몽", "cn": "噴火龍", "cs": "喷火龙", "type": "giga"}, +{ "num": "G9", "fr": "Tortank", "en": "Blastoise", "ja": "カメックス", "romaji": "Kamekkusu", "de": "Turtok", "kr": "거북왕", "cn": "水箭龜", "cs": "水箭龟", "type": "giga"}, { "num": "G12", "fr": "Papilusion", "en": "Butterfree", "ja": "バタフリー", "romaji": "Batafurī", "de": "Smettbo", "kr": "버터플", "cn": "巴大蝶", "cs": "巴大蝶", "type": "giga"}, { "num": "G25", "fr": "Pikachu", "en": "Pikachu", "ja": "ピカチュウ", "romaji": "Pikachū", "de": "Pikachu", "kr": "피카츄", "cn": "皮卡丘", "cs": "皮卡丘", "type": "giga"}, { "num": "G52", "fr": "Miaouss", "en": "Meowth", "ja": "ニャース", "romaji": "Nyāsu", "de": "Mauzi", "kr": "나옹", "cn": "喵喵", "cs": "喵喵", "type": "giga"}, @@ -982,23 +998,24 @@ { "num": "G133", "fr": "Évoli", "en": "Eevee", "ja": "イーブイ", "romaji": "Ībui", "de": "Evoli", "kr": "이브이", "cn": "伊布", "cs": "伊布", "type": "giga"}, { "num": "G143", "fr": "Ronflex", "en": "Snorlax", "ja": "カビゴン", "romaji": "Kabigon", "de": "Relaxo", "kr": "잠만보", "cn": "卡比獸", "cs": "卡比兽", "type": "giga"}, { "num": "G569", "fr": "Miasmax", "en": "Garbodor", "ja": "ダストダス", "romaji": "Dasutodasu", "de": "Deponitox", "kr": "더스트나", "cn": "灰塵山", "cs": "灰尘山", "type": "giga"}, -{ "num": "G809", "fr": "Melmetal", "en": "Melmetal", "ja": "メルメタル", "romaji": "Merumetaru", "de": "Melmetal", "kr": "멜메탈", "cn": "美錄梅塔", "cs": "美录梅塔", "origin": "Alola"}, -{ "num": "G812", "fr": "Gorythmic", "en": "Rillaboom", "ja": "ゴリランダー", "romaji": "Gorirandā", "de": "Gortrom", "kr": "고릴타", "cn": "轟擂金剛猩", "cs": "轰擂金刚猩", "origin": "Galar"}, -{ "num": "G815", "fr": "Pyrobut", "en": "Cinderace", "ja": "エースバーン", "romaji": "Ēsubān", "de": "Liberlo", "kr": "에이스번", "cn": "閃焰王牌", "cs": "闪焰王牌", "origin": "Galar"}, -{ "num": "G818", "fr": "Lézargus", "en": "Inteleon", "ja": "インテレオン", "romaji": "Intereon", "de": "Intelleon", "kr": "인텔리레온", "cn": "千面避役", "cs": "千面避役", "origin": "Galar"}, +{ "num": "G809", "fr": "Melmetal", "en": "Melmetal", "ja": "メルメタル", "romaji": "Merumetaru", "de": "Melmetal", "kr": "멜메탈", "cn": "美錄梅塔", "cs": "美录梅塔", "type": "giga"}, +{ "num": "G812", "fr": "Gorythmic", "en": "Rillaboom", "ja": "ゴリランダー", "romaji": "Gorirandā", "de": "Gortrom", "kr": "고릴타", "cn": "轟擂金剛猩", "cs": "轰擂金刚猩", "type": "giga"}, +{ "num": "G815", "fr": "Pyrobut", "en": "Cinderace", "ja": "エースバーン", "romaji": "Ēsubān", "de": "Liberlo", "kr": "에이스번", "cn": "閃焰王牌", "cs": "闪焰王牌", "type": "giga"}, +{ "num": "G818", "fr": "Lézargus", "en": "Inteleon", "ja": "インテレオン", "romaji": "Intereon", "de": "Intelleon", "kr": "인텔리레온", "cn": "千面避役", "cs": "千面避役", "type": "giga"}, { "num": "G823", "fr": "Corvaillus", "en": "Corviknight", "ja": "アーマーガア", "romaji": "Āmāgā", "de": "Krarmor", "kr": "아마까오", "cn": "鋼鎧鴉", "cs": "钢铠鸦", "type": "giga"}, { "num": "G826", "fr": "Astronelle", "en": "Orbeetle", "ja": "イオルブ", "romaji": "Iorubu", "de": "Maritellit", "kr": "이올브", "cn": "以歐路普", "cs": "以欧路普", "type": "giga"}, { "num": "G834", "fr": "Torgamord", "en": "Drednaw", "ja": "カジリガメ", "romaji": "Kajirigame", "de": "Kamalm", "kr": "갈가부기", "cn": "暴噬龜", "cs": "暴噬龟", "type": "giga"}, { "num": "G839", "fr": "Monthracite", "en": "Coalossal", "ja": "セキタンザン", "romaji": "Sekitanzan", "de": "Montecarbo", "kr": "석탄산", "cn": "巨炭山", "cs": "巨炭山", "type": "giga"}, { "num": "G841", "fr": "Pomdrapi", "en": "Flapple", "ja": "アップリュー", "romaji": "Appuryū", "de": "Drapfel", "kr": "애프룡", "cn": "蘋裹龍", "cs": "苹裹龙", "type": "giga"}, { "num": "G844", "fr": "Dunaconda", "en": "Sandaconda", "ja": "サダイジャ", "romaji": "Sadaija", "de": "Sanaconda", "kr": "사다이사", "cn": "沙螺蟒", "cs": "沙螺蟒", "type": "giga"}, -{ "num": "G849", "fr": "Salarsen", "en": "Toxtricity", "ja": "ストリンダー", "romaji": "Sutorindā", "de": "Riffex", "kr": "스트린더", "cn": "顫弦蠑螈", "cs": "颤弦蝾螈", "origin": "Galar"}, +{ "num": "G849", "fr": "Salarsen", "en": "Toxtricity", "ja": "ストリンダー", "romaji": "Sutorindā", "de": "Riffex", "kr": "스트린더", "cn": "顫弦蠑螈", "cs": "颤弦蝾螈", "type": "giga"}, { "num": "G851", "fr": "Scolocendre", "en": "Centiskorch", "ja": "マルヤクデ", "romaji": "Maruyakude", "de": "Infernopod", "kr": "다태우지네", "cn": "焚焰蚣", "cs": "焚焰蚣", "type": "giga"}, { "num": "G858", "fr": "Sorcilence", "en": "Hatterene", "ja": "ブリムオン", "romaji": "Burimuon", "de": "Silembrim", "kr": "브리무음", "cn": "布莉姆溫", "cs": "布莉姆温", "type": "giga"}, { "num": "G861", "fr": "Angoliath", "en": "Grimmsnarl", "ja": "オーロンゲ", "romaji": "Ōronge", "de": "Olangaar", "kr": "오롱털", "cn": "長毛巨魔", "cs": "长毛巨魔", "type": "giga"}, { "num": "G869", "fr": "Charmilly", "en": "Alcremie", "ja": "マホイップ", "romaji": "Mahoippu", "de": "Pokusan", "kr": "마휘핑", "cn": "霜奶仙", "cs": "霜奶仙", "type": "giga"}, { "num": "G879", "fr": "Pachyradjah", "en": "Copperajah", "ja": "ダイオウドウ", "romaji": "Daiōdō", "de": "Patinaraja", "kr": "대왕끼리동", "cn": "大王銅象", "cs": "大王铜象", "type": "giga"}, { "num": "G884", "fr": "Duralugon", "en": "Duraludon", "ja": "ジュラルドン", "romaji": "Jurarudon", "de": "Duraludon", "kr": "두랄루돈", "cn": "鋁鋼龍", "cs": "铝钢龙", "type": "giga"}, -{ "num": "G890", "fr": "Éthernatos", "en": "Eternatus", "ja": "ムゲンダイナ", "romaji": "Mugendaina", "de": "Endynalos", "kr": "무한다이노", "cn": "無極汰那", "cs": "无极汰那", "type": "giga"} +{ "num": "G890", "fr": "Éthernatos", "en": "Eternatus", "ja": "ムゲンダイナ", "romaji": "Mugendaina", "de": "Endynalos", "kr": "무한다이노", "cn": "無極汰那", "cs": "无极汰那", "type": "giga"}, +{ "num": "G892", "fr": "Shifours", "en": "Urshifu", "ja": "ウーラオス", "romaji": "Ūraosu", "de": "Wulaosu", "kr": "우라오스", "cn": "武道熊師", "cs": "武道熊师", "type": "giga"} ] } \ No newline at end of file diff --git a/poketest.js b/poketest.js index 244de1d..367634d 100644 --- a/poketest.js +++ b/poketest.js @@ -28,10 +28,10 @@ $(document).ready(function() { var G5 = [494, 649]; var G6 = [650, 721]; var G7 = [722, 809]; - var G8 = [810, 890] - var MEGA = [891, 940]; - var REG = [941, 971]; - var GIGA = [972, 1000]; + var G8 = [810, 898] + var MEGA = [899, 948]; + var REG = [949, 985]; + var GIGA = [986, 1017]; /************ UTIL *************/ /*******************************/ @@ -146,10 +146,10 @@ $(document).ready(function() { // multiple artworks function imageType(result) { var four_types = [351, 386, 585, 586, 676, 741, 800]; - var three_types = [249, 250, 384, 412, 413, 718, 745]; + var three_types = [249, 250, 384, 412, 413, 718, 745, 898]; var two_types = [251, 252, 255, 258, 374, 387, 390, 393, 421, 422, 423, 487, 492, 495, 498, 501, 521, 550, 555, 592, 593, 641, 642, 643, 644, 645, 647, 648, 668, 678, 681, 720, 746, 774, 791, 792, 802, 849, - 876, 877, 888, 889]; + 876, 877, 888, 889, 892, "G892"]; function randomizer() { if (result >= MEGA[0]) return (pklist.mn[result-1]["num"])