Skip to content
Snippets Groups Projects
Commit b66c0e0b authored by benjamin.sitbon's avatar benjamin.sitbon
Browse files

changement des images des types et ajustement de l'affichage dans la selection du pokemon

parent 02ad8c92
No related branches found
No related tags found
No related merge requests found
Showing
with 37 additions and 12 deletions
frontend/img/types/bug.png

2.96 KiB

frontend/img/types/dark.png

3.25 KiB

frontend/img/types/dragon.png

3.25 KiB

frontend/img/types/electric.png

2.89 KiB

frontend/img/types/fairy.png

2.13 KiB

frontend/img/types/fighting.png

3.02 KiB

frontend/img/types/fire.png

2.06 KiB

frontend/img/types/flying.png

2.22 KiB

frontend/img/types/ghost.png

3.01 KiB

frontend/img/types/grass.png

2.88 KiB

frontend/img/types/ground.png

2.15 KiB

frontend/img/types/ice.png

2.82 KiB

frontend/img/types/normal.png

3.06 KiB

frontend/img/types/poison.png

3.03 KiB

frontend/img/types/psychic.png

2.19 KiB

frontend/img/types/rock.png

2.81 KiB

frontend/img/types/steel.png

2.59 KiB

frontend/img/types/water.png

2.16 KiB

......@@ -124,13 +124,13 @@
stats.then(stat => {
if(stat.types.length > 1){
types[2*i].src = "img/types/" + stat.types[0].type.name + ".jpg";
types[(2*i)+1].src = "img/types/" + stat.types[1].type.name + ".jpg";
types[2*i].src = "img/types/" + stat.types[0].type.name + ".png";
types[(2*i)+1].src = "img/types/" + stat.types[1].type.name + ".png";
}
else{
types[2*i].src = "img/types/" + stat.types[0].type.name + ".jpg";
types[2*i].src = "img/types/" + stat.types[0].type.name + ".png";
types[(2*i)+1].style.display = "none";
}
})
......
......@@ -57,7 +57,7 @@
}
}
function getMoves(stat,description,abilities,selection,choice){
function getMoves(infos,stat,description,abilities,selection,choice){
......@@ -69,25 +69,36 @@
let ability = document.createElement("div");
ability.className = "ability";
let txt = document.createElement("p");
txt.innerHTML = data.moves[i].move.name;
let type = document.createElement("img");
type.className = "type";
let dmgclass = document.createElement("img");
dmgclass.className = "dmgclass";
get(data.moves[i].move.url).then(move => {
type.src = "img/types/" + move.type.name +".jpg";
type.src = "img/types/" + move.type.name +".png";
dmgclass.src = "img/types/" + move.damage_class.name + ".png";
ability.onclick = function(){
infos.children[0].src = type.src;
infos.children[0].className = "type";
infos.children[1].src = dmgclass.src;
infos.children[1].className = "dmgclass";
description.innerHTML = move.effect_entries[0].effect;
stat.innerHTML = "PP: " + move.pp + " - Power: " + move.power + " - Accuracy: " + move.accuracy;
infos.appendChild(stat);
}
})
let txt = document.createElement("p");
txt.innerHTML = data.moves[i].move.name;
ability.appendChild(type);
ability.appendChild(dmgclass);
......@@ -101,14 +112,20 @@
}
function getFirstMove(stat,description,pokemon){
function getFirstMove(infos,stat,description,pokemon){
pokemon.then(data =>{
get(data.moves[0].move.url).then(move => {
infos.children[0].src = "img/types/" + move.type.name +".png";
infos.children[0].className = "type";
infos.children[1].src = "img/types/" + move.damage_class.name + ".png";
infos.children[1].className = "dmgclass";
description.innerHTML = move.effect_entries[0].effect;
stat.innerHTML = "PP: " + move.pp + " - Power: " + move.power + " - Accuracy: " + move.accuracy;
infos.appendChild(stat);
});
});
......@@ -127,14 +144,22 @@
let description = document.createElement("div");
description.className = "description";
let infos = document.createElement("div");
infos.className = "infos";
infos.appendChild(document.createElement("img"));
infos.appendChild(document.createElement("img"));
let stats = document.createElement("p");
let desc = document.createElement("p");
getFirstMove(stats,desc,selection);
getMoves(stats,desc,abilities,selection,choice);
getFirstMove(infos,stats,desc,selection);
getMoves(infos,stats,desc,abilities,selection,choice);
description.appendChild(infos);
description.appendChild(stats);
description.appendChild(desc);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment