From 08e379152310a40064cfaa9d2661111d5048d75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Marchal?= Date: Wed, 23 Feb 2022 13:58:51 +0100 Subject: [PATCH] =?UTF-8?q?Add=20new=20Legends=20Arceus=20Pok=C3=A9mons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also fix overflow in pages + about page little revamp --- README.md | 4 +- about.html | 32 ++++++++-------- flashdex.html | 6 +-- flashdex.js | 14 +++---- index.html | 19 ++++++---- pokemon.json | 101 +++++++++++++++++++++++++++++++------------------- poketest.js | 10 ++--- style.css | 12 +++--- 8 files changed, 112 insertions(+), 86 deletions(-) diff --git a/README.md b/README.md index a874707..fb16ed3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Around 2012, when I was still a computer science student, I found increasingly difficult the remember the name of all Pokémons. So I decided, as a way to be familiar with JavaScript (even though I've never touched it again after that) to program this little website: Pokétest, an interactive browser game, where you have to find the name of Pokémons in a limited time ; and Flashdex, which is a simple Pokédex with high resolution images. -Now that there are almost 900 of them, and it's as useful as ever! The website features filters for all generations, eight languages settings (English, French, Deutsch, Korean, Japanese, Rōmaji, Traditional and Simplified Chinese) and four combinables modes (image visible or as a silhouette ; configurable number of questions or infinite). It can be played with the mouse or the keyboard (input 1, 2, 3, 4). +Now that there are now more than 900 of them, and it's as useful as ever! The website features filters for all generations, eight languages settings (English, French, Deutsch, Korean, Japanese, Rōmaji, Traditional and Simplified Chinese) and four combinables modes (image visible or as a silhouette ; configurable number of questions or infinite). It can be played with the mouse or the keyboard (input 1, 2, 3, 4). ### Planned updates @@ -25,7 +25,7 @@ Now that there are almost 900 of them, and it's as useful as ever! The website f This website has been developed in JavaScript using the jQuery library. It uses the Backstretch plugin to have a neat background image, and the waitForImages plugin. All of those components are licensed under the MIT license, as is this website's source code. This website is HTML5 and CSS3 compliant. -The Pokémon names, the associated artworks and the Pokémon licence is trademarked by Nintendo and The Pokémon Company, 1996 - 2020. +The Pokémon names, the associated artworks and the Pokémon licence is trademarked by Nintendo and The Pokémon Company, 1996 - 2022. All the Pokémon artworks were taken from Bulbapedia, that I'd like to thank for their huge work for the Pokémon community. diff --git a/about.html b/about.html index a647ef3..c1a76e9 100644 --- a/about.html +++ b/about.html @@ -18,16 +18,16 @@ Pokétest
-
- fomantis +
+ morpeko

About

-
    + -

    Who are you?

    +

    Who are you?

    Hi! My name is Théo and I'm a game developer. I love Pokémon, but it has been getting hard to remember all those names, even though I always complete the Pokédex in my games!

    -

    What is this website made with?

    +

    What is this website made with?

    This website has been developed in JavaScript using the jQuery library.
    It uses the Backstretch plugin to have a neat background image, and the waitForImages plugin.
    @@ -52,34 +52,34 @@ This website is HTML5 and CSS3 compliant.

    -

    Can I use my keyboard to play?

    +

    Can I use my keyboard to play?

    Yes! You can launch the game with "Enter", then press "1", "2", "3" or "4" to answer.

    -

    What is the «Infinite» option in the number of questions exactly?

    +

    What is the «Infinite» option in the number of questions exactly?

    When playing with the Infinite option, the game ends when you have 5 bad answers on all the set.

    poliwag -

    This website doesn't work well with mobile devices.

    +

    This website doesn't work well with mobile devices.

    This is something I'll be working on... someday... promise!

    -

    This website doesn't work well on my browser.

    +

    This website doesn't work well on my browser.

    Please contact me or make a pull request!

    -

    Can you add more languages?

    +

    Can you add more languages?

    The game currently supports all of the languages available in the main games. If your language is not on the list, it probably uses the English names! I will not support other languages by myself, but you can always contribute by making a pull request!

    -

    Can you add this feature?

    +

    Can you add this feature?

    Please contact me or make a pull request!

    -

    Copyrights

    -

    The Pokémon names, the associated artworks and the Pokémon licence is trademarked by Nintendo and The Pokémon Company, 1996 - 2020.

    -

    All the Pokémon artworks were taken from Bulbapedia, that I'd like to thank for their huge work for the Pokémon community.

    +

    Copyrights

    +

    The Pokémon names, the associated artworks and the Pokémon licence is trademarked by Nintendo and The Pokémon Company, 1996 - 2022.
    + All the Pokémon artworks were taken from Bulbapedia, that I'd like to thank for their huge work for the Pokémon community.

\ No newline at end of file diff --git a/flashdex.html b/flashdex.html index b63f857..3ed263a 100644 --- a/flashdex.html +++ b/flashdex.html @@ -27,7 +27,7 @@
- morpeko + lilligant

Flashdex

@@ -47,8 +47,8 @@
Alternate forms - +

@@ -79,7 +79,7 @@
diff --git a/flashdex.js b/flashdex.js index 8afd3d1..8be19e8 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, 898] - var MEGA = [899, 948]; - var REG = [949, 985]; - var GIGA = [986, 1017]; + var G8 = [810, 905]; + var MEGA = [906, 955]; + var GIGA = [956, 987]; + var REG = [988, 1040]; /************ GAME *************/ /*******************************/ @@ -73,7 +73,7 @@ $(document).ready(function() { return '' else if (pkmn["origin"] == "Alola") return '' - else if (pkmn["origin"] == "Galar") + else if (pkmn["origin"] == "Galar" || pkmn["origin"] == "Hisui") return '' else if (pkmn["type"] == "mega") return ''; @@ -134,8 +134,8 @@ $(document).ready(function() { for (i = 0; i < 9; i++) createGenerationList((i + "g")); - createGenerationList("mega"); createGenerationList("regional"); + createGenerationList("mega"); createGenerationList("gigantamax"); generatePokemonList(); @@ -149,7 +149,7 @@ $(document).ready(function() { 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, 892, "G892"]; + 876, 877, 888, 889, 892, 905, "G892"]; function no_randomizer() { if (result === 25) diff --git a/index.html b/index.html index e8a6a5c..4c9612e 100644 --- a/index.html +++ b/index.html @@ -26,9 +26,12 @@
- wooloo + Growlithe

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, Regional or Gigantamax Forms!

+ +

✨ Now updated for Pokémon Legends: Arceus!

+ +

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

@@ -70,16 +73,16 @@
+ (810 - 905)
+ +

-
- @@ -135,7 +138,7 @@