Update index.js

htdocs/index.js

@@ -501,12 +501,20 @@ function highlightMoves(tour,piece, row, col) {
             }            
         }
         if (row==0 && col == 4) {//position roi noir d'origine
+<<<<<<< Updated upstream
             if (board[0][3] === ""  && board[0][2] ==="" && board[0][1] ==="" && board[0][0] ==="T"){//rock à gauche 
+=======
+            if (board[0][3] === ""  && board[0][2] ==="" && board[0][1] ==="" && board[0][0] ==="t"){//rock à gauche 
+>>>>>>> Stashed changes
                 let newRow = row;
                 let newCol = 2;
                 moves.push({ row: newRow, col: newCol });
             }
+<<<<<<< Updated upstream
             if (board[0][5] === ""  && board[0][6] ==="" && board[0][7] ==="T"){//rock à droite
+=======
+            if (board[0][5] === ""  && board[0][6] ==="" && board[0][7] ==="t"){//rock à droite
+>>>>>>> Stashed changes
                 let newRow = row;
                 let newCol = 6;
                 moves.push({ row: newRow, col: newCol });
@@ -699,6 +707,8 @@ function movePiece(piece, newRow, newCol) {
             socket.emit('echec');
         }
 
+=======
+>>>>>>> Stashed changes
         //Verifie si c'était un rock
         if (piece.toLowerCase() == "k" && Math.abs(newCol-selectedPosition.col)==2){
             if (newCol-selectedPosition.col==2){//rock à droite
@@ -737,7 +747,11 @@ function movePiece(piece, newRow, newCol) {
                         to: { x: 7, y: 3 },        // Position d'arrivée
                         piece: "t"}
                     })
+<<<<<<< Updated upstream
                 } else if (player.isBlackPlayer){
+=======
+                } else {
+>>>>>>> Stashed changes
                     board[0][3]="T"
                     board[0][0]=""
                     socket.emit('roque', {