From 45447adf99c41272f3610a67e4ceb185e34e81a7 Mon Sep 17 00:00:00 2001
From: Marcel <kingofdog@web.de>
Date: Wed, 10 Jan 2018 19:24:48 +0100
Subject: [PATCH] Fix timer & improve graphics

---
 index.html |  2 +-
 menu.js    |  1 +
 style.css  |  5 +++++
 tetris.js  | 50 ++++++++++++++++++++++++++++++++++++--------------
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/index.html b/index.html
index a929943..8f22f03 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
     <div id="lang-de" class="lang" data-lang="de">Deutsch</div>
 </div>
 <div id="background" class="blurred">
-    <div id="time">0:00</div>
+    <div id="time">00:00</div>
     <div id="score" data-prefix="Score: ">0</div>
     <canvas id="tetris" width="240" height="400"></canvas>
     <div id="controls"></div>
diff --git a/menu.js b/menu.js
index 6248014..79494e9 100644
--- a/menu.js
+++ b/menu.js
@@ -127,6 +127,7 @@ function hideMenu() {
     document.getElementById("game-title").style.opacity = "0";
     document.getElementById("game-play").style.opacity = "0";
     document.getElementById("game-reset").style.opacity = "0";
+    lastTimeUpdate = Date.now();
     fadeBlurOut();
     if(!firstRun) {
         update(lastTime);
diff --git a/style.css b/style.css
index 1905441..c329609 100644
--- a/style.css
+++ b/style.css
@@ -148,3 +148,8 @@ body {
 #corner-buttons > a:hover, #corner-buttons > a:active {
     color: rgba(255, 255, 255, 1);
 }
+
+#time {
+    margin-top: 5px;
+    margin-left: 10px;
+}
\ No newline at end of file
diff --git a/tetris.js b/tetris.js
index f6aea1d..7b1aeb3 100644
--- a/tetris.js
+++ b/tetris.js
@@ -2,14 +2,12 @@ const canvas = document.getElementById('tetris');
 const context = canvas.getContext('2d');
 
 const fieldSize = {x: 12, y: 20};
+const tileGap = .05;
 
 let isPaused = true;
 
 let startTime = 0;
-
-function clearScreen() {
-    context.clearRect(0, 0, canvas.width, canvas.height);
-}
+let prevUpdateScore = 0;
 
 function arenaSweep() {
     let rowCount = 1;
@@ -27,8 +25,15 @@ function arenaSweep() {
         player.score += rowCount * 10;
         rowCount *= 2;
     }
-    dropInterval -= player.score / 10;
-    dropInterval = dropInterval > 50 ? dropInterval : 50;
+    if (player.score - prevUpdateScore > 50) {
+        dropInterval -= -20;
+        dropInterval = dropInterval > 100 ? dropInterval : 100;
+        prevUpdateScore = player.score;
+    }
+}
+
+function clearScreen() {
+    context.clearRect(0, 0, canvas.width, canvas.height);
 }
 
 function collide(arena, player) {
@@ -111,12 +116,22 @@ function drawMatrix(matrix, offset) {
         row.forEach((value, x) => {
             if (value !== 0) {
                 context.fillStyle = colors[value];
-                context.fillRect(x + offset.x, y + offset.y, 1, 1);
+                context.fillRect(x + offset.x + tileGap / 2, y + offset.y + tileGap / 2, 1 - tileGap, 1 - tileGap);
             }
         });
     });
 }
 
+function gameOver() {
+    arena.forEach(row => row.fill(0));
+    passedTime = 0;
+    lastTimeUpdate = Date.now();
+    updateTime();
+    player.score = 0;
+    dropInterval = 1000;
+    updateScore();
+}
+
 function merge(arena, player) {
     player.matrix.forEach((row, y) => {
         row.forEach((value, x) => {
@@ -144,6 +159,7 @@ function playerMove(dir) {
     if (collide(arena, player)) {
         player.pos.x -= dir;
     }
+    dropCounter *= .75;
 }
 
 function playerReset() {
@@ -151,11 +167,9 @@ function playerReset() {
     player.matrix = createPiece(pieces[pieces.length * Math.random() | 0]);
     player.pos.y = 0;
     player.pos.x = (arena[0].length / 2 | 0) - (player.matrix[0].length / 2 | 0);
+
     if (collide(arena, player)) {
-        arena.forEach(row => row.fill(0));
-        player.score = 0;
-        dropInterval = 1000;
-        updateScore();
+        gameOver();
     }
 }
 
@@ -200,8 +214,6 @@ let dropInterval = 1000;
 
 let lastTime = 0;
 
-const timeEl = document.getElementById("time");
-
 function update(time = 0) {
     if(!isPaused) {
         const deltaTime = time - lastTime;
@@ -212,7 +224,7 @@ function update(time = 0) {
             playerDrop();
         }
 
-        timeEl.innerHTML = formatMillis(Date.now() - startTime);
+        updateTime();
 
         draw();
         requestAnimationFrame(update);
@@ -233,6 +245,16 @@ function updateScore() {
     document.getElementById('score').innerText = player.score.toString();
 }
 
+const timeEl = document.getElementById("time");
+let passedTime = 0;
+let lastTimeUpdate = Date.now();
+
+function updateTime() {
+    passedTime += Date.now() - lastTimeUpdate;
+    timeEl.innerHTML = formatMillis(passedTime);
+    lastTimeUpdate = Date.now();
+}
+
 const colors = [
     null,
     '#FF0D72',