master
readhame 5 years ago
parent a7c6cc3752
commit bed1053955

@ -109,7 +109,7 @@
<workItem from="1593683259701" duration="5974000" />
<workItem from="1593698220416" duration="8218000" />
<workItem from="1593708007166" duration="214000" />
<workItem from="1593763430814" duration="7369000" />
<workItem from="1593763430814" duration="11979000" />
</task>
<servers />
</component>

@ -25,7 +25,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'deal') {
$_SESSION['deck2'] = new Deck($_GET['action']);
$_SESSION['game2'] = new Game($_SESSION['deck2']);
$game = $_SESSION['game2'];
echo json_encode($game->start(36));
echo json_encode($game->start(45));
} else if (isset($_GET['action']) && $_GET['action'] == 'deal3') {
$_SESSION['deck3'] = new Deck($_GET['action']);
@ -88,4 +88,4 @@ else if (isset($_GET['action']) && $_GET['action'] == 'submitHS'){
else if (isset($_GET['action']) && $_GET['action'] == 'submitHS0'){
$deck = $_SESSION['deckHS0'];
echo json_encode($deck->fourMore());
}
}

@ -60,7 +60,7 @@
<div class="game-button-mode">
<button class="game-button text" id="playSimpleH" onclick="showGameHS0();">Hyper SET! 3*3</button>
<button class="game-button text" id="playSimpleHSet" onclick="showGameHS();">Hyper SET! 3*4</button>
<button class="game-button text" id="playSimpleHSetLast" onclick="showGameHS1();">(à venir)</button>
<button class="game-button text" id="playSimpleHSetLast" onclick="showGameHS1();">Hyper SET! 4*4</button>
<button class="game-button text" id="playHSetFour" onclick="showGameHS2();">(à venir)</button>
<button class="game-button text" id="playSimpleHSetFive" onclick="showGameHS3();">(à venir)</button>
<button class="game-button text" id="playHSetFive" onclick="showGameHS4();">(à venir)</button>
@ -118,7 +118,7 @@
<p>Sets found: <span data-display="score2" class="score">0</span></p>
<p>Number of Sets: <span data-display="nbSets2" class="nbSets"></span></p>
<div class="game-board44" data-display="game-board2"></div>
<div class="game-board1" data-display="game-board2"></div>
</div>
<div id='game3' class="wrapper" style="display: none;">
<h1>Set 4x5</h1>
@ -176,6 +176,17 @@
<div class="game-board" data-display="game-boardHS0"></div>
</div>
<div id='gameHS1' class="wrapper" style="display: none;">
<h1>HyperSet 3x3 </h1>
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet1()" src="vues/images/previous.png">
</div>
<p>Nombre de carte = 4; Nombre de critères = 5</p>
<p>HyperSets found: <span data-display="scoreHS1" class="score">0</span></p>
<p>Number of HyperSets: <span data-display="nbSetsHS1" class="nbSets"></span></p>
<div class="game-board" data-display="game-boardHS1"></div>
</div>

@ -85,12 +85,14 @@ function showGameHS0(){
document.getElementById('selectModeHyperSet').style.display='none';
}
function goSelectModeHyperSet0(){
document.getElementById('gameHS0').style.display='none';
document.getElementById('selectModeHyperSet').style.display='block';
function showGameHS1(){
document.getElementById('gameHS1').style.display='block';
document.getElementById('selectModeHyperSet').style.display='none';
}
function showGame0(){
document.getElementById('game0').style.display='block';
document.getElementById('selectModeSet').style.display='none';
@ -121,6 +123,9 @@ function showGame4(){
document.getElementById('selectModeSet').style.display='none';
}
function showModeGame(){
document.getElementById('selectModeSet').style.display='block';
document.getElementById('selectMode').style.display='none';
@ -131,6 +136,11 @@ function showModeGame1(){
document.getElementById('selectMode').style.display='none';
}
function showModeGames(){
document.getElementById('selectMode').style.display='block';
document.getElementById('home').style.display='none';
@ -219,3 +229,11 @@ function goSelectModeHyperSet(){
document.getElementById('selectModeHyperSet').style.display='block';
document.getElementById('gameHS').style.display='none';
}
function goSelectModeHyperSet0(){
document.getElementById('gameHS0').style.display='none';
document.getElementById('selectModeHyperSet').style.display='block';
}
function goSelectModeHyperSet1(){
document.getElementById('gameHS1').style.display='none';
document.getElementById('selectModeHyperSet').style.display='block';
}

@ -82,6 +82,7 @@ var Game = {
var dealRequest0;
var dealRequestHS;
var dealRequestHS0;
// ajax request to get initial set of cards
dealRequest = $.ajax({
@ -176,7 +177,7 @@ var Game = {
}
});
dealRequestHS= $.ajax({
dealRequestHS0= $.ajax({
url: 'set.php?action=dealHS0',
type: 'GET',
dataType: 'json',
@ -306,7 +307,7 @@ var Game = {
self.$board2.append(cardNode);
// display 4 cards per row
if ((index+1) % 4 === 0) {
if ((index+1) % 5 === 0) {
self.$board2.append($('<div>'));
}
@ -1191,7 +1192,6 @@ var Game = {
},
selectCard: function(card) {
console.log(this.selected.length);
if (this.selected.length < 3) {
$(card).addClass('selected');
this.selected.push(card);
@ -1204,6 +1204,7 @@ var Game = {
if (this.selected1.length < 3) {
console.log(this.selected1);
$(card).addClass('selected');
this.selected1.push(card);
}
@ -1253,6 +1254,7 @@ var Game = {
if (this.selectedHS0.length < 4) {
$(card).addClass('selected');
this.selectedHS0.push(card);
}
},
@ -1428,6 +1430,8 @@ var Game = {
carteCD.splice(0,1,this.selectedHS0[2]);
carteCD.splice(1,1,this.selectedHS0[3]);
carteAC.splice(0,1,this.selectedHS0[0]);
carteAC.splice(1,1,this.selectedHS0[2]);
carteBD.splice(0,1,this.selectedHS0[1]);
@ -1440,35 +1444,38 @@ var Game = {
// modalité de toutes les 4 cartes
var colors1= $.map(this.selectedHS0, function(card) { return card.color;});
var shapes1 = $.map(this.selectedHS0, function(card) { return card.shape; });
var numbers1 = $.map(this.selectedHS0, function(card) { return card.number });
var colors1= $.map(this.selectedHS0, function(el) { return $(el).data("color");});
var shapes1 = $.map(this.selectedHS0, function(el) { return $(el).data("shape");});
var numbers1 = $.map(this.selectedHS0, function(el) { return $(el).data("number");});
// modalité des combinaison de carte (ab ac ad ...) pour verifier si forme un set
var colors2= $.map(carteAB, function(card) { return card.color;});
var shapes2 = $.map(carteAB, function(card) { return card.shape; });
var numbers2 = $.map(carteAB, function(card) { return card.number });
var colors2= $.map(carteAB, function(el) { return $(el).data("color");});
var shapes2 = $.map(carteAB, function(el) { return $(el).data("shape");});
var numbers2 = $.map(carteAB, function(el) { return $(el).data("number");});
var colors3= $.map(carteCD, function(card) { return card.color;});
var shapes3 = $.map(carteCD, function(card) { return card.shape; });
var numbers3 = $.map(carteCD, function(card) { return card.number });
var colors3= $.map(carteCD, function(el) { return $(el).data("color");});
var shapes3 = $.map(carteCD, function(el) { return $(el).data("shape");});
var numbers3 = $.map(carteCD, function(el) { return $(el).data("number");});
var colors4= $.map(carteAC, function(card) { return card.color;});
var shapes4 = $.map(carteAC, function(card) { return card.shape; });
var numbers4 = $.map(carteAC, function(card) { return card.number });
var colors5= $.map(carteBD, function(card) { return card.color;});
var shapes5 = $.map(carteBD, function(card) { return card.shape; });
var numbers5 = $.map(carteBD, function(card) { return card.number });
var colors4= $.map(carteAC, function(el) { return $(el).data("color");});
var shapes4 = $.map(carteAC, function(el) { return $(el).data("shape");});
var numbers4 = $.map(carteAC, function(el) { return $(el).data("number");});
var colors6= $.map(carteAD, function(card) { return card.color;});
var shapes6 = $.map(carteAD, function(card) { return card.shape; });
var numbers6 = $.map(carteAD, function(card) { return card.number });
var colors5= $.map(carteBD, function(el) { return $(el).data("color");});
var shapes5 = $.map(carteBD, function(el) { return $(el).data("shape");});
var numbers5 = $.map(carteBD, function(el) { return $(el).data("number");});
var colors6= $.map(carteAD, function(el) { return $(el).data("color");});
var shapes6 = $.map(carteAD, function(el) { return $(el).data("shape");});
var numbers6 = $.map(carteAD, function(el) { return $(el).data("number");});
var colors7= $.map(carteBC, function(el) { return $(el).data("color");});
var shapes7 = $.map(carteBC, function(el) { return $(el).data("shape");});
var numbers7 = $.map(carteBC, function(el) { return $(el).data("number");});
var colors7= $.map(carteBC, function(card) { return card.color;});
var shapes7 = $.map(carteBC, function(card) { return card.shape; });
var numbers7 = $.map(carteBC, function(card) { return card.number });
if(colors1[0] === colors1 [1]){
@ -1775,13 +1782,15 @@ var Game = {
}
}
if(this.isSet(colors2) && this.isSet(shapes2) && this.isSet(numbers2)) {
return this.isSet(colors3) && this.isSet(shapes3) && this.isSet(numbers3)
console.log(colors3, shapes3, numbers3);
return this.isSet(colors3) && this.isSet(shapes3) && this.isSet(numbers3);
}
if(this.isSet(colors4) && this.isSet(shapes4) && this.isSet(numbers4)){
return this.isSet(colors5)&& this.isSet(shapes5)&& this.isSet(numbers5)
console.log(colors5,shapes5,numbers5);
return this.isSet(colors5) && this.isSet(shapes5) && this.isSet(numbers5)
}
if(this.isSet(colors6) && this.isSet(shapes6) && this.isSet(fills6) && this.isSet(numbers6)) {
return this.isSet(colors7) && this.isSet(shapes7) && this.isSet(numbers7)
if(this.isSet(colors6) && this.isSet(shapes6) && this.isSet(numbers6)) {
return this.isSet(colors7) && this.isSet(shapes7) && this.isSet(numbers7);
}
},
@ -1811,45 +1820,45 @@ var Game = {
// modalité de toutes les 4 cartes
var colors1= $.map(this.selectedHS, function(card) { return card.color;});
var shapes1 = $.map(this.selectedHS, function(card) { return card.shape; });
var fills1= $.map(this.selectedHS, function(card) { return card.fill });
var numbers1 = $.map(this.selectedHS, function(card) { return card.number });
var colors1= $.map(this.selectedHS, function(el) { return $(el).data("color");});
var shapes1 = $.map(this.selectedHS, function(el) { return $(el).data("shape");});
var fills1= $.map(this.selectedHS,function(el) { return $(el).data("fill");});
var numbers1 = $.map(this.selectedHS, function(el) { return $(el).data("number");});
// modalité des combinaison de carte (ab ac ad ...) pour verifier si forme un set
var colors2= $.map(carteAB, function(card) { return card.color;});
var shapes2 = $.map(carteAB, function(card) { return card.shape; });
var fills2= $.map(carteAB, function(card) { return card.fill });
var numbers2 = $.map(carteAB, function(card) { return card.number });
var colors2= $.map(carteAB, function(el) { return $(el).data("color");});
var shapes2 = $.map(carteAB, function(el) { return $(el).data("shape");});
var fills2= $.map(carteAB, function(el) { return $(el).data("fill");});
var numbers2 = $.map(carteAB, function(el) { return $(el).data("number");});
var colors3= $.map(carteCD, function(card) { return card.color;});
var shapes3 = $.map(carteCD, function(card) { return card.shape; });
var fills3= $.map(carteCD, function(card) { return card.fill });
var numbers3 = $.map(carteCD, function(card) { return card.number });
var colors3= $.map(carteCD, function(el) { return $(el).data("color");});
var shapes3 = $.map(carteCD, function(el) { return $(el).data("shape");});
var fills3= $.map(carteCD, function(el) { return $(el).data("fill");});
var numbers3 = $.map(carteCD, function(el) { return $(el).data("number");});
var colors4= $.map(carteAC, function(card) { return card.color;});
var shapes4 = $.map(carteAC, function(card) { return card.shape; });
var fills4= $.map(carteAC, function(card) { return card.fill });
var numbers4 = $.map(carteAC, function(card) { return card.number });
var colors4= $.map(carteAC, function(el) { return $(el).data("color");});
var shapes4 = $.map(carteAC, function(el) { return $(el).data("shape");});
var fills4= $.map(carteAC, function(el) { return $(el).data("fill");});
var numbers4 = $.map(carteAC, function(el) { return $(el).data("number");});
var colors5= $.map(carteBD, function(card) { return card.color;});
var shapes5 = $.map(carteBD, function(card) { return card.shape; });
var fills5= $.map(carteBD, function(card) { return card.fill });
var numbers5 = $.map(carteBD, function(card) { return card.number });
var colors5= $.map(carteBD, function(el) { return $(el).data("color");});
var shapes5 = $.map(carteBD, function(el) { return $(el).data("shape");});
var fills5= $.map(carteBD, function(el) { return $(el).data("fill");});
var numbers5 = $.map(carteBD, function(el) { return $(el).data("number");});
var colors6= $.map(carteAD, function(card) { return card.color;});
var shapes6 = $.map(carteAD, function(card) { return card.shape; });
var fills6= $.map(carteAD, function(card) { return card.fill });
var numbers6 = $.map(carteAD, function(card) { return card.number });
var colors6= $.map(carteAD, function(el) { return $(el).data("color");});
var shapes6 = $.map(carteAD, function(el) { return $(el).data("shape");});
var fills6= $.map(carteAD, function(el) { return $(el).data("fill");});
var numbers6 = $.map(carteAD, function(el) { return $(el).data("number");});
var colors7= $.map(carteBC, function(card) { return card.color;});
var shapes7 = $.map(carteBC, function(card) { return card.shape; });
var fills7= $.map(carteBC, function(card) { return card.fill });
var numbers7 = $.map(carteBC, function(card) { return card.number });
var colors7= $.map(carteBC, function(el) { return $(el).data("color");});
var shapes7 = $.map(carteBC, function(el) { return $(el).data("shape");});
var fills7= $.map(carteBC, function(el) { return $(el).data("fill");});
var numbers7 = $.map(carteBC, function(el) { return $(el).data("number");});
if(colors1[0] === colors1 [1]){
@ -2294,10 +2303,14 @@ var Game = {
validateSet0: function() {
var self = this;
console.log(this.selected0);
var colors = $.map(self.selected0, function(el) { return $(el).data("color");});
var shapes = $.map(self.selected0, function(el) { return $(el).data("shape"); });
var numbers= $.map(self.selected0, function(el) { return $(el).data("number"); });
console.log(colors);
return (self.isSet(colors) && self.isSet(shapes) && self.isSet(numbers));
},

Loading…
Cancel
Save