Petite correction du model

TheGameExtreme/model/Preparateur.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using TheGameExtreme.model;
 using TheGameExtreme.model.gameActions.classic;
 
-namespace TheGameExtreme
+namespace TheGameExtreme.model
 {
     public class Parametreur
     {

TheGameExtreme/model/gameActions/classic/GameMode.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using TheGameExtreme.model.card;
 using TheGameExtreme.model.deck;
 using TheGameExtreme.model.@event;
-using TheGameExtreme.model.gameActions;
 
 namespace TheGameExtreme.model.gameActions.classic
 {
@@ -12,10 +11,10 @@ namespace TheGameExtreme.model.gameActions.classic
 
         protected List<GameAction> gameActions;
         protected Piles piles;
-        protected int nbCardAtBeginOfTurn = 7;
+        public int NbCardAtBeginOfTurn { get; set; }
         protected Deck deck;
-        private int nbMaxCard;
-        public String Message { get; set; }
+        protected int nbMaxCard;
+        public string Message { get; set; }
 
 
         #region
@@ -72,12 +71,15 @@ namespace TheGameExtreme.model.gameActions.classic
             {
                 case 1:
                     nbMaxCard = 8;
+                    NbCardAtBeginOfTurn = 8;
                     break;
                 case 2:
                     nbMaxCard = 7;
+                    NbCardAtBeginOfTurn = 7;
                     break;
                 default:
                     nbMaxCard = 6;
+                    NbCardAtBeginOfTurn = 6;
                     break;
             }
         }
@@ -117,10 +119,9 @@ namespace TheGameExtreme.model.gameActions.classic
         public bool endTurn(List<Card> currentHand, List<Card> CurrentCardPlayed, Player player)
         {
             Message = null;
-            if (((TerminerSonTour)gameActions[2]).end(currentHand, nbCardAtBeginOfTurn, CurrentCardPlayed))
+            if (((TerminerSonTour)gameActions[2]).end(currentHand, NbCardAtBeginOfTurn, CurrentCardPlayed))
             {
                 pioche(currentHand, player);
-                nbCardAtBeginOfTurn = currentHand.Count;
                 CurrentCardPlayed.Clear();
                 
                 OnPlayerChanged(null);

TheGameExtreme/model/manager/GameManager.cs

@@ -4,7 +4,6 @@ using System.ComponentModel;
 using TheGameExtreme.model.card;
 using TheGameExtreme.model.@event;
 using TheGameExtreme.model.gameActions;
-using TheGameExtreme.model.gameActions.classic;
 
 namespace TheGameExtreme.model.manager
 {
@@ -13,7 +12,7 @@ namespace TheGameExtreme.model.manager
 
         /* GameMaster implémente un mode de jeu (classe fille de gameMode qui connait les actions a effectué en fonction du mode de jeu */
 
-        protected Parametreur preparateur;
+        protected Parametreur parametreur;
         public Piles ListOrderedStacks { get; set; }
         protected List<Card> CurrentCardPlayed = new List<Card>();
         public String EndMessage { get; set; }
@@ -47,12 +46,13 @@ namespace TheGameExtreme.model.manager
         protected internal void OnPlayerChanged(object source, PlayerChangedEventArgs args)
         {
             currentIndexPlayer += 1;
-            if (currentIndexPlayer == preparateur.players.Count)
+            if (currentIndexPlayer == parametreur.players.Count)
             {
                 currentIndexPlayer = 0;
             }
-            CurrentHand = preparateur.players[currentIndexPlayer].getCardList();
-            PlayerChanged?.Invoke(this, new PlayerChangedEventArgs(CurrentHand, preparateur.players[currentIndexPlayer].Pseudo));
+            CurrentHand = parametreur.players[currentIndexPlayer].getCardList();
+            PlayerChanged?.Invoke(this, new PlayerChangedEventArgs(CurrentHand, parametreur.players[currentIndexPlayer].Pseudo));
+            parametreur.GameMode.NbCardAtBeginOfTurn = CurrentHand.Count;
         }
 
         #endregion
@@ -61,7 +61,7 @@ namespace TheGameExtreme.model.manager
 
         protected GameManager(Parametreur parametreur)
         {
-            this.preparateur = parametreur;
+            this.parametreur = parametreur;
 
             parametreur.Prepare();
 
@@ -76,18 +76,18 @@ namespace TheGameExtreme.model.manager
 
         public void joue(int valueCard, int orderedStackSelected)
         {
-            preparateur.GameMode.playCard(valueCard, currentHand, orderedStackSelected, preparateur.players[currentIndexPlayer], CurrentCardPlayed); // Mettre le joueur actif
-            EndMessage = preparateur.GameMode.Message;
+            parametreur.GameMode.playCard(valueCard, currentHand, orderedStackSelected, parametreur.players[currentIndexPlayer], CurrentCardPlayed); // Mettre le joueur actif
+            EndMessage = parametreur.GameMode.Message;
         }
 
         public bool endTurn()
         {
-            if(preparateur.GameMode.endTurn(currentHand, CurrentCardPlayed, preparateur.players[currentIndexPlayer]))
+            if(parametreur.GameMode.endTurn(currentHand, CurrentCardPlayed, parametreur.players[currentIndexPlayer]))
             {
-                EndMessage = preparateur.GameMode.Message;
+                EndMessage = parametreur.GameMode.Message;
                 if (isEndGame())
                 {
-                    EndMessage = preparateur.GameMode.Message;
+                    EndMessage = parametreur.GameMode.Message;
                     return true;
                 }
                 else
@@ -103,7 +103,7 @@ namespace TheGameExtreme.model.manager
 
         private bool isEndGame()
         {
-            return preparateur.GameMode.isEndGame(currentHand);
+            return parametreur.GameMode.isEndGame(currentHand);
         }