From 2cd305fee0578c254b763eaa089bec4ddfb1cbb4 Mon Sep 17 00:00:00 2001
From: Adrien MALINGREY <adrien@malingrey.fr>
Date: Sun, 3 Nov 2019 02:23:28 +0100
Subject: [PATCH] little changes

---
 css/style.css                |  8 ++-----
 css/themes/tetris-effect.css |  1 +
 index.php                    |  7 +++---
 js/webtris.js                | 44 ++++++++++++++++++++++++++----------
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/css/style.css b/css/style.css
index 3a57b13..d48686e 100644
--- a/css/style.css
+++ b/css/style.css
@@ -41,13 +41,9 @@ div {
     flex-wrap: wrap;
     justify-content: center;
     align-content: center;
-    margin: 4vmin;
+    margin: 2vmin auto;
     text-align: center;
-    column-gap: 1vmin;
-}
-
-div * {
-    margin: auto 2vmin;
+    column-gap: 2vmin;
 }
 
 fieldset {
diff --git a/css/themes/tetris-effect.css b/css/themes/tetris-effect.css
index 89293c4..5c0b5d1 100644
--- a/css/themes/tetris-effect.css
+++ b/css/themes/tetris-effect.css
@@ -16,6 +16,7 @@
 
 .locked-mino {
     background: rgba(242, 255, 255, 0.5);
+    border-color: rgba(242, 255, 255, 0.7);
 }
 
 .cleared-line {
diff --git a/index.php b/index.php
index feab519..6569fe5 100644
--- a/index.php
+++ b/index.php
@@ -95,11 +95,12 @@
             </div>
             <button type="button" onclick="hideSettings()">RETOUR</button>
         </div>
-        <div id="start">
+        <fieldset id="start">
+            <legend>Nouvelle partie</legend>
             <label for="startLevel">Niveau</label>
             <input type="number" id="startLevel" min="1" max="15" step="1">
-            <button id="startButton" type="button" onclick="start()" disabled>JOUER</button>
-        </div>
+            <button id="startButton" type="button" onclick="newGame()" disabled>JOUER</button>
+        </fieldset>
         <div>
             <button id="settingsButton" type="button" onclick="showSettings()" disabled>OPTIONS</button>
         </div>
diff --git a/js/webtris.js b/js/webtris.js
index 5b72a63..842a19c 100644
--- a/js/webtris.js
+++ b/js/webtris.js
@@ -206,7 +206,6 @@ class MinoesTable {
     constructor(id, rows, columns) {
         this.rows = rows
         this.columns = columns
-        this.piece = null
         this.table = document.getElementById(id)
     }
 
@@ -233,6 +232,10 @@ class HoldQueue extends MinoesTable {
         super("hold", HOLD_ROWS, HOLD_COLUMNS)
     }
 
+    newGame() {
+        this.piece = null
+    }
+
     draw() {
         this.clearTable()
         if (this.piece && state != STATE.PAUSED)
@@ -244,6 +247,9 @@ class HoldQueue extends MinoesTable {
 class Matrix extends MinoesTable {
     constructor() {
         super("matrix", MATRIX_ROWS, MATRIX_COLUMNS)
+    }
+
+    newGame() {
         this.lockedMinoes = Array.from(Array(MATRIX_ROWS+3), row => Array(MATRIX_COLUMNS))
         this.piece = null
         this.clearedLines = []
@@ -303,6 +309,9 @@ class Matrix extends MinoesTable {
 class NextQueue extends MinoesTable {
     constructor() {
         super("next", NEXT_ROWS, NEXT_COLUMNS)
+    }
+
+    newGame() {
         this.pieces = Array.from({length: NEXT_PIECES}, (v, k) => new Tetromino(NEXT_PIECES_POSITIONS[k]))
     }
 
@@ -331,12 +340,18 @@ class Stats {
         this.levelCell = document.getElementById("level")
         this.goalCell = document.getElementById("goal")
         this.clearedLinesCell = document.getElementById("clearedLines")
-        this._score = 0
         this.highScore = Number(localStorage.getItem('highScore'))
-        this.highScoreCell.innerHTML = this.highScore.toLocaleString()
+        this.highScoreCell.innerText = this.highScore.toLocaleString()
+    }
+
+    newGame() {
+        this.score = 0
         this.goal = 0
+        this.goalCell.innerText = this.goal
         this.clearedLines = 0
+        this.clearedLinesCell.innerText = this.clearedLines
         this.time = 0
+        this.timeCell.innerText = timeFormat(0)
         this.combo = -1
         this.lockDelay = LOCK_DELAY
         this.fallPeriod = FALL_PERIOD
@@ -349,10 +364,10 @@ class Stats {
     set score(score) {
         if (score != NaN) {
             this._score = score
-            this.scoreCell.innerHTML = this._score.toLocaleString()
+            this.scoreCell.innerText = this._score.toLocaleString()
             if (score > this.highScore)
                 this.highScore = score
-                this.highScoreCell.innerHTML = this.highScore.toLocaleString()
+                this.highScoreCell.innerText = this.highScore.toLocaleString()
         }
     }
 
@@ -361,10 +376,10 @@ class Stats {
             this.level = level
         else
             this.level++
-        this.levelCell.innerHTML = this.level
+        this.levelCell.innerText = this.level
         printTempTexts(`LEVEL<br/>${this.level}`)
         this.goal += 5 * this.level
-        this.goalCell.innerHTML = this.goal
+        this.goalCell.innerText = this.goal
         if (this.level <= 20)
             this.fallPeriod = 1000 * Math.pow(0.8 - ((this.level - 1) * 0.007), this.level - 1)
         if (this.level > 15)
@@ -386,10 +401,10 @@ class Stats {
 
         if (clearedLines || tSpin) {
             this.clearedLines += clearedLines
-            this.clearedLinesCell.innerHTML = clearedLines
+            this.clearedLinesCell.innerText = clearedLines
             patternScore = SCORES[clearedLines][tSpin]
             this.goal -= patternScore
-            this.goalCell.innerHTML = this.goal
+            this.goalCell.innerText = this.goal
             patternScore *= 100 * this.level
             patternName = patternName.join("\n")
         }
@@ -410,8 +425,13 @@ class Stats {
 
 
 // Functions
-function start() {
+function newGame() {
     document.getElementById("startButton").blur()
+
+    holdQueue.newGame()
+    matrix.newGame()
+    nextQueue.newGame()
+    stats.newGame()
     
     var startLevel = document.getElementById("startLevel").value
     localStorage.setItem("startLevel", startLevel)
@@ -610,7 +630,7 @@ function gameOver() {
     XHR.open('POST', 'inleaderboard.php')
     XHR.send(FD)
 
-    document.getElementById("game").style.display = "none"
+    document.getElementById("game").style.display = "grid"
     document.getElementById("settings").style.display = "none"
     document.getElementById("start").style.display = "flex"
     document.getElementById("settingsButton").style.display = "flex"
@@ -760,7 +780,7 @@ function delTempTexts(self) {
 }
 
 function clock() {
-    stats.timeCell.innerHTML = timeFormat(1000 * ++stats.time)
+    stats.timeCell.innerText = timeFormat(1000 * ++stats.time)
 }
 
 function getKeyName(action) {