diff --git a/.gitmodules b/.gitmodules index af57e23..f614693 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "pokemon"] path = pokemon - url = https://git.n700.ovh/keb/poketest-pokemon.git + url = https://git.marchal.dev/keb/poketest-pokemon.git diff --git a/README.md b/README.md index 7eed77d..311cc54 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Now that there are now more than a thousand of them, and it's as useful as ever! **imagemagick** can be extremely useful to work with batch of images. This script allows to resize a batch of PNG images to a max width of 700px, without altering the height while keeping the ratio: -`mogrify '*.png[x700>]'` +`magick mogrify '*.png[x700>]'` And this one allows to resize to 700x700px, but putting the image at the center if it is smaller than that. diff --git a/flashdex.html b/flashdex.html index baf6454..3d339e4 100644 --- a/flashdex.html +++ b/flashdex.html @@ -35,9 +35,9 @@

Flashdex

-

Now updated for Pokémon Scarlet and Violet!

+

Now updated for Pokémon Scarlet and Violet DLC: The Hidden Treasure of Area Zero!

-

The Flashdex is a very simple Pokédex, useful to see your favorite creatures in good resolution. Perfect for learning new names, and to see the different generations and Pokémon forms!

+

The Flashdex is a very simple Pokédex, useful to see your favorite creatures in good resolution. Perfect for learning new names, and to see the different generations and Pokémon forms! It also includes the monster's type.

For more details, please read the About page!

diff --git a/flashdex.js b/flashdex.js index b5d2201..6aa4a91 100644 --- a/flashdex.js +++ b/flashdex.js @@ -9,10 +9,10 @@ $(document).ready(function() var G6 = [650, 721]; var G7 = [722, 809]; var G8 = [810, 905]; - var G9 = [906, 1010]; - var MEGA = [1011, 1060]; - var GIGA = [1061, 1092]; - var REG = [1093, 1147]; + var G9 = [906, 1025]; + var MEGA = [1026, 1075]; + var GIGA = [1076, 1107]; + var REG = [1108, 1162]; var gen_number = 9; var extra_number = 3; // mega, giga, reg diff --git a/index.html b/index.html index b2670cb..66fe4d9 100644 --- a/index.html +++ b/index.html @@ -33,9 +33,9 @@ Quaxly

Pokétest

-

Now updated for Pokémon Scarlet and Violet!

+

Now updated for Pokémon Scarlet and Violet DLC: The Hidden Treasure of Area Zero!

-

There are now more than 1000 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!

+

We have now reached the thousand Pocket Monsters mark, and more than a hundred 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!

For more details, please read the About page!

diff --git a/pokemon b/pokemon index 2d362c6..1cade63 160000 --- a/pokemon +++ b/pokemon @@ -1 +1 @@ -Subproject commit 2d362c6d5f4ff4c924b3bebbcf1ecfe819615301 +Subproject commit 1cade63599815608638a53c1b4a2991acf012d5d diff --git a/pokemon.json b/pokemon.json index 5077a2d..3d8a0ee 100644 --- a/pokemon.json +++ b/pokemon.json @@ -1008,6 +1008,21 @@ { "num": 1008, "fr": "Miraidon", "en": "Miraidon", "ja": "ミライドン", "romaji": "Miraidon", "de": "Miraidon", "kr": "미라이돈", "cn": "密勒頓", "cs": "密勒顿", "origin": "Paldea", "type": [ "Electric", "Fighting" ] }, { "num": 1009, "fr": "Serpente-Eau", "en": "Walking Wake", "ja": "ウネルミナモ", "romaji": "Uneruminamo", "de": "Windewoge", "kr": "굽이치는물결", "cn": "波盪水", "cs": "波荡水", "origin": "Paldea", "type": [ "Water", "Dragon" ] }, { "num": 1010, "fr": "Vert-de-Fer", "en": "Iron Leaves", "ja": "テツノイサハ", "romaji": "Tetsunoisaha", "de": "Eisenblatt", "kr": "무쇠잎새", "cn": "鐵斑葉", "cs": "铁斑叶", "origin": "Paldea", "type": [ "Grass", "Psychic" ] }, +{ "num": 1011, "fr": "Pomdramour", "en": "Dipplin", "ja": "カミッチュ", "romaji": "Kamitchu", "de": "Sirapfel", "kr": "과미르", "cn": "裹蜜蟲", "cs": "裹蜜虫", "origin": "Paldea", "type": [ "Grass", "Dragon" ] }, +{ "num": 1012, "fr": "Poltchageist", "en": "Poltchageist", "ja": "チャデス", "romaji": "Chadesu", "de": "Mortcha", "kr": "차데스", "cn": "斯魔茶", "cs": "斯魔茶", "origin": "Paldea", "type": [ "Grass", "Ghost" ] }, +{ "num": 1013, "fr": "Théffroyable", "en": "Sinistcha", "ja": "ヤバソチャ", "romaji": "Yabasocha", "de": "Fatalitcha", "kr": "그우린차", "cn": "來悲粗茶", "cs": "来悲粗茶", "origin": "Paldea", "type": [ "Grass", "Ghost" ] }, +{ "num": 1014, "fr": "Félicanis", "en": "Okidogi", "ja": "イイネイヌ", "romaji": "Iineinu", "de": "Boninu", "kr": "조타구", "cn": "夠讚狗", "cs": "够赞狗", "origin": "Paldea", "type": [ "Poison", "Fighting" ] }, +{ "num": 1015, "fr": "Fortusimia", "en": "Munkidori", "ja": "マシマシラ", "romaji": "Mashimashira", "de": "Benesaru", "kr": "이야후", "cn": "願增猿", "cs": "愿增猿", "origin": "Paldea", "type": [ "Poison", "Psychic" ] }, +{ "num": 1016, "fr": "Favianos", "en": "Fezandipiti", "ja": "キチキギス", "romaji": "Kichikigisu", "de": "Beatori", "kr": "기로치", "cn": "吉雉雞", "cs": "吉雉鸡", "origin": "Paldea", "type": [ "Poison", "Fairy" ] }, +{ "num": 1017, "fr": "Ogerpon", "en": "Ogerpon", "ja": "オーガポン", "romaji": "Ōgapon", "de": "Ogerpon", "kr": "오거폰", "cn": "厄鬼椪", "cs": "厄诡椪", "origin": "Paldea", "type": [ "Grass" ], "sprite": 4, "type1": [ "Grass", "Water" ], "type2": [ "Grass", "Fire" ], "type3": [ "Grass", "Rock" ] }, +{ "num": 1018, "fr": "Pondralugon", "en": "Archaludon", "ja": "ブリジュラス", "romaji": "Burijurasu", "de": "Briduradon", "kr": "브리두라스", "cn": "鋁鋼橋龍", "cs": "铝钢桥龙", "origin": "Paldea", "type": [ "Steel", "Dragon" ] }, +{ "num": 1019, "fr": "Pomdorochi", "en": "Hydrapple", "ja": "カミツオロチ", "romaji": "Kamitsuorochi", "de": "Hydrapfel", "kr": "과미드라", "cn": "蜜集大蛇", "cs": "蜜集大蛇", "origin": "Paldea", "type": [ "Grass", "Dragon" ] }, +{ "num": 1020, "fr": "Feu-Perçant", "en": "Gouging Fire", "ja": "ウガツホムラ", "romaji": "Ugatsuhomura", "de": "Keilflamme", "kr": "꿰뚫는화염", "cn": "破空焰", "cs": "破空焰", "origin": "Paldea", "type": [ "Fire", "Dragon" ] }, +{ "num": 1021, "fr": "Ire-Foudre", "en": "Raging Bolt", "ja": "タケルライコ", "romaji": "Takeruraiko", "de": "Furienblitz", "kr": "날뛰는우레", "cn": "猛雷鼓", "cs": "猛雷鼓", "origin": "Paldea", "type": [ "Electric", "Dragon" ] }, +{ "num": 1022, "fr": "Roc-de-Fer", "en": "Iron Boulder", "ja": "テツノイワオ ", "romaji": "Tetsunoiwao", "de": "Eisenfels", "kr": "무쇠암석", "cn": "鐵磐岩", "cs": "铁磐岩", "origin": "Paldea", "type": [ "Rock", "Psychic" ] }, +{ "num": 1023, "fr": "Chef-de-Fer", "en": "Iron Crown", "ja": "テツノカシラ", "romaji": "Tetsunokashira", "de": "Eisenhaupt", "kr": "무쇠감투", "cn": "鐵頭殼", "cs": "铁头壳", "origin": "Paldea", "type": [ "Steel", "Psychic" ] }, +{ "num": 1024, "fr": "Terapagos", "en": "Terapagos", "ja": "テラパゴス", "romaji": "Terapagosu", "de": "Terapagos", "kr": "테라파고스", "cn": "太樂巴戈斯", "cs": "太乐巴戈斯", "origin": "Paldea", "type": [ "Normal" ], "sprite": 2 }, +{ "num": 1025, "fr": "Pêchaminus", "en": "Pecharunt", "ja": "モモワロウ", "romaji": "Momowarou", "de": "Infamomo", "kr": "복숭악동", "cn": "桃歹郎", "cs": "桃歹郎", "origin": "Paldea", "type": [ "Poison", "Ghost" ] }, { "num": "M3", "fr": "Méga-Florizarre", "en": "Mega Venusaur", "ja": "メガ フシギバナ", "romaji": "Mega Fushigibana", "de": "Mega-Bisaflor", "kr": "메가이상해꽃", "cn": "超級妙蛙花", "cs": "超级妙蛙花", "form": "mega", "type": [ "Grass", "Poison" ] }, { "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", "form": "mega", "type": [ "Fire", "Dragon" ] }, { "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", "form": "mega", "type": [ "Fire", "Flying" ] }, @@ -1144,5 +1159,4 @@ { "num": "R713", "fr": "Séracrawl d'Hisui", "en": "Hisuian Avalugg", "ja": "クレベース(ヒスイ)", "romaji": "Kurebēsu (Hisui)", "de": "Hisui-Arktilas", "kr": "크레베이스(히스이)", "cn": "冰岩怪(洗翠)", "cs": "冰岩怪(洗翠)", "origin": "Hisui", "form": "regional", "type": [ "Ice", "Dragon" ] }, { "num": "R724", "fr": "Archéduc d'Hisui", "en": "Hisuian Decidueye", "ja": "ジュナイパー(ヒスイ)", "romaji": "Junaipā (Hisui)", "de": "Hisui-Silvarro", "kr": "모크나이퍼(히스이)", "cn": "狙射樹梟(洗翠)", "cs": "狙射树枭(洗翠)", "origin": "Hisui", "form": "regional", "type": [ "Grass", "Fighting" ] }, { "num": "R128", "fr": "Tauros de Paldea", "en": "Paldean Tauros", "ja": "ケンタロス(パルデア)", "romaji": "Kentarosu (Parudea)", "de": "Paldea-Tauros", "kr": "켄타로스(팔데아)", "cn": "肯泰羅(帕底亞)", "cs": "肯泰罗(帕底亚)", "origin": "Paldea", "form": "regional", "type": [ "Fighting" ], "sprite": 3, "type1": [ "Fighting", "Fire" ], "type2": [ "Fighting", "Water" ] }, -{ "num": "R194", "fr": "Axoloto de Paldea", "en": "Paldean Wooper", "ja": "ウパー(パルデア)", "romaji": "Upā (Parudea)", "de": "Paldea-Felino", "kr": "우파(팔데아)", "cn": "烏波(帕底亞)", "cs": "乌波(帕底亚)", "origin": "Paldea", "form": "regional", "type": [ "Poison", "Ground" ] } -]} \ No newline at end of file +{ "num": "R194", "fr": "Axoloto de Paldea", "en": "Paldean Wooper", "ja": "ウパー(パルデア)", "romaji": "Upā (Parudea)", "de": "Paldea-Felino", "kr": "우파(팔데아)", "cn": "烏波(帕底亞)", "cs": "乌波(帕底亚)", "origin": "Paldea", "form": "regional", "type": [ "Poison", "Ground" ] }]} \ No newline at end of file diff --git a/poketest.js b/poketest.js index 6efe475..884795c 100644 --- a/poketest.js +++ b/poketest.js @@ -29,10 +29,10 @@ $(document).ready(function() { var G6 = [650, 721]; var G7 = [722, 809]; var G8 = [810, 905]; - var G9 = [906, 1010]; - var MEGA = [1011, 1060]; - var GIGA = [1061, 1092]; - var REG = [1093, 1147]; + var G9 = [906, 1025]; + var MEGA = [1026, 1075]; + var GIGA = [1076, 1107]; + var REG = [1108, 1162]; var gen_number = 9; var extra_number = 3; // mega, giga, reg