keb/poketest
1
0
Fork 0
Code Issues Releases Activity

Compare commits

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

3 Commits
4ab3df9b81 ... a4b32ca3ae

Author SHA1 Message Date
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
8 changed files with 16 additions and 35 deletions
Show Stats Expand all files Collapse all files

6
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="style.css" id="stylesheet">
<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="poketest.js"></script>
<title>Pokétest - About</title>
@ -76,13 +76,13 @@
</p>
<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 - 2024.</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>
</article>
</div>
<footer>
<p>© 2012 - 2023 Pokétest 2.9</p>
<p>© 2012 - 2024 Pokétest 2.9</p>
</footer>
</body>
</html>

4
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="style.css" id="stylesheet">
<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="interface.js"></script>
<script src="flashdex.js"></script>
@ -87,7 +87,7 @@
</div>
</article>
<footer>
<p>© 2012 - 2023 Pokétest 2.9</p>
<p>© 2012 - 2024 Pokétest 2.9</p>
</footer>
</div>
</body>

BIN
img/border.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.9 KiB

8
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="style.css" id="stylesheet">
<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="poketest.js"></script>
<title>Pokétest</title>
@ -120,7 +120,7 @@
<h3>Number of questions</h3>
<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="30" value="30">30</option>
<option name="questions" id="50" value="50">50</option>
@ -131,7 +131,7 @@
<h3>Time to answer</h3>
<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="5" value="5" selected>5 seconds</option>
<option name="time" id="10" value="10">10 seconds</option>
@ -150,7 +150,7 @@
</div>
</article>
<footer>
<p>© 2012 - 2023 Pokétest 2.9</p>
<p>© 2012 - 2024 Pokétest 2.9</p>
</footer>
</div>
<script>

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

19
poketest.js
View File

@ -187,9 +187,9 @@ $(document).ready(function() {
if (randomValue == 0)
return pklist.mn[result]["num"];
else if (randomValue == 1)
return pklist.mn[result]["num"]+'RB';
return pklist.mn[result]["num"]+'-RB';
else if (randomValue == 2)
return pklist.mn[result]["num"]+'RG';
return pklist.mn[result]["num"]+'-RG';
}
return pklist.mn[result]["num"];
}
@ -346,16 +346,6 @@ $(document).ready(function() {
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()
{
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="'+
generateSeed()+'">');
$('article #container #share').empty().append('<div id="copyseed"><a href="#">Copy</a></div><a href="https://twitter.com/share" \
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 #share').empty().append('<div id="copyseed"><a href="#">Copy</a></div>');
$('article #container #answers').empty().append('<p class="button"><input type="submit" \
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 {
float: left;
width: 60px; height: 16px;
display: block;
padding: 10px; padding-top: 4px; padding-bottom: 8px;
@ -313,7 +312,8 @@ article #container #copyseed {
font-size: 15px;
font-variant: small-caps;
text-decoration: none;
cursor:pointer;
cursor: pointer;
margin: auto;
}
article #container #copyseed a {
@ -324,12 +324,6 @@ article #container #copyseed a {
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 {
background: url('img/red.png') no-repeat;
background-size: 180px; background-position: right bottom;