From 06b61e58d2d487151ddfe8dc0661e091de7112a8 Mon Sep 17 00:00:00 2001
From: orphevs <ticlem27270@gmail.com>
Date: Sat, 9 Dec 2017 04:29:00 +0100
Subject: [PATCH] 270 SEVRAN

---
 assets/css/style.css |  2 ++
 assets/js/script.js  | 77 +++++++++++++++++++-------------------------
 2 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/assets/css/style.css b/assets/css/style.css
index a703e4f..ff626a6 100644
--- a/assets/css/style.css
+++ b/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;
 
 }
 
diff --git a/assets/js/script.js b/assets/js/script.js
index 0567bf2..55a5a87 100644
--- a/assets/js/script.js
+++ b/assets/js/script.js
@@ -32,25 +32,25 @@ var bulletDir = direction;
 function setPosition (posX, posY, dir) {
     gridX = x;
     gridY = y;
-    
+
     var grid = document.querySelector('.line-'+posY+' .col-'+posX);
-    
+
     if(grid.classList.contains('cible')){
         return;
     }
-    
+
     var grids = document.querySelectorAll('.col');
-    
+
     grids.forEach(function(e){
         e.style.background = '';
         e.style.backgroundPosition = '';
     });
-    
+
     direction = dir;
-    
+
     grid.style.background = 'url(./assets/img/tank_bg.png) no-repeat';
     grid.style.backgroundPosition = direction;
-    
+
     x = posX;
     y = posY;
 }
@@ -62,39 +62,39 @@ function getPosition () {
 function tirer () {
     var posX = x;
     var posY = y;
-    
+
     switch(direction){
         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
     }
-    
+
     if(posX < 1 || posX > maxX || posY < 1 || posY > maxY){
         return;
     }
-    
+
     bulletX = posX;
     bulletY = posY;
     bulletDir = direction;
-    
+
     var grid = document.querySelector('.line-'+posY+' .col-'+posX);
-    
+
     grid.style.background = 'url(./assets/img/bg_bullet.png) no-repeat';
     grid.style.backgroundPosition = bulletDir;
 }
 
 function move(event) {
     var k = event.key;
-    
+
     if(k == controls.up && y > 1){
         var newY = y-1;
         setPosition(x, newY, rotation.up);
@@ -113,18 +113,17 @@ function move(event) {
     }
 }
 
-<<<<<<< Updated upstream
 setInterval(function(){
     console.log('test');
     if(bulletX == 0 || bulletY == 0){
         return;
     }
-    
+
     var newY = bulletY;
     var newX = bulletX;
-    
+
     var bulletDestination = document.querySelector('.line-'+newY+' .col-'+newX);
-    
+
     if(bulletDestination.classList.contains('cible')){
         bulletDestination.classList.remove('cible');
         cibleValue = cibleValue - 1;
@@ -138,7 +137,7 @@ setInterval(function(){
         }, 1000);
         return;
     }
-    
+
     switch(bulletDir){
         case rotation.up:
             newY--;
@@ -153,23 +152,23 @@ setInterval(function(){
             newX++;
             break;
     }
-    
-    
+
+
     if(newY < 1 || newY > maxY || newX < 1 || newX > maxX){
         var grid = document.querySelector('.line-'+bulletY+' .col-'+bulletX);
-        
+
         grid.style.background = '';
         grid.style.backgroundPosition = '';
         return;
     }
-    
+
     var grid = document.querySelector('.line-'+bulletY+' .col-'+bulletX);
-        
+
     grid.style.background = '';
     grid.style.backgroundPosition = '';
-    
+
     var bulletDestination = document.querySelector('.line-'+newY+' .col-'+newX);
-    
+
     if(bulletDestination.classList.contains('cible')){
         bulletDestination.classList.remove('cible');
         cibleValue = cibleValue - 1;
@@ -183,18 +182,15 @@ setInterval(function(){
         }, 1000);
         return;
     }
-    
+
     bulletX = newX;
     bulletY = newY;
-    
+
     var grid = document.querySelector('.line-'+bulletY+' .col-'+bulletX);
-        
+
     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);
@@ -205,28 +201,23 @@ var ntm = setInterval(function(){
     if (y2 == y){
         y2 = y+1;
     }
-    
+
     if(ciblex < maxX && cibley < maxY){
         console.log(ciblex+' pour '+maxX);
         emplacement = document.querySelector(".line-"+ciblex+" .col-"+cibley);
         emplacement.classList.add('cible');
     }
-    
+
     var ciblex = x2,
         cibley = y2,
         emplacement = document.querySelector(".line-"+ciblex+" .col-"+cibley);
     emplacement.classList.add('cible');
     cibleValue = cibleValue + 1;
-   if (cibleValue>=3){
+    if (cibleValue>=3){
         alert("TAS PERDU");
         clearInterval(ntm);
     }
 }, 1000);
 
 document.addEventListener('keydown', move, false);
-setPosition(x, y, direction);
-=======
-
-
-}, 3000);
->>>>>>> Stashed changes
+setPosition(x, y, direction);
\ No newline at end of file