add enemiLV2

client/src/main.js

@@ -124,22 +124,7 @@ function render() {
 	console.log(sec);
 	context.clearRect(0, 0, canvas.width, canvas.height);
 	context.drawImage(background, 0, 0, canvas.width, canvas.height);
-	
-	
-	
-	enemis.forEach(enemi => {
-		console.log(enemi.getDifficulte());
-		if (
-			enemi.x <= canvas.width - enemi.image.width &&
-			enemi.y <= canvas.height &&
-			enemi.x >= 0 &&
-			enemi.y >= 0
-		) {
-			draw(canvas, context, enemi.image, enemi.x, enemi.y);
-		} else {
-			enemis.splice(enemis.indexOf(enemi), 1);
-		}
-	});
+
 	context.font = '40pt New Super Mario Font U';
 	context.fillStyle = 'blue';
 	context.fillText(avatar.getScore(), 10, 50);
@@ -165,7 +150,11 @@ function render() {
 		newEnemis = data;
 	});
 	newEnemis.forEach(enemi => {
-		context.drawImage(imageEnemi, enemi.x, enemi.y);
+		if (enemi.difficulté == 1) {
+			draw(canvas, context, imageEnemi, enemi.x, enemi.y);
+		} else if (enemi.difficulté == 2) {
+			draw(canvas, context, imageEnemi2, enemi.x, enemi.y);
+		}
 	});
 
 	requestAnimationFrame(render);

server/index.js

@@ -91,7 +91,7 @@ io.on('connection', socket => {
 });
 
 let spawnIntervalLV1 = setInterval(() => {
-	if (t.getMin() > 1) {
+	if (t.getSec() >= 10) {
 		LVL2start = true;
 	}
 
@@ -110,6 +110,8 @@ let spawnIntervalLV2 = setInterval(() => {
 			randomY = Math.random() * (canvasSize.height - 0) + 0;
 		} while (randomY > canvasSize.height - 100);
 		const newEnemy = new enemi(canvasSize.width - 100, randomY, 1, 2);
+		newEnemy.setVx(10);
+		newEnemy.setVy(4);
 		enemis.push(newEnemy);
 	}
 }, 800);
@@ -121,10 +123,6 @@ setInterval(() => {
 	avatars.forEach(avatar => {
 		avatar.canvasSize = canvasSize;
 		enemis.forEach(enemi => {
-			if (LVL2start) {
-				enemi.setVx(10);
-				enemi.setVy(4);
-			}
 			if (enemi.hitbox.colision(avatar.hitbox)) {
 				if (canLostLifeAvatar) {
 					avatar.decrementScore(5);