complete all game timing features

szymonSys · Sep 3, 2019 · 335d673 · 335d673
1 parent eba022c
commit 335d673
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/Controller.js b/Controller.js
@@ -22,7 +22,7 @@ class Controller {
             }
             if (this.game.gameState === 'win') {
                this.game.stopGame(this.grid);
-               this.interface.addGameSummary(this.game.stats.timerValue, this.game.stats.actionsCounter, this.game.initGame, this.grid, this.interface.timer, this.interface.actionsCounter, this.game, document.getElementById('container'))
+               this.interface.addGameSummary(this.game.stats._getTimerResoult(), this.game.stats.actionsCounter, this.game.initGame, this.grid, this.interface.timer, this.interface.actionsCounter, this.game, document.getElementById('container'))
             }
          })
       });

diff --git a/Stats.js b/Stats.js
@@ -6,6 +6,14 @@ class Stats {
     this._actionsCounter = 0;
     this._isPlay = false;
     this._timerIntervalCount;
+    const _timerValues = {
+      minutes: 0,
+      seconds: 0,
+      stringMinutes: '',
+      stringResoult: ''
+    }
+    this._getTimerValues = () => _timerValues;
+    this._getTimerResoult = () => _timerValues.stringResoult;
   }
 
   get username() {
@@ -61,17 +69,28 @@ class Stats {
 
   resetTimer(timer) {
     if (this.isPlay) this.changeIsPlay();
+    const values = this._getTimerValues();
+    values.seconds = 0;
+    values.minutes = 0;
+    values.stringMinutes = '';
     this._timerValue = 0;
-    timer.textContent = "0.00";
+    timer.textContent = "00.00";
   }
 
   updateTimer(timer) {
     if (this.isPlay === false) return;
-    this._timerValue += 1;
-    timer.textContent = this.timerValue;
-    setTimeout(this.updateTimer.bind(this, timer), 1000);
+    const values = this._getTimerValues();
+    values.seconds = (this.timerValue / 100) % 60;
+    this.timerValue++;
+    if ((this.timerValue / 100) % 60 === 0) values.minutes++;
+    if (values.minutes > 0 && values.minutes < 10) values.stringMinutes = '0' + values.minutes + '.';
+    else if (values.minutes > 10) values.stringMinutes = values.minutes + '.';
+    values.stringResoult = `${values.stringMinutes}${values.seconds < 10 ? '0' + values.seconds.toFixed(2) : values.seconds.toFixed(2)}`;
+    timer.textContent = values.stringResoult;
+    setTimeout(this.updateTimer.bind(this, timer), 10);
   }
 
+
   updateActionsCounter() {
     if (this.isPlay === true) {
       this.actionsCounter += 1;

diff --git a/index.html b/index.html
@@ -31,7 +31,7 @@
           </button>
           <span id="username"></span>
         </div>
-        <div class="timer">game time: <span id="timer">0.00</span></div>
+        <div class="timer">game time: <span id="timer">00.00</span></div>
         <div class="actions">actions counter: <span id="actions">0</span></div>
       </div>
       <div id="grid" class="game-grid"></div>