Skip to content
Snippets Groups Projects
Commit eecafa02 authored by Clement Franckelemon's avatar Clement Franckelemon
Browse files

Ajout de la mort des ennemies et ajout de score

parent e661c809
No related branches found
No related tags found
1 merge request!12Main
......@@ -26,20 +26,35 @@ module.exports = class Game{
for(let i = 0; i<remove;i++){
this.missiles.unshift();
}
this.verifDead();
}, 1000/60);
}
verifDead(){
this.missiles.forEach(missile => {
const deads = [];
const ennemiesMorts = [];
this.ennemies.forEach(ennemie => {
if((missile.missileX < ennemie.x+50 || missile.missileX > ennemie.x-50) && (missile.missileY < ennemie.y || missile.missileY > ennemie.y-50)){
deads.push(ennemie);
if ((missile.missileX < ennemie.x + 100 && missile.missileX > ennemie.x - 100) &&
(missile.missileY < ennemie.y + 150 && missile.missileY > ennemie.y + 20)) {
ennemiesMorts.push(ennemie);
}
});
deads.forEach(element => {
this.ennemies.filter(undefined,items => items !== element);
})
if (ennemiesMorts.length > 0) {
ennemiesMorts.forEach(ennemieMort => {
console.log(ennemieMort.id);
if (missile.proprietaire === this.playerOne.pseudo) {
this.playerOne.score += 100;
} else {
this.playerTwo.score += 100;
}
// Supprimer l'ennemi mort de la liste
this.ennemies = this.ennemies.filter(ennemie => ennemie !== ennemieMort);
});
// Supprimer le missile
this.missiles = this.missiles.filter(m => m !== missile);
}
});
}
......
......@@ -111,13 +111,13 @@ app.post( "/launchGame", async ( req, res ) => {
socket.on('playerData',(data) => {
if(socket.id == game.playerOne.socketID){
game.playerOne.actualiseSpeed(data.x,data.y);
if(data.shoot && lastShootJ1+1000 < performance.now()){
if(data.shoot && lastShootJ1+350 < performance.now()){
lastShootJ1 = performance.now();
game.addMissile(new Missile(game.playerOne.pseudo,game.playerOne.x,game.playerOne.y,false));
}
} else {
game.playerTwo.actualiseSpeed(data.x,data.y);
if(data.shoot && lastShootJ2+1000 < performance.now()){
if(data.shoot && lastShootJ2+350 < performance.now()){
lastShootJ2 = performance.now();
game.addMissile(new Missile(game.playerTwo.pseudo,game.playerTwo.x,game.playerTwo.y,false));
}
......@@ -129,7 +129,7 @@ app.post( "/launchGame", async ( req, res ) => {
});
socket.on('disconnect', () => {
console.log('Un client s\'est déconnecté');
if(game.playerTwo.socketID == socket.id){
if(game.playerTwo != null && game.playerTwo.socketID == socket.id){
game.playerTwo = null;
} else if(game.playerOne.socketID == socket.id) {
if(game.playerTwo != null){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment