|
|
|
@ -43,6 +43,14 @@ var Game = {
|
|
|
|
|
$nbSets4: $('[data-display="nbSets4"]'),
|
|
|
|
|
$board4: $('[data-display="game-board4"]'),
|
|
|
|
|
|
|
|
|
|
cards0: [],
|
|
|
|
|
selected0 : [],
|
|
|
|
|
score0: 0,
|
|
|
|
|
set0: 0,
|
|
|
|
|
$score0: $('[data-display="score0"]'),
|
|
|
|
|
$nbSets0: $('[data-display="nbSets0"]'),
|
|
|
|
|
$board0: $('[data-display="game-board0"]'),
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
deal: function() {
|
|
|
|
@ -52,6 +60,7 @@ var Game = {
|
|
|
|
|
var dealRequest2;
|
|
|
|
|
var dealRequest3;
|
|
|
|
|
var dealRequest4;
|
|
|
|
|
var dealRequest0;
|
|
|
|
|
|
|
|
|
|
// ajax request to get initial set of cards
|
|
|
|
|
dealRequest = $.ajax({
|
|
|
|
@ -60,27 +69,13 @@ var Game = {
|
|
|
|
|
dataType: 'json',
|
|
|
|
|
success: function (data) {
|
|
|
|
|
self.cards = data;
|
|
|
|
|
//self.existingSet();
|
|
|
|
|
self.displayCards.call(self);
|
|
|
|
|
self.existingSet();
|
|
|
|
|
self.setCardListeners();
|
|
|
|
|
self.setPageListeners();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
/*while(self.set === 0){
|
|
|
|
|
dealRequest = $.ajax({
|
|
|
|
|
url: 'set.php?action=deal',
|
|
|
|
|
type: 'GET',
|
|
|
|
|
dataType: 'json',
|
|
|
|
|
success: function (data) {
|
|
|
|
|
self.cards = data;
|
|
|
|
|
self.displayCards.call(self);
|
|
|
|
|
self.existingSet();
|
|
|
|
|
self.setCardListeners();
|
|
|
|
|
self.setPageListeners();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
dealRequest1 = $.ajax({
|
|
|
|
|
url: 'set.php?action=deal1',
|
|
|
|
@ -88,22 +83,22 @@ var Game = {
|
|
|
|
|
dataType: 'json',
|
|
|
|
|
success: function (data) {
|
|
|
|
|
self.cards1 = data;
|
|
|
|
|
//self.existingSet1();
|
|
|
|
|
self.displayCards1.call(self);
|
|
|
|
|
self.existingSet1();
|
|
|
|
|
self.setCardListeners1();
|
|
|
|
|
self.setPageListeners1();
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
dealRequest2 = $.ajax({
|
|
|
|
|
dealRequest2 = $.ajax({
|
|
|
|
|
url: 'set.php?action=deal2',
|
|
|
|
|
type: 'GET',
|
|
|
|
|
dataType: 'json',
|
|
|
|
|
success: function (data) {
|
|
|
|
|
self.cards2 = data;
|
|
|
|
|
self.displayCards2.call(self);
|
|
|
|
|
self.existingSet2();
|
|
|
|
|
//self.existingSet2();
|
|
|
|
|
self.setCardListeners2();
|
|
|
|
|
self.setPageListeners2();
|
|
|
|
|
}
|
|
|
|
@ -116,7 +111,7 @@ var Game = {
|
|
|
|
|
success: function (data) {
|
|
|
|
|
self.cards3 = data;
|
|
|
|
|
self.displayCards3.call(self);
|
|
|
|
|
self.existingSet3();
|
|
|
|
|
//self.existingSet3();
|
|
|
|
|
self.setCardListeners3();
|
|
|
|
|
self.setPageListeners3();
|
|
|
|
|
}
|
|
|
|
@ -129,12 +124,25 @@ var Game = {
|
|
|
|
|
success: function (data) {
|
|
|
|
|
self.cards4 = data;
|
|
|
|
|
self.displayCards4.call(self);
|
|
|
|
|
self.existingSet4();
|
|
|
|
|
//self.existingSet4();
|
|
|
|
|
self.setCardListeners4();
|
|
|
|
|
self.setPageListeners4();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
dealRequest0 = $.ajax({
|
|
|
|
|
url: 'set.php?action=deal0',
|
|
|
|
|
type: 'GET',
|
|
|
|
|
dataType: 'json',
|
|
|
|
|
success: function (data) {
|
|
|
|
|
self.cards0 = data;
|
|
|
|
|
self.displayCards0.call(self);
|
|
|
|
|
self.setCardListeners0();
|
|
|
|
|
self.setPageListeners0();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -175,7 +183,7 @@ var Game = {
|
|
|
|
|
self.$board.append(cardNode);
|
|
|
|
|
|
|
|
|
|
// display 4 cards per row
|
|
|
|
|
if ((index+1) % 3 === 0) {
|
|
|
|
|
if ((index+1) % 4 === 0) {
|
|
|
|
|
self.$board.append($('<div>'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -214,7 +222,7 @@ var Game = {
|
|
|
|
|
self.$board1.append(cardNode);
|
|
|
|
|
|
|
|
|
|
// display 4 cards per row
|
|
|
|
|
if ((index+1) % 3 === 0) {
|
|
|
|
|
if ((index+1) % 5 === 0) {
|
|
|
|
|
self.$board1.append($('<div>'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -251,7 +259,7 @@ var Game = {
|
|
|
|
|
self.$board2.append(cardNode);
|
|
|
|
|
|
|
|
|
|
// display 4 cards per row
|
|
|
|
|
if ((index+1) % 3 === 0) {
|
|
|
|
|
if ((index+1) % 4 === 0) {
|
|
|
|
|
self.$board2.append($('<div>'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -288,7 +296,7 @@ var Game = {
|
|
|
|
|
self.$board3.append(cardNode);
|
|
|
|
|
|
|
|
|
|
// display 4 cards per row
|
|
|
|
|
if ((index+1) % 3 === 0) {
|
|
|
|
|
if ((index+1) % 4 === 0) {
|
|
|
|
|
self.$board3.append($('<div>'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -326,7 +334,7 @@ var Game = {
|
|
|
|
|
self.$board4.append(cardNode);
|
|
|
|
|
|
|
|
|
|
// display 4 cards per row
|
|
|
|
|
if ((index+1) % 3 === 0) {
|
|
|
|
|
if ((index+1) % 4 === 0) {
|
|
|
|
|
self.$board4.append($('<div>'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -335,6 +343,43 @@ var Game = {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
displayCards0: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
if (self.cards0.length == 0) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$.each(self.cards0, function(index, card){
|
|
|
|
|
var cardNode = $('<div>', {
|
|
|
|
|
class: "card"
|
|
|
|
|
}).appendTo(self.$board0);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cardNode.data({
|
|
|
|
|
'id': card.id,
|
|
|
|
|
'shape': card.shape,
|
|
|
|
|
'fill': card.fill,
|
|
|
|
|
'color': card.color,
|
|
|
|
|
'number': card.number
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
var shapeNode = $("<canvas></canvas>");
|
|
|
|
|
shapeNode.addClass('shape ' + card.color + ' ' + card.shape + ' ' + card.fill);
|
|
|
|
|
|
|
|
|
|
for (var i = 0; i < card.number; i++) {
|
|
|
|
|
cardNode.append(shapeNode.clone());
|
|
|
|
|
}
|
|
|
|
|
self.$board0.append(cardNode);
|
|
|
|
|
|
|
|
|
|
// display 4 cards per row
|
|
|
|
|
if ((index+1) % 3 === 0) {
|
|
|
|
|
self.$board0.append($('<div>'));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -724,8 +769,27 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setCardListeners0: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
|
|
|
|
|
// what happens when a card is clicked:
|
|
|
|
|
this.$board0.on('click', '.card', function(e) {
|
|
|
|
|
e.stopImmediatePropagation();
|
|
|
|
|
var card = e.currentTarget;
|
|
|
|
|
|
|
|
|
|
// if card is new, add it, otherwise remove it
|
|
|
|
|
var ids = $.map(self.selected0, function(el) { return $(el).data("id");});
|
|
|
|
|
if (ids.indexOf($(card).data('id')) >= 0) {
|
|
|
|
|
self.deselectCard0(card);
|
|
|
|
|
} else {
|
|
|
|
|
self.selectCard0(card);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (self.selected0.length === 3) {
|
|
|
|
|
self.silentSubmission0();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
setCardListeners: function() {
|
|
|
|
|
var self = this;
|
|
|
|
@ -847,6 +911,14 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
setPageListeners0: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
|
|
|
|
|
// if the user clicks on the page outside the game board, clear selected
|
|
|
|
|
$(document).on('click', function() {
|
|
|
|
|
self.clearSelections0.call(self);
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
setPageListeners: function() {
|
|
|
|
|
var self = this;
|
|
|
|
@ -903,6 +975,15 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
selectCard0: function(card) {
|
|
|
|
|
$(card).addClass('selected');
|
|
|
|
|
this.selected0.push(card);
|
|
|
|
|
|
|
|
|
|
if (this.selected0.length > 3) {
|
|
|
|
|
this.clearSelections0.call(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
selectCard: function(card) {
|
|
|
|
|
$(card).addClass('selected');
|
|
|
|
@ -963,7 +1044,14 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
deselectCard0: function(card) {
|
|
|
|
|
var self = this;
|
|
|
|
|
var index = self.selected0.indexOf(card);
|
|
|
|
|
if (index > -1) {
|
|
|
|
|
self.selected0.splice(index, 1);
|
|
|
|
|
}
|
|
|
|
|
$(card).removeClass('selected');
|
|
|
|
|
},
|
|
|
|
|
deselectCard: function(card) {
|
|
|
|
|
var self = this;
|
|
|
|
|
var index = self.selected.indexOf(card);
|
|
|
|
@ -1016,7 +1104,12 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
clearSelections0: function() {
|
|
|
|
|
$.each(this.selected0, function(index, card) {
|
|
|
|
|
$(card).removeClass('selected');
|
|
|
|
|
});
|
|
|
|
|
this.selected0 = [];
|
|
|
|
|
},
|
|
|
|
|
clearSelections: function() {
|
|
|
|
|
$.each(this.selected, function(index, card) {
|
|
|
|
|
$(card).removeClass('selected');
|
|
|
|
@ -1059,8 +1152,19 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
validateSet0: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
|
|
|
|
|
var colors = $.map(self.selected0, function(el) { return $(el).data("color");});
|
|
|
|
|
var shapes = $.map(self.selected0, function(el) { return $(el).data("shape"); });
|
|
|
|
|
var fills= $.map(self.selected0, function(el) { return $(el).data("fill"); });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (self.isSet(colors) && self.isSet(shapes) && self.isSet(fills));
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
validateSet: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
|
|
|
|
@ -1070,17 +1174,18 @@ var Game = {
|
|
|
|
|
var numbers = $.map(self.selected, function(el) { return $(el).data("number"); });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (self.isSet(colors) && self.isSet(shapes) && self.isSet(fills) && self.isSet(numbers));
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
validateSet35: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
|
|
|
|
|
var colors = $.map(self.selected, function(el) { return $(el).data("color");});
|
|
|
|
|
var shapes = $.map(self.selected, function(el) { return $(el).data("shape"); });
|
|
|
|
|
var fills= $.map(self.selected, function(el) { return $(el).data("fill"); });
|
|
|
|
|
var borders= $.map(self.selected, function(el) { return $(el).data("border"); });
|
|
|
|
|
var numbers = $.map(self.selected, function(el) { return $(el).data("number"); });
|
|
|
|
|
var colors = $.map(self.selected1, function(el) { return $(el).data("color");});
|
|
|
|
|
var shapes = $.map(self.selected1, function(el) { return $(el).data("shape"); });
|
|
|
|
|
var fills= $.map(self.selected1, function(el) { return $(el).data("fill"); });
|
|
|
|
|
var borders= $.map(self.selected1, function(el) { return $(el).data("border"); });
|
|
|
|
|
var numbers = $.map(self.selected1, function(el) { return $(el).data("number"); });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (self.isSet(colors) && self.isSet(shapes) && self.isSet(fills) && self.isSet(borders) && self.isSet(numbers));
|
|
|
|
@ -1089,10 +1194,10 @@ var Game = {
|
|
|
|
|
validateSet44: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
|
|
|
|
|
var colors = $.map(self.selected, function(el) { return $(el).data("color");});
|
|
|
|
|
var shapes = $.map(self.selected, function(el) { return $(el).data("shape"); });
|
|
|
|
|
var fills= $.map(self.selected, function(el) { return $(el).data("fill"); });
|
|
|
|
|
var numbers = $.map(self.selected, function(el) { return $(el).data("number"); });
|
|
|
|
|
var colors = $.map(self.selected2, function(el) { return $(el).data("color");});
|
|
|
|
|
var shapes = $.map(self.selected2, function(el) { return $(el).data("shape"); });
|
|
|
|
|
var fills= $.map(self.selected2, function(el) { return $(el).data("fill"); });
|
|
|
|
|
var numbers = $.map(self.selected2, function(el) { return $(el).data("number"); });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (self.isSet4(colors) && self.isSet4(shapes) && self.isSet4(fills) && self.isSet4(numbers));
|
|
|
|
@ -1101,11 +1206,11 @@ var Game = {
|
|
|
|
|
validateSet45: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
|
|
|
|
|
var colors = $.map(self.selected, function(el) { return $(el).data("color");});
|
|
|
|
|
var shapes = $.map(self.selected, function(el) { return $(el).data("shape"); });
|
|
|
|
|
var fills= $.map(self.selected, function(el) { return $(el).data("fill"); });
|
|
|
|
|
var borders= $.map(self.selected, function(el) { return $(el).data("border"); });
|
|
|
|
|
var numbers = $.map(self.selected, function(el) { return $(el).data("number"); });
|
|
|
|
|
var colors = $.map(self.selected3, function(el) { return $(el).data("color");});
|
|
|
|
|
var shapes = $.map(self.selected3, function(el) { return $(el).data("shape"); });
|
|
|
|
|
var fills= $.map(self.selected3, function(el) { return $(el).data("fill"); });
|
|
|
|
|
var borders= $.map(self.selected3, function(el) { return $(el).data("border"); });
|
|
|
|
|
var numbers = $.map(self.selected3, function(el) { return $(el).data("number"); });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (self.isSet4(colors) && self.isSet4(shapes) && self.isSet4(borders) && self.isSet4(fills) && self.isSet4(numbers));
|
|
|
|
@ -1114,11 +1219,11 @@ var Game = {
|
|
|
|
|
validateSet55: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
|
|
|
|
|
var colors = $.map(self.selected, function(el) { return $(el).data("color");});
|
|
|
|
|
var shapes = $.map(self.selected, function(el) { return $(el).data("shape"); });
|
|
|
|
|
var fills= $.map(self.selected, function(el) { return $(el).data("fill"); });
|
|
|
|
|
var borders= $.map(self.selected, function(el) { return $(el).data("border"); });
|
|
|
|
|
var numbers = $.map(self.selected, function(el) { return $(el).data("number"); });
|
|
|
|
|
var colors = $.map(self.selected4, function(el) { return $(el).data("color");});
|
|
|
|
|
var shapes = $.map(self.selected4, function(el) { return $(el).data("shape"); });
|
|
|
|
|
var fills= $.map(self.selected4, function(el) { return $(el).data("fill"); });
|
|
|
|
|
var borders= $.map(self.selected4, function(el) { return $(el).data("border"); });
|
|
|
|
|
var numbers = $.map(self.selected4, function(el) { return $(el).data("number"); });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (self.isSet5(colors) && self.isSet5(shapes) && self.isSet5(fills) && self.isSet5(borders) && self.isSet5(numbers));
|
|
|
|
@ -1142,9 +1247,6 @@ var Game = {
|
|
|
|
|
$.each(arr, function(i, el){
|
|
|
|
|
if($.inArray(el, unique) === -1) unique.push(el);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//console.log(unique);
|
|
|
|
|
return unique.length === 1 || unique.length === 3;
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
@ -1183,7 +1285,12 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
silentSubmission0: function() {
|
|
|
|
|
var valid = this.validateSet0();
|
|
|
|
|
if (valid) {
|
|
|
|
|
this.submitSet0();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
silentSubmission: function() {
|
|
|
|
|
var valid = this.validateSet();
|
|
|
|
|
if (valid) {
|
|
|
|
@ -1220,8 +1327,37 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
submitSet0: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
var ids = $.map(self.selected0, function(el) { return $(el).data("id");});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// ajax request to get initial set of cards
|
|
|
|
|
var newCardRequest = $.ajax({
|
|
|
|
|
url: 'set.php?action=submit0',
|
|
|
|
|
type: 'GET',
|
|
|
|
|
dataType: 'json',
|
|
|
|
|
success: function(data) {
|
|
|
|
|
self.clearCards0(ids, data);
|
|
|
|
|
|
|
|
|
|
// to do - implement game complete check on server
|
|
|
|
|
if (!data.gameComplete) {
|
|
|
|
|
self.set0 = 0;
|
|
|
|
|
//self.updateCards(data);
|
|
|
|
|
//self.existingSet0();
|
|
|
|
|
self.increaseScore0();
|
|
|
|
|
} else {
|
|
|
|
|
self.gameWon();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
error: function() {
|
|
|
|
|
console.log(arguments);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
this.clearSelections0();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
submitSet: function() {
|
|
|
|
|
var self = this;
|
|
|
|
|
var ids = $.map(self.selected, function(el) { return $(el).data("id");});
|
|
|
|
@ -1236,8 +1372,9 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
// to do - implement game complete check on server
|
|
|
|
|
if (!data.gameComplete) {
|
|
|
|
|
self.set = 0;
|
|
|
|
|
//self.updateCards(data);
|
|
|
|
|
self.existingSet();
|
|
|
|
|
//self.existingSet();
|
|
|
|
|
self.increaseScore();
|
|
|
|
|
} else {
|
|
|
|
|
self.gameWon();
|
|
|
|
@ -1264,8 +1401,9 @@ var Game = {
|
|
|
|
|
self.clearCards1(ids,data);
|
|
|
|
|
// to do - implement game complete check on server
|
|
|
|
|
if (!data.gameComplete) {
|
|
|
|
|
self.set1 = 0;
|
|
|
|
|
//self.updateCards1(data);
|
|
|
|
|
self.existingSet1();
|
|
|
|
|
//self.existingSet1();
|
|
|
|
|
self.increaseScore1();
|
|
|
|
|
} else {
|
|
|
|
|
self.gameWon();
|
|
|
|
@ -1290,11 +1428,13 @@ var Game = {
|
|
|
|
|
type: 'GET',
|
|
|
|
|
dataType: 'json',
|
|
|
|
|
success: function(data) {
|
|
|
|
|
self.set2 = 0;
|
|
|
|
|
self.clearCards2(ids,data);
|
|
|
|
|
// to do - implement game complete check on server
|
|
|
|
|
if (!data.gameComplete) {
|
|
|
|
|
|
|
|
|
|
//self.updateCards2(data);
|
|
|
|
|
self.existingSet2();
|
|
|
|
|
//self.existingSet2();
|
|
|
|
|
self.increaseScore2();
|
|
|
|
|
} else {
|
|
|
|
|
self.gameWon();
|
|
|
|
@ -1322,8 +1462,9 @@ var Game = {
|
|
|
|
|
self.clearCards3(ids,data);
|
|
|
|
|
// to do - implement game complete check on server
|
|
|
|
|
if (!data.gameComplete) {
|
|
|
|
|
self.set3 = 0;
|
|
|
|
|
//self.updateCards3(data);
|
|
|
|
|
self.existingSet3();
|
|
|
|
|
//self.existingSet3();
|
|
|
|
|
self.increaseScore3();
|
|
|
|
|
} else {
|
|
|
|
|
self.gameWon();
|
|
|
|
@ -1352,8 +1493,9 @@ var Game = {
|
|
|
|
|
self.clearCards4(ids,data);
|
|
|
|
|
// to do - implement game complete check on server
|
|
|
|
|
if (!data.gameComplete) {
|
|
|
|
|
self.set4 = 0;
|
|
|
|
|
//self.updateCards4(data);
|
|
|
|
|
self.existingSet4();
|
|
|
|
|
//self.existingSet4();
|
|
|
|
|
self.increaseScore4();
|
|
|
|
|
} else {
|
|
|
|
|
self.gameWon();
|
|
|
|
@ -1377,12 +1519,26 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
clearCards0: function(ids,data) {
|
|
|
|
|
var self = this;
|
|
|
|
|
this.selected0 = [];
|
|
|
|
|
this.$board0.empty();
|
|
|
|
|
var cardIds = $.map(self.cards0, function(card) { return card.id; });
|
|
|
|
|
console.log(cardIds);
|
|
|
|
|
$.each(ids, function(idx, id) {
|
|
|
|
|
var location = cardIds.indexOf(id);
|
|
|
|
|
if (location > -1) {
|
|
|
|
|
console.log(cardIds[location]);
|
|
|
|
|
cardIds.splice(location, 1);
|
|
|
|
|
self.cards0.splice(location, 1, data[idx]);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
this.displayCards0();
|
|
|
|
|
console.log(cardIds);
|
|
|
|
|
console.log(self.cards0);
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
clearCards: function(ids,data) {
|
|
|
|
|
// remove submitted cards game's card array and clear the board
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var self = this;
|
|
|
|
|
this.selected = [];
|
|
|
|
|
this.$board.empty();
|
|
|
|
@ -1508,8 +1664,9 @@ var Game = {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
increaseScore0: function() {
|
|
|
|
|
this.$score0.html(++this.score0);
|
|
|
|
|
},
|
|
|
|
|
increaseScore: function() {
|
|
|
|
|
this.$score.html(++this.score);
|
|
|
|
|
},
|
|
|
|
@ -1554,7 +1711,7 @@ var Game = {
|
|
|
|
|
Game.deal();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
var canvases = document.getElementsByClassName(' red solid');
|
|
|
|
|
|
|
|
|
|
console.log(canvases);
|
|
|
|
|