Impaczus/2048
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add score and endgame

Browse Source
This commit is contained in:
Gabriele Cirulli
2014-03-09 23:03:13 +01:00
parent 53e08722e0
commit f18f7cee22
5 changed files with 271 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+4 -1
View File
@@ -15,7 +15,10 @@
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<h1>2048</h1> <div class="heading">
<h1 class="title">2048</h1>
<div class="score-container">0</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>
<div class="game-container"> <div class="game-container">
js/game_manager.js
+51 -1
View File
@@ -6,6 +6,9 @@ function GameManager(size, InputManager, Actuator) {
this.startTiles = 2; this.startTiles = 2;
this.grid = new Grid(this.size); this.grid = new Grid(this.size);
this.score = 0;
this.over = false;
this.inputManager.on("move", this.move.bind(this)); this.inputManager.on("move", this.move.bind(this));
this.setup(); this.setup();
@@ -38,7 +41,10 @@ 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 () {
this.actuator.actuate(this.grid); this.actuator.actuate(this.grid, {
score: this.score,
over: this.over
});
}; };
// Save all tile positions and remove merger info // Save all tile positions and remove merger info
@@ -63,6 +69,8 @@ GameManager.prototype.move = function (direction) {
// 0: up, 1: right, 2:down, 3: left // 0: up, 1: right, 2:down, 3: left
var self = this; var self = this;
if (this.over) return; // Don't do anything if the game's over
var cell, tile; var cell, tile;
var vector = this.getVector(direction); var vector = this.getVector(direction);
@@ -92,6 +100,9 @@ GameManager.prototype.move = function (direction) {
// Converge the two tiles' positions // Converge the two tiles' positions
tile.updatePosition(positions.next); tile.updatePosition(positions.next);
// Update the score
self.score += merged.value;
} else { } else {
self.moveTile(tile, positions.farthest); self.moveTile(tile, positions.farthest);
} }
@@ -103,6 +114,11 @@ GameManager.prototype.move = function (direction) {
if (moved) { if (moved) {
this.addRandomTile(); this.addRandomTile();
if (!this.movesAvailable()) {
this.over = true; // Game over!
}
this.actuate(); this.actuate();
} }
}; };
@@ -151,3 +167,37 @@ GameManager.prototype.findFarthestPosition = function (cell, vector) {
next: cell // Used to check if a merge is required next: cell // Used to check if a merge is required
}; };
}; };
GameManager.prototype.movesAvailable = function () {
return this.grid.cellsAvailable() || this.tileMatchesAvailable();
};
// Check for available matches between tiles (more expensive check)
GameManager.prototype.tileMatchesAvailable = function () {
var self = this;
var tile;
for (var x = 0; x < this.size; x++) {
for (var y = 0; y < this.size; y++) {
tile = this.grid.cellContent({ x: x, y: y });
if (tile) {
for (var direction = 0; direction < 4; direction++) {
var vector = self.getVector(direction);
var cell = { x: x + vector.x, y: y + vector.y };
var other = self.grid.cellContent(cell);
if (other) {
}
if (other && other.value === tile.value) {
return true; // These two tiles can be merged
}
}
}
}
}
return false;
};
js/html_actuator.js
+18 -2
View File
@@ -1,8 +1,10 @@
function HTMLActuator() { function HTMLActuator() {
this.tileContainer = document.getElementsByClassName("tile-container")[0]; this.tileContainer = document.getElementsByClassName("tile-container")[0];
this.gameContainer = document.getElementsByClassName("game-container")[0];
this.scoreContainer = document.getElementsByClassName("score-container")[0];
} }
HTMLActuator.prototype.actuate = function (grid) { HTMLActuator.prototype.actuate = function (grid, metadata) {
var self = this; var self = this;
window.requestAnimationFrame(function () { window.requestAnimationFrame(function () {
@@ -15,6 +17,12 @@ HTMLActuator.prototype.actuate = function (grid) {
} }
}); });
}); });
self.updateScore(metadata.score);
if (metadata.over) {
self.gameOver();
}
}); });
}; };
@@ -59,3 +67,11 @@ HTMLActuator.prototype.positionClass = function (position) {
position = this.normalizePosition(position); position = this.normalizePosition(position);
return "tile-position-" + position.x + "-" + position.y; return "tile-position-" + position.x + "-" + position.y;
}; };
HTMLActuator.prototype.updateScore = function (score) {
this.scoreContainer.textContent = score;
};
HTMLActuator.prototype.gameOver = function () {
this.gameContainer.classList.add("game-over");
};
style/main.css
+111 -41
View File
@@ -10,10 +10,41 @@ html, body {
body { body {
margin: 80px 0; } margin: 80px 0; }
h1 { .heading:after {
content: "";
display: block;
clear: both; }
h1.title {
font-size: 80px; font-size: 80px;
font-weight: bold; font-weight: bold;
margin: 0; } margin: 0;
display: block;
float: left; }
.score-container {
position: relative;
float: right;
background: #bbada0;
padding: 15px 30px;
font-size: 25px;
height: 25px;
line-height: 47px;
font-weight: bold;
border-radius: 3px;
color: white;
margin-top: 8px; }
.score-container:after {
position: absolute;
width: 100%;
top: 10px;
left: 0;
content: "Score";
text-transform: uppercase;
font-size: 13px;
line-height: 13px;
text-align: center;
color: #eee4da; }
p { p {
margin-top: 0; margin-top: 0;
@@ -38,6 +69,27 @@ hr {
width: 500px; width: 500px;
margin: 0 auto; } margin: 0 auto; }
@-webkit-keyframes fade-in {
0% {
opacity: 0; }
100% {
opacity: 1; } }
@-moz-keyframes fade-in {
0% {
opacity: 0; }
100% {
opacity: 1; } }
@keyframes fade-in {
0% {
opacity: 0; }
100% {
opacity: 1; } }
.game-container { .game-container {
margin-top: 40px; margin-top: 40px;
position: relative; position: relative;
@@ -51,6 +103,25 @@ hr {
width: 500px; width: 500px;
height: 500px; height: 500px;
box-sizing: border-box; } box-sizing: border-box; }
.game-container.game-over:after {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
content: "Game over!";
display: block;
background: rgba(238, 228, 218, 0.5);
text-align: center;
height: 500px;
line-height: 500px;
z-index: 100;
font-size: 60px;
font-weight: bold;
-webkit-animation: fade-in 800ms ease 1200ms;
-moz-animation: fade-in 800ms ease 1200ms;
-webkit-animation-fill-mode: both;
-moz-animation-fill-mode: both; }
.grid-container { .grid-container {
position: absolute; position: absolute;
@@ -160,78 +231,74 @@ hr {
top: 364px; } top: 364px; }
.tile.tile-2 { .tile.tile-2 {
background: #eee4da; background: #eee4da;
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0); } box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
.tile.tile-4 { .tile.tile-4 {
background: #ede0c8; background: #ede0c8;
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0); } box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); }
.tile.tile-8 { .tile.tile-8 {
color: #f9f6f2; color: #f9f6f2;
background: #f2b179; background: #f2b179; }
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0); }
.tile.tile-16 { .tile.tile-16 {
color: #f9f6f2; color: #f9f6f2;
background: #f59563; background: #f59563; }
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0); }
.tile.tile-32 { .tile.tile-32 {
color: #f9f6f2; color: #f9f6f2;
background: #f67c5f; background: #f67c5f; }
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.07937); }
.tile.tile-64 { .tile.tile-64 {
color: #f9f6f2; color: #f9f6f2;
background: #f65e3b; background: #f65e3b; }
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.15873); }
.tile.tile-128 { .tile.tile-128 {
color: #f9f6f2; color: #f9f6f2;
background: #edcf72; background: #edcf72;
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.2381); box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.2381), inset 0 0 0 1px rgba(255, 255, 255, 0.14286);
font-size: 45px; } font-size: 45px; }
.tile.tile-256 { .tile.tile-256 {
color: #f9f6f2; color: #f9f6f2;
background: #edcc61; background: #edcc61;
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.31746); box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.31746), inset 0 0 0 1px rgba(255, 255, 255, 0.19048);
font-size: 45px; } font-size: 45px; }
.tile.tile-512 { .tile.tile-512 {
color: #f9f6f2; color: #f9f6f2;
background: #edc850; background: #edc850;
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.39683); box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.39683), inset 0 0 0 1px rgba(255, 255, 255, 0.2381);
font-size: 45px; } font-size: 45px; }
.tile.tile-1024 { .tile.tile-1024 {
color: #f9f6f2; color: #f9f6f2;
background: #edc53f; background: #edc53f;
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.47619); box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.47619), inset 0 0 0 1px rgba(255, 255, 255, 0.28571);
font-size: 35px; } font-size: 35px; }
.tile.tile-2048 { .tile.tile-2048 {
color: #f9f6f2; color: #f9f6f2;
background: #edc22e; background: #edc22e;
box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.55556); box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.55556), inset 0 0 0 1px rgba(255, 255, 255, 0.33333);
font-size: 35px; } font-size: 35px; }
@-webkit-keyframes appear { @-webkit-keyframes appear {
0% { 0% {
-webkit-transform: scale(1.5); opacity: 0;
opacity: 0; } -webkit-transform: scale(0); }
100% { 100% {
-webkit-transform: scale(1); opacity: 1;
opacity: 1; } } -webkit-transform: scale(1); } }
@-moz-keyframes appear { @-moz-keyframes appear {
0% { 0% {
-webkit-transform: scale(1.5); opacity: 0;
opacity: 0; } -webkit-transform: scale(0); }
100% { 100% {
-webkit-transform: scale(1); opacity: 1;
opacity: 1; } } -webkit-transform: scale(1); } }
@keyframes appear { @keyframes appear {
0% { 0% {
-webkit-transform: scale(1.5); opacity: 0;
opacity: 0; } -webkit-transform: scale(0); }
100% { 100% {
-webkit-transform: scale(1); opacity: 1;
opacity: 1; } } -webkit-transform: scale(1); } }
.tile-new { .tile-new {
-webkit-animation: appear 200ms ease 100ms; -webkit-animation: appear 200ms ease 100ms;
@@ -241,30 +308,33 @@ hr {
@-webkit-keyframes pop { @-webkit-keyframes pop {
0% { 0% {
-webkit-transform: scale(0.5); -webkit-transform: scale(0); }
opacity: 0; }
50% {
-webkit-transform: scale(1.2); }
100% { 100% {
-webkit-transform: scale(1); -webkit-transform: scale(1); } }
opacity: 1; } }
@-moz-keyframes pop { @-moz-keyframes pop {
0% { 0% {
-webkit-transform: scale(0.5); -webkit-transform: scale(0); }
opacity: 0; }
50% {
-webkit-transform: scale(1.2); }
100% { 100% {
-webkit-transform: scale(1); -webkit-transform: scale(1); } }
opacity: 1; } }
@keyframes pop { @keyframes pop {
0% { 0% {
-webkit-transform: scale(0.5); -webkit-transform: scale(0); }
opacity: 0; }
50% {
-webkit-transform: scale(1.2); }
100% { 100% {
-webkit-transform: scale(1); -webkit-transform: scale(1); } }
opacity: 1; } }
.tile-merged { .tile-merged {
z-index: 20; z-index: 20;
style/main.scss
+87 -9
View File
@@ -14,6 +14,8 @@ $tile-color: #eee4da;
$tile-gold-color: #edc22e; $tile-gold-color: #edc22e;
$tile-gold-glow-color: lighten($tile-gold-color, 15%); $tile-gold-glow-color: lighten($tile-gold-color, 15%);
$game-container-background: #bbada0;
$transition-speed: 100ms; $transition-speed: 100ms;
html, body { html, body {
@@ -30,10 +32,47 @@ body {
margin: 80px 0; margin: 80px 0;
} }
h1 { .heading:after {
content: "";
display: block;
clear: both;
}
h1.title {
font-size: 80px; font-size: 80px;
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
display: block;
float: left;
}
.score-container {
$height: 25px;
position: relative;
float: right;
background: $game-container-background;
padding: 15px 30px;
font-size: $height;
height: $height;
line-height: $height + 22px;
font-weight: bold;
border-radius: 3px;
color: white;
margin-top: 8px;
&:after {
position: absolute;
width: 100%;
top: 10px;
left: 0;
content: "Score";
text-transform: uppercase;
font-size: 13px;
line-height: 13px;
text-align: center;
color: $tile-color;
}
} }
p { p {
@@ -66,6 +105,16 @@ hr {
margin: 0 auto; margin: 0 auto;
} }
@include keyframes(fade-in) {
0% {
opacity: 0;
}
100% {
opacity: 1;
}
}
.game-container { .game-container {
margin-top: 40px; margin-top: 40px;
position: relative; position: relative;
@@ -76,11 +125,31 @@ hr {
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
background: #bbada0; background: $game-container-background;
border-radius: $tile-border-radius * 2; border-radius: $tile-border-radius * 2;
width: $field-width; width: $field-width;
height: $field-width; height: $field-width;
box-sizing: border-box; box-sizing: border-box;
&.game-over:after {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
content: "Game over!";
display: block;
background: rgba($tile-color, .5);
text-align: center;
height: $field-width;
line-height: $field-width;
z-index: 100;
font-size: 60px;
font-weight: bold;
@include animation(fade-in 800ms ease $transition-speed * 12);
@include animation-fill-mode(both);
}
} }
.grid-container { .grid-container {
@@ -193,8 +262,11 @@ hr {
// Add glow // Add glow
$glow-opacity: max($exponent - 4, 0) / ($limit - 4); $glow-opacity: max($exponent - 4, 0) / ($limit - 4);
box-shadow: 0 0 30px 10px rgba($tile-gold-glow-color, $glow-opacity / 1.8); //,
// inset 0 0 0 1px rgba(white, $glow-opacity / 3); @if not $special-background {
box-shadow: 0 0 30px 10px rgba($tile-gold-glow-color, $glow-opacity / 1.8),
inset 0 0 0 1px rgba(white, $glow-opacity / 3);
}
// Adjust font size for bigger numbers // Adjust font size for bigger numbers
@if $power >= 100 and $power < 1000 { @if $power >= 100 and $power < 1000 {
@@ -210,13 +282,15 @@ hr {
@include keyframes(appear) { @include keyframes(appear) {
0% { 0% {
-webkit-transform: scale(1.5); // -webkit-transform: scale(1.5);
opacity: 0; opacity: 0;
-webkit-transform: scale(0);
} }
100% { 100% {
-webkit-transform: scale(1); // -webkit-transform: scale(1);
opacity: 1; opacity: 1;
-webkit-transform: scale(1);
} }
} }
@@ -227,13 +301,17 @@ hr {
@include keyframes(pop) { @include keyframes(pop) {
0% { 0% {
-webkit-transform: scale(.5); -webkit-transform: scale(0);
opacity: 0; // opacity: 0;
}
50% {
-webkit-transform: scale(1.2);
} }
100% { 100% {
-webkit-transform: scale(1); -webkit-transform: scale(1);
opacity: 1; // opacity: 1;
} }
} }