From c0acba71bc9e8efadfe5ce07b2159e5028fb8cff Mon Sep 17 00:00:00 2001
From: adrien <adrien@malingrey.fr>
Date: Fri, 21 Apr 2023 22:02:02 +0200
Subject: [PATCH] fix line clear

---
 app.js         | 5 ++---
 css/common.css | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 462111a..941d3e1 100644
--- a/app.js
+++ b/app.js
@@ -701,7 +701,7 @@ function lockDown() {
 
     lockedMinoesCoord = matrix.piece.minoesCoord[matrix.piece.orientation]
         .translate(matrix.piece.center)
-    if (lockedMinoesCoord.every(minoCoord => minoCoord.y >= 4)) {
+    if (lockedMinoesCoord.some(minoCoord => minoCoord.y >= 4)) {
         lockedMinoesCoord.forEach(minoCoord => {
             matrix.lockedMinoes[minoCoord.y][minoCoord.x] = matrix.piece.className
             matrix.drawMino(minoCoord, matrix.piece.className)
@@ -713,7 +713,6 @@ function lockDown() {
             let [a, b, c, d] = matrix.piece.tSlots[matrix.piece.orientation]
                 .translate(matrix.piece.center)
                 .map(minoCoord => !matrix.cellIsEmpty(minoCoord))
-                .sort()
             if (a && b && (c || d))
                 tSpin = T_SPIN.T_SPIN
             else if (c && d && (a || b))
@@ -723,6 +722,7 @@ function lockDown() {
         // Cleared lines
         let clearedLines = Array.from(new Set(lockedMinoesCoord.map(minoCoord => minoCoord.y)))
             .filter(y =>  matrix.lockedMinoes[y].filter(lockedMino => lockedMino).length == matrix.columns)
+            .sort()
         for (y of clearedLines) {
             matrix.lockedMinoes.splice(y, 1)
             matrix.lockedMinoes.unshift(Array(matrix.columns))
@@ -738,7 +738,6 @@ function lockDown() {
 }
 
 function gameOver() {
-    console.log("GAME OVER")
     matrix.piece.locked = false
     matrix.drawPiece()
     document.onkeydown = null
diff --git a/css/common.css b/css/common.css
index 3d1d479..8b1bf89 100644
--- a/css/common.css
+++ b/css/common.css
@@ -130,13 +130,13 @@ span {
         opacity: 1;
         transform: scale3d(1, 1, 1);
     }
-    90% {
+    85% {
         opacity: 1;
         transform: scale3d(1, 1, 1);
     }
     to {
         opacity: 0;
-        transform: scale3d(1.5, 1, 1);
+        transform: scale3d(1.5, 0, 1);
     }
 }
 
@@ -150,13 +150,13 @@ span {
         transform:translateZ(0);
         transform: scale3d(1, 1, 1);
     }
-    90% {
+    85% {
         opacity: 1;
         transform: scale3d(1, 1, 1);
     }
     to {
         opacity: 0;
-        transform: scale3d(1.5, 1, 1);
+        transform: scale3d(1.5, 0, 1);
     }
 }