fix bug end of game

pull/88/head
Bastien JACQUELIN 2 years ago
parent 1ff4e91de4
commit 4cd4a11383

@ -30,7 +30,6 @@ class Deck {
createDeck(nbCards) {//toTest⌛when more than 12c to d't add other cards createDeck(nbCards) {//toTest⌛when more than 12c to d't add other cards
if (this.remainingCards.length < this.nbCards) {// no more cards if (this.remainingCards.length < this.nbCards) {// no more cards
console.log("PLUS DE CARTES"); console.log("PLUS DE CARTES");
return;
} }
else { else {
let nbSets = setsCounter(this.outputCards, this.nbCards); let nbSets = setsCounter(this.outputCards, this.nbCards);
@ -71,20 +70,29 @@ class Deck {
*/ */
checkSet(selectedCards) {//toTest⌛ checkSet(selectedCards) {//toTest⌛
if (isSet(selectedCards)){// is a set if (isSet(selectedCards)){// is a set
if (this.outputCards.length == 0) { if (this.outputCards.length == 0) {//plus de deck
console.log("C'est win") console.log("C'est win")
return 2; return 2;
} }
else { else {//encore des cartes sur le deck
this.removeFromoutputCards(selectedCards); if(this.remainingCards.length < this.nbCards){// plus de pile
return 1; if(setsCounter(this.outputCards, this.nbCards) == 0){//plus de set mais encore des cartes dans le deck
return 2;
}
else{//encore des set
this.removeFromoutputCards(selectedCards);
return 1;
}
}
else{// encore de la pile
this.removeFromoutputCards(selectedCards);
return 1;
}
} }
} }
else if (this.remainingCards.length < this.nbCards) { else{// pas un set
console.log("C'est win") return -1;
return 2;
} }
return 0;
} }
/** /**

Loading…
Cancel
Save