Ajout de l'ébauche du rapport

TheGameExtreme/model/deck/Deck.cs

@@ -9,11 +9,6 @@ namespace TheGameExtreme.model
 
         protected List<Card> deck = new List<Card>();
 
-        public Deck()
-        {
-
-        }
-
         public int size()
         {
             return deck.Count;

TheGameExtreme/model/gameActions/classic/GameMode.cs

@@ -12,11 +12,27 @@ namespace TheGameExtreme.model.gameActions.classic
 
         protected List<GameAction> gameActions;
         protected Piles piles;
-        public event EventHandler<TopRangeChangedEventArgs> TopRangeChanged;
         protected int nbCardAtBeginOfTurn = 7;
         protected Deck deck;
         private int nbMaxCard;
 
+
+        #region
+
+        public event EventHandler<TopRangeChangedEventArgs> TopRangeChanged;
+        public event EventHandler<PlayerChangedEventArgs> PlayerChanged;
+        protected internal void OnTopRangeChanged(TopRangeChangedEventArgs args)
+        {
+            TopRangeChanged?.Invoke(this, args);
+        }
+        protected internal void OnPlayerChanged(PlayerChangedEventArgs args)
+        {
+            PlayerChanged?.Invoke(this, args);
+        }
+
+        #endregion
+
+
         public GameMode()
         {
             gameActions = new List<GameAction>();
@@ -91,24 +107,22 @@ namespace TheGameExtreme.model.gameActions.classic
             }
         }
 
-        protected internal void OnTopRangeChanged(TopRangeChangedEventArgs args)
-        {
-            TopRangeChanged?.Invoke(this, args);
-        }
-
         public bool endTurn(List<Card> currentHand, List<Card> CurrentCardPlayed, Player player)
         {
-            ((TerminerSonTour)gameActions[2]).end(currentHand, nbCardAtBeginOfTurn, CurrentCardPlayed);
+            if (((TerminerSonTour)gameActions[2]).end(currentHand, nbCardAtBeginOfTurn, CurrentCardPlayed))
+            {
                 pioche(currentHand, player);
-            //currentIndexPlayer += 1;
-            //if (currentIndexPlayer == playerList.Count)
-            //{
-            //    currentIndexPlayer = 0;
-            //}
-            //CurrentHand = playerList[currentIndexPlayer].getCardList();
-            //OnPlayerChanged(new PlayerChangedEventArgs(CurrentHand, playerList[currentIndexPlayer].Pseudo));
                 nbCardAtBeginOfTurn = currentHand.Count;
                 CurrentCardPlayed.Clear();
+                
+                OnPlayerChanged(new PlayerChangedEventArgs(currentHand, player.Pseudo));
+                return false;
+            }
+            else
+            {
+                return true;
+            }
+            
             //if (isEndGame())    // Ajouter le score en calculant les cartes restantes dans la pile et dans les mains des joueurs
             //{
             //    displayWinner();
@@ -118,7 +132,6 @@ namespace TheGameExtreme.model.gameActions.classic
             //{
             //    return true;
             //}
-            return false; // Changer
         }
 
         //protected void displayWinner()

TheGameExtreme/model/gameActions/classic/TerminerSonTour.cs

@@ -15,7 +15,7 @@ namespace TheGameExtreme.model.gameActions.classic
         {
             // Si carte qui fait piocher que d'un, vérifier la bonne pioche (penser si elle vient d'être recouverte)
             // Sinon
-            if (nbCardAtBeginOfTurn == CurrentCardPlayed.Count || CurrentHand.Count == 0 || (nbCardAtBeginOfTurn - CurrentHand.Count) >= 2)
+            if (nbCardAtBeginOfTurn == CurrentCardPlayed.Count || CurrentHand.Count == 0 || CurrentCardPlayed.Count >= 2)
             {   // Ne pas oublié de gérer les ThreeCard
                 return Test(CurrentHand);
             }

TheGameExtreme/model/manager/GameManager.cs

@@ -25,6 +25,7 @@ namespace TheGameExtreme.model.manager
         protected int nbMaxCard;
         protected List<Card> CurrentCardPlayed = new List<Card>();
         public String EndMessage { get; set; }
+        protected int currentIndexPlayer;
 
 
         protected List<Card> currentHand;
@@ -41,7 +42,7 @@ namespace TheGameExtreme.model.manager
         #region event
 
         public event EventHandler<TopRangeChangedEventArgs> TopRangeChanged;
-        //public event EventHandler<PlayerChangedEventArgs> PlayerChanged;
+        public event EventHandler<PlayerChangedEventArgs> PlayerChanged;
         public event PropertyChangedEventHandler PropertyChanged;
         public virtual void OnPropertyChanged(string info)
         {
@@ -51,11 +52,26 @@ namespace TheGameExtreme.model.manager
         {
             TopRangeChanged?.Invoke(this, args);
         }
+        protected internal void OnPlayerChanged(PlayerChangedEventArgs args)
+        {
+            currentIndexPlayer += 1;
+            if (currentIndexPlayer == players.Count)
+            {
+                currentIndexPlayer = 0;
+            }
+            CurrentHand = players[currentIndexPlayer].getCardList();
+            PlayerChanged?.Invoke(this, args);
+        }
 
         #endregion
 
 
 
+        //protected bool win = true;
+        //public String EndMessage { get; set; }
+
+
+
         protected GameManager(List<string> playersNames, GameMode gameMode)
         {
             nbPlayer = players.Count;
@@ -78,7 +94,7 @@ namespace TheGameExtreme.model.manager
 
         public bool endTurn()
         {
-            return gameMode.endTurn(currentHand, CurrentCardPlayed, players[0]); // Mettre le joueur actif
+            return gameMode.endTurn(currentHand, CurrentCardPlayed, players[0]);
         }
 
 

TheGameExtreme/viewmodel/Main.cs

@@ -50,7 +50,7 @@ namespace TheGameExtreme.viewmodel
 
             gameManager.TopRangeChanged += OnTopRangeChanged;
 
-            //gameManager.PlayerChanged += OnPlayerChanged;
+            gameManager.PlayerChanged += OnPlayerChanged;
 
             CurrentHand = gameManager.CurrentHand;