From 4cd4a1138323e9fa61f1187c776618f53fa43b1d Mon Sep 17 00:00:00 2001
From: Bastien Jacquelin <bastien.jacquelin@etu.uca.fr>
Date: Mon, 3 Apr 2023 10:27:49 +0200
Subject: [PATCH] fix bug end of game

---
 src/Model/Deck.js | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

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