Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Becca and Claire 2048 #20

Open
wants to merge 23 commits into
base: 2040gr8/master
Choose a base branch
from
Open

Becca and Claire 2048 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4a477bb
Refactored moveTileUp method to start keeping track of board tiles
CShekta Feb 2, 2016
4b760f2
added new tile at the start of the game
rmtolmach Feb 2, 2016
27852b2
working on moveTilefunction
CShekta Feb 2, 2016
e21b6ee
Snapshot of BIZARRE console.log errors
CShekta Feb 2, 2016
bca31b2
added randoTile methods and a way to find empty spaces
CShekta Feb 2, 2016
98a8663
down, right, left tile movements
rmtolmach Feb 3, 2016
5e4625c
created l,r,u,d conditionals to stop moving. Needs debugging
CShekta Feb 3, 2016
b32ea5b
trying to combine tiles with complicated method
CShekta Feb 3, 2016
d9b2deb
starting for loops for moving up
CShekta Feb 3, 2016
cbc4932
alksjdflkajsdfja
CShekta Feb 3, 2016
da72ec2
commmmmeeennnttsssss
rmtolmach Feb 4, 2016
cc3a44f
Refactored to make code look more readable. Created reverse method
CShekta Feb 4, 2016
24d7528
more comments
rmtolmach Feb 4, 2016
68c9325
moving right works! they all work. yay
rmtolmach Feb 4, 2016
62aa14c
new tile won't pop up if nothing has moved
rmtolmach Feb 4, 2016
0a43fb7
rando tile comes in slowly
rmtolmach Feb 4, 2016
dd384ab
added title and score div. debugging this.score
CShekta Feb 5, 2016
1c8cd7c
cssing
rmtolmach Feb 5, 2016
4b3011a
wild and crazy colors
rmtolmach Feb 5, 2016
ace1525
consolidated column up and column left to general move and display fu…
CShekta Feb 5, 2016
393c554
finished consolidation refactor for down and left
CShekta Feb 5, 2016
f29e09b
changing file names
rmtolmach Feb 5, 2016
7d42046
updated comments
CShekta Feb 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
<script type="text/javascript" src="javascripts/2048.js"></script>
</head>
<body>
<div class="score">
<h1>2048</h1>
<h3 class="score-title">Score: </h3>
<h3 class="numbers"></h3>
</div>
<div id="gameboard">
<div class="cells">
<div class="cell"></div>
Expand All @@ -26,7 +31,6 @@
<div class="cell"></div>
<div class="cell"></div>
</div>
<div class="tile" data-row="r1", data-col="c1" data-val="2">2</div>
</div>
</body>
</html>
260 changes: 227 additions & 33 deletions javascripts/2048.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,251 @@
var Game = function() {
// Game logic and initialization here
this.board = [[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]];
this.board = [[0, 0, 0, 0],
[0, 0, 0, 0],
[0, 0, 0, 0],
[0, 0, 0, 0]];
this.boardSize = 4;
this.score = 0;
this.hasMoved = false;
this.winningTile = 2048;
this.hasWon = false;
};

Game.prototype.play = function() {
$(document).ready(function() {
var game = new Game();
$(".numbers").append("0");
game.addRandoTile();
$('body').keydown(function(event){
var arrows = [37, 38, 39, 40];
if (arrows.indexOf(event.which) > -1) {
game.moveTiles(event.which);
if (game.hasMoved) {
setTimeout(function() {
game.addRandoTile();
emptySpaces = game.returnEmptySpaces();
if (emptySpaces.length === 0 ) {
if (game.checkLoss()) { alert("Sorry! Try again!"); console.log("i've lost it");}
}
},
250);
}
if (game.hasWon === true) { alert("Congratulations! You've won!"); }
}
});
});

function tileSelect(row, col) {
return "div[data-row=\"r" + row + "\"][data-col=\"c" + col + "\"]";
}

Game.prototype.reverseIndices = function(indicesIn) {
var indicesOut = [];
for (var i = 0; i < indicesIn.length; i++) {
indicesOut.push(this.boardSize - 1 - indicesIn[i]);
}
return indicesOut;
};

Game.prototype.moveTile = function(tile, direction) {
// Game method here
Game.prototype.moveTiles = function(direction) {
this.hasMoved = false;
var i;
switch(direction) {
case 38: //up
console.log('up');
var upRow = parseInt($(".tile").attr("data-row").slice(-1)) - 1;
if (upRow >= 0) {
tile[0].setAttribute("data-row", ("r" + upRow));
for (i = 0; i < this.boardSize; i++) {
this.move(i, "col", "towards");
}
break;
case 40: //down
console.log('down');
var downRow = parseInt($(".tile").attr("data-row").slice(-1)) + 1;
if (downRow <= 3) {
tile[0].setAttribute("data-row", ("r" + downRow));
for (i = 0; i < this.boardSize; i++) {
this.move(i, "col", "away");
}
break;
case 37: //left
console.log('left');
var leftCol = parseInt($(".tile").attr("data-col").slice(-1)) - 1;
if (leftCol >= 0) {
tile[0].setAttribute("data-col", ("c" + leftCol));
}
for (i = 0; i < this.boardSize; i++) {
this.move(i, "row", "towards");
}
break;
case 39: //right
console.log('right');
var rightCol = parseInt($(".tile").attr("data-col").slice(-1)) + 1;
if (rightCol <= 3) {
tile[0].setAttribute("data-col", ("c" + rightCol));
}
for (i = 0; i < this.boardSize; i++) {
this.move(i, "row", "away");
}
break;
}
};

$(document).ready(function() {
console.log("ready to go!");
// Any interactive jQuery functionality
var game = new Game();
Game.prototype.getValsByDim = function(dim, index) {
//uses dim and index to push only the non zero values in each array onto a new array
var vals = [];
var indices = [];
for (var i = 0; i < this.boardSize; i++) {
var val;
switch(dim) {
case "row":
val = this.board[index][i];
break;
case "col":
val = this.board[i][index];
break;
}
if (val !== 0) {vals.push(val); indices.push(i); } // ignore zeros, and push everything else into values array.
}
// values is an array with the value of the numbers pushed into it.
// indices is an array with the index within the dim of where the value came from.
return [vals, indices];
};

$('body').keydown(function(event){
var arrows = [37, 38, 39, 40];
if (arrows.indexOf(event.which) > -1) {
var tile = $('.tile');
Game.prototype.setValsByDim = function(dim, index, values) {
//iterating through entire board, places values at their new indices
var i;
for (i = 0; i < values.length; i++) {
switch(dim){
case "row":
this.board[index][i] = values[i];
break;
case "col":
this.board[i][index] = values[i];
break;
}
}
for (i; i < this.boardSize; i++) { //pick up where i left off in case we need to add 0s
switch(dim){
case "row":
this.board[index][i] = 0;
break;
case "col":
this.board[i][index] = 0;
break;
}
}
};

game.moveTile(tile, event.which);
Game.prototype.smash = function(valsIn) {
if (valsIn.length === 0) { return [ [], [] ]; }
var valsOut = [valsIn[0]]; //the first value out will be the first in
var indicesOut = [0]; //the first value out will be pushed to index 0
var alreadySmashed = false;
for (var i = 1; i < valsIn.length; i++) {
if (valsIn[i] === valsOut[valsOut.length-1] && !alreadySmashed) { //if the next iteration of valsIn has a value the same as the last value out, they should be at the same index
valsOut[valsOut.length-1] *= 2; //numbers add together
if (valsOut[valsOut.length-1] == this.winningTile) { this.hasWon = true; }
alreadySmashed = true;
indicesOut.push(indicesOut[indicesOut.length-1]); //if value is smashing, the indice out should be the same as the one it smashed into, in this case the last value in indices out
this.score += valsOut[valsOut.length-1];
}
});
});
else { //if they're not equal to each other, push the value and the indices OUT.
alreadySmashed = false; //alreadySmashed prevents everything form combining (like [2,2,2,2] to [8,0,0,0] automatically)
indicesOut.push(indicesOut[indicesOut.length-1] + 1); //If I didn't smash, then make my out index the one after the last index in indicesOut because math of plus one.
valsOut.push(valsIn[i]);// I didn't smash, so push my value at i to valsOut. Save me!
}
}
$(".numbers").empty();
$(".numbers").append(this.score);
return [valsOut, indicesOut];
};

Game.prototype.move = function(index, dim, vertex) {
var valsAndIndicesIn = this.getValsByDim(dim, index);
var valsIn = valsAndIndicesIn[0];
var indicesIn = valsAndIndicesIn[1];

if (vertex === "away") {
valsIn.reverse();
indicesIn.reverse();
}
var valsandIndicesOut = this.smash(valsIn);

//below begins the unsmashing;
var valsOut = valsandIndicesOut[0];
var indicesOut = valsandIndicesOut[1];

if (vertex === "away") {
while (valsOut.length != this.boardSize) {
valsOut.push(0);
}
valsOut.reverse();
indicesOut = this.reverseIndices(indicesOut);
}
this.setValsByDim(dim, index, valsOut);
this.display(index, vertex, dim, indicesIn, indicesOut, valsOut);
};

//loop over indices in and indices out to see if they are the same. if they are, then nothing has moved!
Game.prototype.display = function(index, vertex, dim, indicesIn, indicesOut, valsOut) {
for (var i = 0; i < indicesIn.length; i++) {
var tileQuery;
if (dim === "col") {
tileQuery = $(tileSelect(indicesIn[i], index));
} else if (dim === "row") {
tileQuery = $(tileSelect(index, indicesIn[i]));
}
if (i < indicesIn.length - 1) { //if I am smashed into, delete myself
if (indicesOut[i] === indicesOut[i+1]) {
tileQuery[0].remove();
}
}
if (i >= 1) { // if i smashed into someone (same indices)
if (indicesOut[i] === indicesOut[i-1]) {
var newVal = valsOut[indicesOut[i]];
tileQuery.text(newVal);
tileQuery[0].setAttribute("data-val", newVal);
}
}
if (indicesIn[i] !== indicesOut[i]) {
if (dim === "col") {
tileQuery[0].setAttribute("data-row", ("r" + indicesOut[i]));
} else {
tileQuery[0].setAttribute("data-col", ("c" + indicesOut[i]));
}
this.hasMoved = true; //to prevent a tile from appearing when nothing has moved;
}
}
};

Game.prototype.addRandoTile = function() {
var tile = $("<div data-row='' data-col='' data-val=''></div>");
var dataVal = Math.random() < 0.1 ? 4 : 2;
var emptySpaces = this.returnEmptySpaces();
var randoLocation = emptySpaces[Math.floor(Math.random() * emptySpaces.length)];
tile.addClass("tile");
tile.attr("data-row", "r" + randoLocation[0]);
tile.attr("data-col", "c" + randoLocation[1]);
tile.attr("data-val", dataVal);
tile.text(dataVal);
$("#gameboard").append(tile);
this.board[randoLocation[0]][randoLocation[1]] = dataVal;
};

Game.prototype.returnEmptySpaces = function() {
var emptySpaces = [];
var row = null;
var col = null;
var tileLocation = null;
for (var i = 0; i < this.boardSize; i++) {
row = i;
for (var j = 0; j < this.boardSize; j++) {
col = j;
tileLocation = this.board[row][col];
if (tileLocation === 0) {
emptySpaces.push([row, col]);
}
}
}
return emptySpaces;
};

Game.prototype.smashable = function(vals) {
for (var i = 0; i < this.boardSize - 1; i++) {
if (vals[i] === vals[i+1]) { return true; } //if two values are the same this can be smashed
}
return false;
};

Game.prototype.checkLoss = function() {
for (var i = 0; i < this.boardSize; i++) {
var valsAndIndices = this.getValsByDim("row", i);
if (this.smashable(valsAndIndices[0])) { return false;}
valsAndIndices = this.getValsByDim("col", i);
if (this.smashable(valsAndIndices[0])) {return false; }
}
return true;
};
55 changes: 47 additions & 8 deletions stylesheets/2048.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,47 @@ html {
font: normal normal 30px/1 "Clear Sans", "Helvetica Neue", Arial, sans-serif;
}

body {
background-color: #eee4da;
}

h1 {
color: #776e65;
font-size: 74px;
line-height: 66px;
text-align: center;
display: inline-block;
padding-left: 20px;
}

.score {
background-color: #f2b179;
color: #ad0066;
width: 30%;
margin-left: 490px;
border-radius: 0.5rem;
display: inline-block;
background-image: url(http://media.giphy.com/media/138i1MiNVi9P0Y/giphy.gif);
}

.score-title {
text-align: center;
padding-top: 20px;
margin: 0;
display: inline-block;

}

.numbers {
text-align: center;
padding-bottom: 20px;
margin: 0;
display: inline-block;

}

#gameboard {
background: #bbada0;
background: #81A4B9;
border-radius: 0.5rem;
height: 18.5rem;
margin: 1rem auto;
Expand Down Expand Up @@ -53,10 +92,10 @@ html {
.tile[data-val="4"] { color: #776e65; background-color: #ede0c8; }
.tile[data-val="8"] { background-color: #f2b179; }
.tile[data-val="16"] { background-color: #f59563; }
.tile[data-val="32"] { background: #f67c5f; }
.tile[data-val="64"] { background: #f65e3b; }
.tile[data-val="128"] { background: #edcf72; }
.tile[data-val="256"] { background: #edcc61; }
.tile[data-val="512"] { background: #edc850; }
.tile[data-val="1024"] { background: #edc53f; }
.tile[data-val="2048"] { background: #edc22e; }
.tile[data-val="32"] { background: #D13D94; }
.tile[data-val="64"] { background: #990099; }
.tile[data-val="128"] { background: #CADA2A; }
.tile[data-val="256"] { background: #FFFF00; color: #776e65 }
.tile[data-val="512"] { background: #4D8963; }
.tile[data-val="1024"] { background: #AA0114; }
.tile[data-val="2048"] { background: #D13D94; }