Store best score in localStorage

Dependency injection and hide best score for incompatible browsers
This commit is contained in:
Tim Petricola
2014-03-10 16:02:16 -04:00
parent 57deb5d998
commit 664546ef9a
7 changed files with 86 additions and 17 deletions
+5 -1
View File
@@ -11,6 +11,7 @@
<script src="js/html_actuator.js"></script> <script src="js/html_actuator.js"></script>
<script src="js/grid.js"></script> <script src="js/grid.js"></script>
<script src="js/tile.js"></script> <script src="js/tile.js"></script>
<script src="js/local_score_manager.js"></script>
<script src="js/game_manager.js"></script> <script src="js/game_manager.js"></script>
<script src="js/application.js"></script> <script src="js/application.js"></script>
@@ -22,7 +23,10 @@
<div class="container"> <div class="container">
<div class="heading"> <div class="heading">
<h1 class="title">2048</h1> <h1 class="title">2048</h1>
<div class="score-container">0</div> <div class="scores-container">
<div class="score-container">0</div>
<div class="best-container">0</div>
</div>
</div> </div>
<p class="game-intro">Join the numbers and get to the <strong>2048 tile!</strong></p> <p class="game-intro">Join the numbers and get to the <strong>2048 tile!</strong></p>
+1 -1
View File
@@ -1,6 +1,6 @@
document.addEventListener("DOMContentLoaded", function () { document.addEventListener("DOMContentLoaded", function () {
// Wait till the browser is ready to render the game (avoids glitches) // Wait till the browser is ready to render the game (avoids glitches)
window.requestAnimationFrame(function () { window.requestAnimationFrame(function () {
var manager = new GameManager(4, KeyboardInputManager, HTMLActuator); new GameManager(4, KeyboardInputManager, HTMLActuator, LocalScoreManager);
}); });
}); });
+12 -5
View File
@@ -1,7 +1,8 @@
function GameManager(size, InputManager, Actuator) { function GameManager(size, InputManager, Actuator, ScoreManager) {
this.size = size; // Size of the grid this.size = size; // Size of the grid
this.inputManager = new InputManager; this.inputManager = new InputManager;
this.actuator = new Actuator; this.scoreManager = new ScoreManager;
this.actuator = new Actuator(this.scoreManager.isSupported());
this.startTiles = 2; this.startTiles = 2;
@@ -51,11 +52,17 @@ GameManager.prototype.addRandomTile = function () {
// Sends the updated grid to the actuator // Sends the updated grid to the actuator
GameManager.prototype.actuate = function () { GameManager.prototype.actuate = function () {
if (this.scoreManager.get() < this.score) {
this.scoreManager.set(this.score);
}
this.actuator.actuate(this.grid, { this.actuator.actuate(this.grid, {
score: this.score, score: this.score,
over: this.over, over: this.over,
won: this.won won: this.won,
bestScore: this.scoreManager.get()
}); });
}; };
// Save all tile positions and remove merger info // Save all tile positions and remove merger info
+14 -1
View File
@@ -1,9 +1,15 @@
function HTMLActuator() { function HTMLActuator(bestScoreSupported) {
this.tileContainer = document.getElementsByClassName("tile-container")[0]; this.tileContainer = document.getElementsByClassName("tile-container")[0];
this.scoreContainer = document.getElementsByClassName("score-container")[0]; this.scoreContainer = document.getElementsByClassName("score-container")[0];
this.bestContainer = document.getElementsByClassName("best-container")[0];
this.messageContainer = document.getElementsByClassName("game-message")[0]; this.messageContainer = document.getElementsByClassName("game-message")[0];
this.score = 0; this.score = 0;
this.bestScoreSupported = bestScoreSupported;
if (!this.bestScoreSupported) {
this.bestContainer.style.display = "none";
}
} }
HTMLActuator.prototype.actuate = function (grid, metadata) { HTMLActuator.prototype.actuate = function (grid, metadata) {
@@ -21,6 +27,7 @@ HTMLActuator.prototype.actuate = function (grid, metadata) {
}); });
self.updateScore(metadata.score); self.updateScore(metadata.score);
self.updateBestScore(metadata.bestScore);
if (metadata.over) self.message(false); // You lose if (metadata.over) self.message(false); // You lose
if (metadata.won) self.message(true); // You win! if (metadata.won) self.message(true); // You win!
@@ -103,6 +110,12 @@ HTMLActuator.prototype.updateScore = function (score) {
} }
}; };
HTMLActuator.prototype.updateBestScore = function (bestScore) {
if (this.bestScoreSupported) {
this.bestContainer.textContent = bestScore;
}
};
HTMLActuator.prototype.message = function (won) { HTMLActuator.prototype.message = function (won) {
var type = won ? "game-won" : "game-over"; var type = won ? "game-won" : "game-over";
var message = won ? "You win!" : "Game over!" var message = won ? "You win!" : "Game over!"
+24
View File
@@ -0,0 +1,24 @@
function LocalScoreManager() {
this.key = 'bestScore';
}
LocalScoreManager.prototype.get = function () {
if (!this.isSupported()) {
return 0;
}
return localStorage.getItem(this.key);
};
LocalScoreManager.prototype.set = function (score) {
if (!this.isSupported()) {
return false;
}
localStorage.setItem(this.key, score);
};
LocalScoreManager.prototype.isSupported = function () {
return !!window.localStorage;
};
+15 -6
View File
@@ -49,9 +49,12 @@ h1.title {
top: -50px; top: -50px;
opacity: 0; } } opacity: 0; } }
.score-container { .scores-container {
float: right; }
.score-container, .best-container {
position: relative; position: relative;
float: right; display: inline-block;
background: #bbada0; background: #bbada0;
padding: 15px 25px; padding: 15px 25px;
font-size: 25px; font-size: 25px;
@@ -60,19 +63,19 @@ h1.title {
font-weight: bold; font-weight: bold;
border-radius: 3px; border-radius: 3px;
color: white; color: white;
margin-top: 8px; } margin-top: 8px;
.score-container:after { text-align: center; }
.score-container:after, .best-container:after {
position: absolute; position: absolute;
width: 100%; width: 100%;
top: 10px; top: 10px;
left: 0; left: 0;
content: "Score";
text-transform: uppercase; text-transform: uppercase;
font-size: 13px; font-size: 13px;
line-height: 13px; line-height: 13px;
text-align: center; text-align: center;
color: #eee4da; } color: #eee4da; }
.score-container .score-addition { .score-container .score-addition, .best-container .score-addition {
position: absolute; position: absolute;
right: 30px; right: 30px;
color: red; color: red;
@@ -86,6 +89,12 @@ h1.title {
-webkit-animation-fill-mode: both; -webkit-animation-fill-mode: both;
-moz-animation-fill-mode: both; } -moz-animation-fill-mode: both; }
.score-container:after {
content: "Score"; }
.best-container:after {
content: "Best"; }
p { p {
margin-top: 0; margin-top: 0;
margin-bottom: 10px; margin-bottom: 10px;
+15 -3
View File
@@ -58,11 +58,15 @@ h1.title {
} }
} }
.score-container { .scores-container {
float: right;
}
.score-container, .best-container {
$height: 25px; $height: 25px;
position: relative; position: relative;
float: right; display: inline-block;
background: $game-container-background; background: $game-container-background;
padding: 15px 25px; padding: 15px 25px;
font-size: $height; font-size: $height;
@@ -72,13 +76,13 @@ h1.title {
border-radius: 3px; border-radius: 3px;
color: white; color: white;
margin-top: 8px; margin-top: 8px;
text-align: center;
&:after { &:after {
position: absolute; position: absolute;
width: 100%; width: 100%;
top: 10px; top: 10px;
left: 0; left: 0;
content: "Score";
text-transform: uppercase; text-transform: uppercase;
font-size: 13px; font-size: 13px;
line-height: 13px; line-height: 13px;
@@ -100,6 +104,14 @@ h1.title {
} }
} }
.score-container:after {
content: "Score";
}
.best-container:after {
content: "Best"
}
p { p {
margin-top: 0; margin-top: 0;
margin-bottom: 10px; margin-bottom: 10px;