update js

assets/css/style.css

@@ -66,6 +66,8 @@ body{
     padding-top: 150px;
     background: rgba(155, 0, 0, 0.85);
     box-shadow: inset 0px 0px 60px 0px rgba(0,0,0,0.75);
+    display: none;
+    z-index: 4;
 
 }
 

assets/js/script.js

@@ -66,13 +66,13 @@ function tirer () {
         case rotation.up:
             posY--;
             break
-        case rotation.down:
+            case rotation.down:
             posY++;
             break
-        case rotation.left:
+            case rotation.left:
             posX--;
             break
-        case rotation.right:
+            case rotation.right:
             posX++;
             break
     }
@@ -112,7 +112,6 @@ function move(event) {
     }
 }
 
-<<<<<<< Updated upstream
 setInterval(function(){
     console.log('test');
     if(bulletX == 0 || bulletY == 0){
@@ -193,9 +192,6 @@ setInterval(function(){
     grid.style.background = 'url(./assets/img/bg_bullet.png) no-repeat';
     grid.style.backgroundPosition = bulletDir;
 }, 32.12);
-=======
-document.addEventListener('keydown', move, false);
->>>>>>> Stashed changes
 
 var ntm = setInterval(function(){ 
     x2 = Math.floor(Math.random() * 11);
@@ -218,6 +214,7 @@ var ntm = setInterval(function(){
         emplacement = document.querySelector(".line-"+ciblex+" .col-"+cibley);
     emplacement.classList.add('cible');
     cibleValue = cibleValue + 1;
+<<<<<<< HEAD
    if (cibleValue>=4){
         // game over
         console.log("TAS PERDU");
@@ -227,8 +224,3 @@ var ntm = setInterval(function(){
 
 document.addEventListener('keydown', move, false);
 setPosition(x, y, direction);
-=======
-
-
-}, 3000);
->>>>>>> Stashed changes