keb/poketest
1
0
Fork 0
Code Issues Releases Activity

Compare commits

base: keb:4ab3df9b81f8404550781ef245e385d5dd20b95d
Branches Tags
keb:master
...
compare: keb:master
Branches Tags
keb:master

10 Commits
4ab3df9b81 ... master

Author SHA1 Message Date
Théo Marchal
06f0835353 Bump year to 2025 2025-01-25 01:23:29 +01:00
Théo Marchal
fe4dd38656 Update pokemon 2024-07-14 15:12:02 +02:00
Théo Marchal
b6393beaee Update repository URL 2024-07-14 15:10:34 +02:00
Théo Marchal
9429626a25 Add Hidden Treasure DLC Pokémons 2024-01-29 15:04:29 +01:00
Théo Marchal
8afa5684cf Flashdex: wording 2024-01-07 01:22:54 +01:00
Théo Marchal
cba1c7c3ef Flashdex: added parameters in URL for sharing 2024-01-06 15:31:52 +01:00
Théo Marchal
670b33850f Remove twitter script from homepage 2024-01-06 00:26:15 +01:00
Théo Marchal
a4b32ca3ae Fix 1G alternative images not showing 2024-01-06 00:24:53 +01:00
Théo Marchal
38bdaf397b Remove diploma border 2024-01-06 00:20:34 +01:00
Théo Marchal
9992e7cc28 Update jQuery, update 2024, remove Twitter share (RIP) 2024-01-05 18:38:03 +01:00
14 changed files with 215 additions and 160 deletions
Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "pokemon"] [submodule "pokemon"]
path = pokemon path = pokemon
url = https://git.n700.ovh/keb/poketest-pokemon.git url = https://git.marchal.dev/keb/poketest-pokemon.git

5
README.md
View File

@ -8,7 +8,6 @@ Now that there are now more than a thousand of them, and it's as useful as ever!
### Planned updates ### Planned updates
- Modify URL in the Flashdex for sharing options
- Make answer choices closer by type - Make answer choices closer by type
- Type weakness calculator - Type weakness calculator
@ -16,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: **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. And this one allows to resize to 700x700px, but putting the image at the center if it is smaller than that.
@ -26,7 +25,7 @@ And this one allows to resize to 700x700px, but putting the image at the center
This website has been developed in <strong>JavaScript</strong> using the <strong>jQuery</strong> library. It uses the <a href="https://github.com/alexanderdickson/waitForImages">waitForImages plugin</a>. All of those components are licensed under the MIT license, as is this website's source code. This website is <strong>HTML5</strong> and <strong>CSS3</strong> compliant. This website has been developed in <strong>JavaScript</strong> using the <strong>jQuery</strong> library. It uses the <a href="https://github.com/alexanderdickson/waitForImages">waitForImages plugin</a>. All of those components are licensed under the MIT license, as is this website's source code. This website is <strong>HTML5</strong> and <strong>CSS3</strong> compliant.
The Pokémon names, the associated artworks and the Pokémon licence is trademarked by <strong>Nintendo</strong> and <strong>The Pokémon Company</strong>, 1996 - 2023. The Pokémon names, the associated artworks and the Pokémon licence is trademarked by <strong>Nintendo</strong> and <strong>The Pokémon Company</strong>, 1996 - 2025.
All the Pokémon artworks were taken from <a href="https://bulbapedia.bulbagarden.net/wiki/Main_Page">Bulbapedia</a>, that I'd like to thank for their huge work for the Pokémon community. All the Pokémon artworks were taken from <a href="https://bulbapedia.bulbagarden.net/wiki/Main_Page">Bulbapedia</a>, that I'd like to thank for their huge work for the Pokémon community.

9
about.html
View File

@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="normalize-8.0.1.css" id="stylesheet"> <link rel="stylesheet" type="text/css" href="normalize-8.0.1.css" id="stylesheet">
<link rel="stylesheet" type="text/css" href="style.css" id="stylesheet"> <link rel="stylesheet" type="text/css" href="style.css" id="stylesheet">
<link rel="shortcut icon" type="image/png" href="img/favicon.png" /> <link rel="shortcut icon" type="image/png" href="img/favicon.png" />
<script src="jquery-3.6.4.min.js"></script> <script src="jquery-3.7.1.min.js"></script>
<script src="interface.js"></script> <script src="interface.js"></script>
<script src="poketest.js"></script> <script src="poketest.js"></script>
<title>Pokétest - About</title> <title>Pokétest - About</title>
@ -52,6 +52,7 @@
<h3 id="2">How to use: Flashdex</h3> <h3 id="2">How to use: Flashdex</h3>
<p>The Flashdex is a very simple Pokédex, useful to see the Pokémons in a good resolution. It is filtered by generation and alternate forms. You can chose the language in which it is displayed.</p> <p>The Flashdex is a very simple Pokédex, useful to see the Pokémons in a good resolution. It is filtered by generation and alternate forms. You can chose the language in which it is displayed.</p>
<p>When a deck is generated, the URL is changed with the parameters that were selected. This way, you can easily share it to whoever you want.</p>
<p>Types are displayed in the top-left corner, and generations on the top-right corner. If there are different artworks available for the Pokémon, arrows are displayed on the bottom-left corner. You can use them to switch between artworks. Please note that those are not always alternate forms, they are alternate artworks. For example:</p> <p>Types are displayed in the top-left corner, and generations on the top-right corner. If there are different artworks available for the Pokémon, arrows are displayed on the bottom-left corner. You can use them to switch between artworks. Please note that those are not always alternate forms, they are alternate artworks. For example:</p>
<ul> <ul>
<li>The first generation has at least three artworks available by Pokémon.</li> <li>The first generation has at least three artworks available by Pokémon.</li>
@ -68,7 +69,7 @@
It uses the <a href="https://github.com/alexanderdickson/waitForImages">waitForImages plugin</a>. It uses the <a href="https://github.com/alexanderdickson/waitForImages">waitForImages plugin</a>.
</p> </p>
<p> <p>
All of those components are licensed under the MIT license, as is the website source code, which is <a href="https://git.n700.ovh/keb/poketest">available here</a>.<br /> All of those components are licensed under the MIT license, as is the website source code, which is <a href="https://git.marchal.dev/keb/poketest">available here</a>.<br />
If you found a bug or want to add a feature, you can always contact me or make a pull request. If you found a bug or want to add a feature, you can always contact me or make a pull request.
</p> </p>
<p> <p>
@ -76,13 +77,13 @@
</p> </p>
<h3 id="4">Copyrights</h3> <h3 id="4">Copyrights</h3>
<p>The Pokémon names, the associated artworks and the Pokémon licence is trademarked by <strong>Nintendo</strong> and <strong>The Pokémon Company</strong>, 1996 - 2023.</p> <p>The Pokémon names, the associated artworks and the Pokémon licence is trademarked by <strong>Nintendo</strong> and <strong>The Pokémon Company</strong>, 1996 - 2025.</p>
<p>All the Pokémon artworks were taken from <a href="https://bulbapedia.bulbagarden.net/wiki/Main_Page">Bulbapedia</a>, that I'd like to thank for their huge work for the Pokémon community.</p> <p>All the Pokémon artworks were taken from <a href="https://bulbapedia.bulbagarden.net/wiki/Main_Page">Bulbapedia</a>, that I'd like to thank for their huge work for the Pokémon community.</p>
</div> </div>
</article> </article>
</div> </div>
<footer> <footer>
<p>© 2012 - 2023 Pokétest 2.9</p> <p>© 2012 - 2025 Pokétest 2.10</p>
</footer> </footer>
</body> </body>
</html> </html>

8
flashdex.html
View File

@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="normalize-8.0.1.css" id="stylesheet"> <link rel="stylesheet" type="text/css" href="normalize-8.0.1.css" id="stylesheet">
<link rel="stylesheet" type="text/css" href="style.css" id="stylesheet"> <link rel="stylesheet" type="text/css" href="style.css" id="stylesheet">
<link rel="shortcut icon" type="image/png" href="img/favicon.png" /> <link rel="shortcut icon" type="image/png" href="img/favicon.png" />
<script src="jquery-3.6.4.min.js"></script> <script src="jquery-3.7.1.min.js"></script>
<script src="waitforimages-2.4.0.min.js"></script> <script src="waitforimages-2.4.0.min.js"></script>
<script src="interface.js"></script> <script src="interface.js"></script>
<script src="flashdex.js"></script> <script src="flashdex.js"></script>
@ -35,9 +35,9 @@
<h1>Flashdex</h1> <h1>Flashdex</h1>
<p>✨ <strong>Now updated for Pokémon Scarlet and Violet!</strong></p> <p>✨ <strong>Now updated for Pokémon Scarlet and Violet DLC: The Hidden Treasure of Area Zero!</strong></p>
<p>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 different Pokémon forms!</p> <p>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.</p>
<p>For more details, please read the <a href="about.html">About page</a>!</p> <p>For more details, please read the <a href="about.html">About page</a>!</p>
@ -87,7 +87,7 @@
</div> </div>
</article> </article>
<footer> <footer>
<p>© 2012 - 2023 Pokétest 2.9</p> <p>© 2012 - 2025 Pokétest 2.10</p>
</footer> </footer>
</div> </div>
</body> </body>

28
flashdex.js
View File

@ -9,10 +9,12 @@ $(document).ready(function()
var G6 = [650, 721]; var G6 = [650, 721];
var G7 = [722, 809]; var G7 = [722, 809];
var G8 = [810, 905]; var G8 = [810, 905];
var G9 = [906, 1010]; var G9 = [906, 1025];
var MEGA = [1011, 1060]; var MEGA = [1026, 1075];
var GIGA = [1061, 1092]; var GIGA = [1076, 1107];
var REG = [1093, 1147]; var REG = [1108, 1162];
var gen_number = 9;
var extra_number = 3; // mega, giga, reg
/************ GAME *************/ /************ GAME *************/
/*******************************/ /*******************************/
@ -57,10 +59,26 @@ $(document).ready(function()
if (gen_list.length == 0) if (gen_list.length == 0)
return; return;
setUrlSearch();
$('article #container #game #loading').show(); $('article #container #game #loading').show();
$('article #container #game #flashdex').empty().hide(); $('article #container #game #flashdex').empty().hide();
function setUrlSearch()
{
gen = '';
if (gen_list.length < (gen_number + extra_number))
{
for (i in gen_list)
gen += gen_list[i].substring(0,1);
}
else gen += "all";
window.history.replaceState(null, null, "?gen=" + gen + "&lang=" + lang);
localStorage.setItem('lang', lang);
}
function getFormText(pkmn) function getFormText(pkmn)
{ {
if (pkmn["origin"] == "Kanto") if (pkmn["origin"] == "Kanto")

BIN
img/border.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

15
index.html
View File

@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="normalize-8.0.1.css" id="stylesheet"> <link rel="stylesheet" type="text/css" href="normalize-8.0.1.css" id="stylesheet">
<link rel="stylesheet" type="text/css" href="style.css" id="stylesheet"> <link rel="stylesheet" type="text/css" href="style.css" id="stylesheet">
<link rel="shortcut icon" type="image/png" href="img/favicon.png" /> <link rel="shortcut icon" type="image/png" href="img/favicon.png" />
<script src="jquery-3.6.4.min.js"></script> <script src="jquery-3.7.1.min.js"></script>
<script src="interface.js"></script> <script src="interface.js"></script>
<script src="poketest.js"></script> <script src="poketest.js"></script>
<title>Pokétest</title> <title>Pokétest</title>
@ -33,9 +33,9 @@
<img src="pokemon/912.png" alt="Quaxly" class="poketest-companion" /> <img src="pokemon/912.png" alt="Quaxly" class="poketest-companion" />
<h1>Pokétest</h1> <h1>Pokétest</h1>
<p>✨ <strong>Now updated for Pokémon Scarlet and Violet!</strong></p> <p>✨ <strong>Now updated for Pokémon Scarlet and Violet DLC: The Hidden Treasure of Area Zero!</strong></p>
<p>There are now more than 1000 Pocket&nbsp;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&nbsp;Evolutions, Regional or Gigantamax&nbsp;Forms!</p> <p>We have now reached the thousand Pocket&nbsp;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&nbsp;Evolutions, Regional or Gigantamax&nbsp;Forms!</p>
<p>For more details, please read the <a href="about.html">About page</a>!</p> <p>For more details, please read the <a href="about.html">About page</a>!</p>
@ -120,7 +120,7 @@
<h3>Number of questions</h3> <h3>Number of questions</h3>
<select class="questions first"> <select class="questions first">
<!--<option name="questions" id="1" value="1">1 (debug)</option>--> <!-- <option name="questions" id="1" value="1">1 (debug)</option> -->
<option name="questions" id="15" value="15">15</option> <option name="questions" id="15" value="15">15</option>
<option name="questions" id="30" value="30">30</option> <option name="questions" id="30" value="30">30</option>
<option name="questions" id="50" value="50">50</option> <option name="questions" id="50" value="50">50</option>
@ -131,7 +131,7 @@
<h3>Time to answer</h3> <h3>Time to answer</h3>
<select class="time first"> <select class="time first">
<!--<option name="time" id="1" value="1">1 (debug)</option>--> <!-- <option name="time" id="1" value="1">1 (debug)</option> -->
<option name="time" id="2" value="2">2 seconds</option> <option name="time" id="2" value="2">2 seconds</option>
<option name="time" id="5" value="5" selected>5 seconds</option> <option name="time" id="5" value="5" selected>5 seconds</option>
<option name="time" id="10" value="10">10 seconds</option> <option name="time" id="10" value="10">10 seconds</option>
@ -150,11 +150,8 @@
</div> </div>
</article> </article>
<footer> <footer>
<p>© 2012 - 2023 Pokétest 2.9</p> <p>© 2012 - 2025 Pokétest 2.10</p>
</footer> </footer>
</div> </div>
<script>
!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');
</script>
</body> </body>
</html> </html>

247
interface.js
View File

@ -8,107 +8,6 @@ $(document).ready(function()
// have a nice little background // have a nice little background
//$.backstretch("artwork/artwork"+random(1, 10)+".jpg"); //$.backstretch("artwork/artwork"+random(1, 10)+".jpg");
// splice url arguments
function gup(name, url)
{
if (!url) url = location.href;
name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
var regexS = "[\\?&]"+name+"=([^&#]*)";
var regex = new RegExp(regexS);
var results = regex.exec(url);
return results == null ? null : results[1];
}
// read url
local_gen = gup('gen', window.location.href);
if (local_gen != null)
{
if (local_gen == "all")
$('article #container #game #configuration input#all').attr('checked', true);
else
{
$('article #container #game #configuration input#select').attr('checked', true);
for (i = 0; i < local_gen.length; i++)
{
if (local_gen.charAt(i)) {
if (local_gen.charAt(i) == "m")
$('article #container #game #configuration #selected_options input#mega').attr('checked', true);
else if (local_gen.charAt(i) == "r")
$('article #container #game #configuration #selected_options input#regional').attr('checked', true);
else if (local_gen.charAt(i) == "g")
$('article #container #game #configuration #selected_options input#gigantamax').attr('checked', true);
else
$('article #container #game #configuration #selected_options input#' + local_gen.charAt(i) + 'g').attr('checked', true);
}
}
$('#selected_options').slideDown();
}
$('article #container #game #configuration select.lang').val(gup('lang', window.location.href));
if (gup('silhouette', window.location.href) == "true")
$('article #container #game #configuration input#silhouette').attr('checked', true);
else
$('article #container #game #configuration input#full').attr('checked', true);
if (gup('answertype', window.location.href) == "choice")
$('article #container #game #configuration input#choice').attr('checked', true);
else
$('article #container #game #configuration input#input').attr('checked', true);
$('article #container #game #configuration select.questions').val(gup('questions', window.location.href));
$('article #container #game #configuration select.time').val(gup('time', window.location.href));
}
else // if we did not come from a personalized URL, we read localstorage
{
if (localStorage.getItem('generation') != null)
{
if (localStorage.getItem('generation') != 'all')
{
gen_list = localStorage.getItem('generation');
$('article #container #game #configuration input#select').attr('checked', true);
for (i = 0; i < gen_list.length; i++)
{
if (gen_list.charAt(i))
{
if (gen_list.charAt(i) == "m")
$('article #container #game #configuration #selected_options input#mega').attr('checked', true);
else if (gen_list.charAt(i) == "r")
$('article #container #game #configuration #selected_options input#regional').attr('checked', true);
else if (gen_list.charAt(i) == "g")
$('article #container #game #configuration #selected_options input#gigantamax').attr('checked', true);
else
$('article #container #game #configuration #selected_options input#' + gen_list.charAt(i) + 'g').attr('checked', true);
}
}
$('#selected_options').slideDown();
}
else
$('article #container #game #configuration input#all').attr('checked', true);
}
if (localStorage.getItem('lang') != null)
$('article #game #configuration select.lang').val(localStorage.getItem('lang'));
if (localStorage.getItem('silhouette') != null)
$('article #game #configuration input:radio[name=silhouette]#'+localStorage.getItem('silhouette')).attr('checked', true);
if (localStorage.getItem('answertype') != null)
$('article #game #configuration input:radio[name=answertype]#'+localStorage.getItem('answertype')).attr('checked', true);
if (localStorage.getItem('questions') != null)
$('article #game #configuration select.questions').val(localStorage.getItem('questions'));
if (localStorage.getItem('time') != null)
$('article #game #configuration select.time').val(localStorage.getItem('time'));
}
// select generation toggle
$('#configuration input#all').click(function()
{
$('#selected_options').slideUp();
});
$('#configuration input#select').click(function()
{
$('#selected_options').slideDown();
});
// hamburger mobile // hamburger mobile
$("#hamburger .container").click(function() $("#hamburger .container").click(function()
{ {
@ -125,4 +24,150 @@ $(document).ready(function()
$("nav ul").slideDown(200); $("nav ul").slideDown(200);
} }
}); });
// splice url arguments
function gup(name, url)
{
if (!url) url = location.href;
name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");
var regexS = "[\\?&]"+name+"=([^&#]*)";
var regex = new RegExp(regexS);
var results = regex.exec(url);
return results == null ? null : results[1];
}
// index.html
if (location.pathname.includes("index.html"))
{
// read url
local_gen = gup('gen', location.href);
if (local_gen != null)
{
if (local_gen == "all")
$('article #container #game #configuration input#all').attr('checked', true);
else
{
$('article #container #game #configuration input#select').attr('checked', true);
for (i = 0; i < local_gen.length; i++)
{
if (local_gen.charAt(i)) {
if (local_gen.charAt(i) == "m")
$('article #container #game #configuration #selected_options input#mega').attr('checked', true);
else if (local_gen.charAt(i) == "r")
$('article #container #game #configuration #selected_options input#regional').attr('checked', true);
else if (local_gen.charAt(i) == "g")
$('article #container #game #configuration #selected_options input#gigantamax').attr('checked', true);
else
$('article #container #game #configuration #selected_options input#' + local_gen.charAt(i) + 'g').attr('checked', true);
}
}
$('#selected_options').slideDown();
}
$('article #container #game #configuration select.lang').val(gup('lang', window.location.href));
if (gup('silhouette', window.location.href) == "true")
$('article #container #game #configuration input#silhouette').attr('checked', true);
else
$('article #container #game #configuration input#full').attr('checked', true);
if (gup('answertype', window.location.href) == "choice")
$('article #container #game #configuration input#choice').attr('checked', true);
else
$('article #container #game #configuration input#input').attr('checked', true);
$('article #container #game #configuration select.questions').val(gup('questions', window.location.href));
$('article #container #game #configuration select.time').val(gup('time', window.location.href));
}
else // if we did not come from a personalized URL, we read localstorage
{
if (localStorage.getItem('generation') != null)
{
if (localStorage.getItem('generation') != 'all')
{
gen_list = localStorage.getItem('generation');
$('article #container #game #configuration input#select').attr('checked', true);
for (i = 0; i < gen_list.length; i++)
{
if (gen_list.charAt(i))
{
if (gen_list.charAt(i) == "m")
$('article #container #game #configuration #selected_options input#mega').attr('checked', true);
else if (gen_list.charAt(i) == "r")
$('article #container #game #configuration #selected_options input#regional').attr('checked', true);
else if (gen_list.charAt(i) == "g")
$('article #container #game #configuration #selected_options input#gigantamax').attr('checked', true);
else
$('article #container #game #configuration #selected_options input#' + gen_list.charAt(i) + 'g').attr('checked', true);
}
}
$('#selected_options').slideDown();
}
else
$('article #container #game #configuration input#all').attr('checked', true);
}
if (localStorage.getItem('lang') != null)
$('article #game #configuration select.lang').val(localStorage.getItem('lang'));
if (localStorage.getItem('silhouette') != null)
$('article #game #configuration input:radio[name=silhouette]#'+localStorage.getItem('silhouette')).attr('checked', true);
if (localStorage.getItem('answertype') != null)
$('article #game #configuration input:radio[name=answertype]#'+localStorage.getItem('answertype')).attr('checked', true);
if (localStorage.getItem('questions') != null)
$('article #game #configuration select.questions').val(localStorage.getItem('questions'));
if (localStorage.getItem('time') != null)
$('article #game #configuration select.time').val(localStorage.getItem('time'));
}
// select generation toggle
$('#configuration input#all').click(function()
{
$('#selected_options').slideUp();
});
$('#configuration input#select').click(function()
{
$('#selected_options').slideDown();
});
}
// flashdex.html
if (location.pathname.includes("flashdex.html"))
{
// read url
local_gen = gup('gen', location.href);
if (local_gen != null)
{
if (local_gen == "all")
{
for (i = 0; i < 10; i++)
$('article #container #game #flashdex_config input#' + i + 'g').attr('checked', true);
$('article #container #game #flashdex_config input#mega').attr('checked', true);
$('article #container #game #flashdex_config input#regional').attr('checked', true);
$('article #container #game #flashdex_config input#gigantamax').attr('checked', true);
}
else
{
for (i = 0; i < local_gen.length; i++)
{
if (local_gen.charAt(i)) {
if (local_gen.charAt(i) == "m")
$('article #container #game #flashdex_config input#mega').attr('checked', true);
else if (local_gen.charAt(i) == "r")
$('article #container #game #flashdex_config input#regional').attr('checked', true);
else if (local_gen.charAt(i) == "g")
$('article #container #game #flashdex_config input#gigantamax').attr('checked', true);
else
$('article #container #game #flashdex_config input#' + local_gen.charAt(i) + 'g').attr('checked', true);
}
}
}
$('article #container #game #flashdex_config select.lang').val(gup('lang', window.location.href));
}
else
{
if (localStorage.getItem('lang') != null)
$('article #container #game #flashdex_config select.lang').val(localStorage.getItem('lang'));
}
}
}); });

2
jquery-3.6.4.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
jquery-3.7.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
pokemon

Submodule pokemon updated: 2d362c6d5f...7deba0828c

18
pokemon.json
View File

@ -1008,6 +1008,21 @@
{ "num": 1008, "fr": "Miraidon", "en": "Miraidon", "ja": "ミライドン", "romaji": "Miraidon", "de": "Miraidon", "kr": "미라이돈", "cn": "密勒頓", "cs": "密勒顿", "origin": "Paldea", "type": [ "Electric", "Fighting" ] }, { "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": 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": 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": "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": "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" ] }, { "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": "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": "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": "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" ] } { "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" ] }]}
]}

27
poketest.js
View File

@ -29,10 +29,10 @@ $(document).ready(function() {
var G6 = [650, 721]; var G6 = [650, 721];
var G7 = [722, 809]; var G7 = [722, 809];
var G8 = [810, 905]; var G8 = [810, 905];
var G9 = [906, 1010]; var G9 = [906, 1025];
var MEGA = [1011, 1060]; var MEGA = [1026, 1075];
var GIGA = [1061, 1092]; var GIGA = [1076, 1107];
var REG = [1093, 1147]; var REG = [1108, 1162];
var gen_number = 9; var gen_number = 9;
var extra_number = 3; // mega, giga, reg var extra_number = 3; // mega, giga, reg
@ -187,9 +187,9 @@ $(document).ready(function() {
if (randomValue == 0) if (randomValue == 0)
return pklist.mn[result]["num"]; return pklist.mn[result]["num"];
else if (randomValue == 1) else if (randomValue == 1)
return pklist.mn[result]["num"]+'RB'; return pklist.mn[result]["num"]+'-RB';
else if (randomValue == 2) else if (randomValue == 2)
return pklist.mn[result]["num"]+'RG'; return pklist.mn[result]["num"]+'-RG';
} }
return pklist.mn[result]["num"]; return pklist.mn[result]["num"];
} }
@ -346,16 +346,6 @@ $(document).ready(function() {
function score() function score()
{ {
function generateTwitterText()
{
var start_sentence = 'I got ';
var end_sentence = 'Can you get a better score than me?';
var score_sentence = (Math.floor(good_answers/max_questions*100))+'% Pokémons right!'
if (!infinite) return start_sentence+score_sentence+" "+end_sentence;
else return start_sentence+good_answers+" good Pokémon answers! "+end_sentence;
}
function generateSeed() function generateSeed()
{ {
gen = ''; gen = '';
@ -395,10 +385,7 @@ $(document).ready(function() {
$('article #container #seed').empty().append('<p style="margin:0px;">Share your configuration</p><input type="text" name="seed" value="'+ $('article #container #seed').empty().append('<p style="margin:0px;">Share your configuration</p><input type="text" name="seed" value="'+
generateSeed()+'">'); generateSeed()+'">');
$('article #container #share').empty().append('<div id="copyseed"><a href="#">Copy</a></div><a href="https://twitter.com/share" \ $('article #container #share').empty().append('<div id="copyseed"><a href="#">Copy</a></div>');
class="twitter-share-button" data-url="'+generateSeed()+'" data-text="'+generateTwitterText()+
'" data-size="large" data-hashtags="Pokétest">Tweet</a>');
$.getScript("//platform.twitter.com/widgets.js"); // for the twitter button to work
$('article #container #answers').empty().append('<p class="button"><input type="submit" \ $('article #container #answers').empty().append('<p class="button"><input type="submit" \
class="start_again" name="start_again" value="Play again!"></p>'); class="start_again" name="start_again" value="Play again!"></p>');

10
style.css
View File

@ -304,7 +304,6 @@ article #container #seed input {
} }
article #container #copyseed { article #container #copyseed {
float: left;
width: 60px; height: 16px; width: 60px; height: 16px;
display: block; display: block;
padding: 10px; padding-top: 4px; padding-bottom: 8px; padding: 10px; padding-top: 4px; padding-bottom: 8px;
@ -313,7 +312,8 @@ article #container #copyseed {
font-size: 15px; font-size: 15px;
font-variant: small-caps; font-variant: small-caps;
text-decoration: none; text-decoration: none;
cursor:pointer; cursor: pointer;
margin: auto;
} }
article #container #copyseed a { article #container #copyseed a {
@ -324,12 +324,6 @@ article #container #copyseed a {
article #container #copyseed:hover { background:lightseagreen; } article #container #copyseed:hover { background:lightseagreen; }
article #container.diploma {
border-style: solid;
border-image: url(img/border.png) 64 64 64 62 repeat;
border-width: 8px 8px 8px 8px;
}
article #container.diploma #score { article #container.diploma #score {
background: url('img/red.png') no-repeat; background: url('img/red.png') no-repeat;
background-size: 180px; background-position: right bottom; background-size: 180px; background-position: right bottom;