From 510997174a0d724ff4ffe4d43cdf6fbf09e732a9 Mon Sep 17 00:00:00 2001
From: cldupland <clement.dupland@etu.uca.fr>
Date: Wed, 18 Dec 2019 16:40:44 +0100
Subject: [PATCH] Modification d'une erreur de fin de jeu

---
 .../abstractRules/TerminerSonTour.cs          | 11 ++++---
 .../classic/TerminerSonTourClassic.cs         | 29 ++++++++++++++++++-
 .../decimals/TerminerSonTourDecimal.cs        | 29 ++++++++++++++++++-
 .../extreme/ExtremeTerminerSonTour.cs         |  2 +-
 .../fraction/TerminerSonTourFraction.cs       | 29 ++++++++++++++++++-
 OrderStacks/view/LastPage_Rules.xaml          |  3 +-
 OrderStacks/view/MainPage.xaml.cs             |  3 +-
 OrderStacks/view/ReglesParticuliere.xaml      |  6 ++--
 OrderStacks/view/RulesGame.xaml               |  6 ++--
 OrderStacks/view/SecondePageRules.xaml        |  6 ++--
 10 files changed, 108 insertions(+), 16 deletions(-)

diff --git a/OrderStacks/model/gameActions/abstractRules/TerminerSonTour.cs b/OrderStacks/model/gameActions/abstractRules/TerminerSonTour.cs
index 53efd9d..0eab88a 100644
--- a/OrderStacks/model/gameActions/abstractRules/TerminerSonTour.cs
+++ b/OrderStacks/model/gameActions/abstractRules/TerminerSonTour.cs
@@ -30,15 +30,15 @@ namespace OrderStacks.model.gameActions.abstractRules
          * 
          * Fonction permettant de gérer le test de fin du jeu
          *
-         * <returns>Booléen de fin du jeu</returns>
+         * <returns>Booléen de possibilité de jeu</returns>
          */
         public bool Test(List<Card> CurrentHand)
         {
-            if (CurrentHand.Count != 0)
+            if (CurrentHand.Count > 0 )
             {
                 List<Card> playableCard = new List<Card>();
                 tryToFindSoluce(playableCard, CurrentHand);
-                return testEndGame(playableCard);
+                return testEndGame(playableCard, CurrentHand);
             }
             return false;
         }
@@ -53,9 +53,12 @@ namespace OrderStacks.model.gameActions.abstractRules
 
         /**
          * <param name="playableCard">Liste des cartes jouables</param>
+         * <param name="CurrentHand">Liste de carte du joueur actif</param>
          *
          * Fonction vérifiant que les règles de fin de jeu ne sont pas arrivé
+         *
+         * <returns>Booléen de possibilité de jeu</returns>
          */
-        protected abstract bool testEndGame(List<Card> playableCard);
+        protected abstract bool testEndGame(List<Card> playableCard, List<Card> CurrentHand);
     }
 }
diff --git a/OrderStacks/model/gameActions/classic/TerminerSonTourClassic.cs b/OrderStacks/model/gameActions/classic/TerminerSonTourClassic.cs
index d842668..564b7a9 100644
--- a/OrderStacks/model/gameActions/classic/TerminerSonTourClassic.cs
+++ b/OrderStacks/model/gameActions/classic/TerminerSonTourClassic.cs
@@ -172,11 +172,38 @@ namespace OrderStacks.model.gameActions.classic
 
         /**
          * <param name="playableCard">Liste des cartes jouables</param>
+         * <param name="CurrentHand">Liste de carte du joueur actif</param>
          *
          * Fonction vérifiant que les règles de fin de jeu ne sont pas arrivé
+         *
+         * <returns>Booléen de possibilité de jeu</returns>
          */
-        override protected bool testEndGame(List<Card> playableCard)
+        override protected bool testEndGame(List<Card> playableCard, List<Card> CurrentHand)
         {
+            if (CurrentHand.Count == 1)
+            {
+                for (int i = 0; i < ListOrderedStacks.Size; i++)
+                {
+                    if (i < ListOrderedStacks.Size * 0.5)
+                    {
+                        if (CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value) > 0)
+                        {
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        if (CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value) < 0)
+                        {
+                            return true;
+                        }
+                    }
+                    if (CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 10) == 0 || CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 10) == 0)
+                    {
+                        return true;
+                    }
+                }
+            }
             if (playableCard.Count < 2)
             {
                 return false;
diff --git a/OrderStacks/model/gameActions/decimals/TerminerSonTourDecimal.cs b/OrderStacks/model/gameActions/decimals/TerminerSonTourDecimal.cs
index 452f566..0337cbc 100644
--- a/OrderStacks/model/gameActions/decimals/TerminerSonTourDecimal.cs
+++ b/OrderStacks/model/gameActions/decimals/TerminerSonTourDecimal.cs
@@ -172,11 +172,38 @@ namespace OrderStacks.model.gameActions.decimals
 
         /**
          * <param name="playableCard">Liste des cartes jouables</param>
+         * <param name="CurrentHand">Liste de carte du joueur actif</param>
          *
          * Fonction vérifiant que les règles de fin de jeu ne sont pas arrivé
+         *
+         * <returns>Booléen de possibilité de jeu</returns>
          */
-        override protected bool testEndGame(List<Card> playableCard)
+        override protected bool testEndGame(List<Card> playableCard, List<Card> CurrentHand)
         {
+            if (CurrentHand.Count == 1)
+            {
+                for (int i = 0; i < ListOrderedStacks.Size; i++)
+                {
+                    if (i < ListOrderedStacks.Size * 0.5)
+                    {
+                        if (CurrentHand[0].Value > ListOrderedStacks.getStack(i).Peek().Value)
+                        {
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        if (CurrentHand[0].Value < ListOrderedStacks.getStack(i).Peek().Value)
+                        {
+                            return true;
+                        }
+                    }
+                    if (CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 1m) == 0 || CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.1m) == 0 || CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.01m) == 0 || CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value + 0.001m) == 0 || CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 1m) == 0 || CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.1m) == 0 || CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.01m) == 0 || CurrentHand[0].Value.CompareTo(ListOrderedStacks.getStack(i).Peek().Value - 0.001m) == 0)
+                    {
+                        return true;
+                    }
+                }
+            }
             if (playableCard.Count < 2)
             {
                 return false;
diff --git a/OrderStacks/model/gameActions/extreme/ExtremeTerminerSonTour.cs b/OrderStacks/model/gameActions/extreme/ExtremeTerminerSonTour.cs
index 08c1c30..a900e34 100644
--- a/OrderStacks/model/gameActions/extreme/ExtremeTerminerSonTour.cs
+++ b/OrderStacks/model/gameActions/extreme/ExtremeTerminerSonTour.cs
@@ -17,7 +17,7 @@ namespace OrderStacks.model.gameActions.extreme
             throw new NotImplementedException();
         }
 
-        protected override bool testEndGame(List<Card> playableCard)
+        protected override bool testEndGame(List<Card> playableCard, List<Card> CurrentHand)
         {
             throw new NotImplementedException();
         }
diff --git a/OrderStacks/model/gameActions/fraction/TerminerSonTourFraction.cs b/OrderStacks/model/gameActions/fraction/TerminerSonTourFraction.cs
index 796ea32..5b49ffe 100644
--- a/OrderStacks/model/gameActions/fraction/TerminerSonTourFraction.cs
+++ b/OrderStacks/model/gameActions/fraction/TerminerSonTourFraction.cs
@@ -42,11 +42,38 @@ namespace OrderStacks.model.gameActions.fraction
 
         /**
          * <param name="playableCard">Liste des cartes jouables</param>
+         * <param name="CurrentHand">Liste de carte du joueur actif</param>
          *
          * Fonction vérifiant que les règles de fin de jeu ne sont pas arrivé
+         *
+         * <returns>Booléen de possibilité de jeu</returns>
          */
-        protected override bool testEndGame(List<Card> playableCard)
+        protected override bool testEndGame(List<Card> playableCard, List<Card> CurrentHand)
         {
+            if (CurrentHand.Count == 1)
+            {
+                for (int i = 0; i < ListOrderedStacks.Size; i++)
+                {
+                    if (i < ListOrderedStacks.Size * 0.5)
+                    {
+                        if (CurrentHand[0].Value > ListOrderedStacks.getStack(i).Peek().Value)
+                        {
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        if (CurrentHand[0].Value < ListOrderedStacks.getStack(i).Peek().Value)
+                        {
+                            return true;
+                        }
+                    }
+                    if (((FractionCard)CurrentHand[0]).Fraction.isMultiple(((FractionCard)ListOrderedStacks.getStack(i).Peek()).Fraction))
+                    {
+                        return true;
+                    }
+                }
+            }
             if (playableCard.Count < 2)
             {
                 return false;
diff --git a/OrderStacks/view/LastPage_Rules.xaml b/OrderStacks/view/LastPage_Rules.xaml
index dc50e67..121bb65 100644
--- a/OrderStacks/view/LastPage_Rules.xaml
+++ b/OrderStacks/view/LastPage_Rules.xaml
@@ -40,7 +40,8 @@
                     VerticalOptions="Center"
                     HorizontalOptions="Center"
                     CornerRadius="10"
-                    Clicked="ClickToPlay"/>
+                    Clicked="ClickToPlay"
+                    Padding="10"/>
 
         <ImageButton Source="HomeIcon.png"
                      Grid.Column="0"
diff --git a/OrderStacks/view/MainPage.xaml.cs b/OrderStacks/view/MainPage.xaml.cs
index b0c9fa7..34d223c 100644
--- a/OrderStacks/view/MainPage.xaml.cs
+++ b/OrderStacks/view/MainPage.xaml.cs
@@ -333,7 +333,8 @@ namespace OrderStacks.view
                 CornerRadius = 10,
                 BackgroundColor = (Color)Application.Current.Resources["Gold"],
                 VerticalOptions = LayoutOptions.Center,
-                HorizontalOptions = LayoutOptions.End
+                HorizontalOptions = LayoutOptions.End,
+                Padding = 10
             };
             retryButton.Clicked += Retry;
             gameOption.Children.Add(retryButton);
diff --git a/OrderStacks/view/ReglesParticuliere.xaml b/OrderStacks/view/ReglesParticuliere.xaml
index c72df75..9bae03d 100644
--- a/OrderStacks/view/ReglesParticuliere.xaml
+++ b/OrderStacks/view/ReglesParticuliere.xaml
@@ -40,7 +40,8 @@
                     VerticalOptions="Center"
                     HorizontalOptions="Center"
                     CornerRadius="10"
-                    Clicked="ClickToPlay"/>
+                    Clicked="ClickToPlay"
+                    Padding="10"/>
 
         <ImageButton Source="HomeIcon.png"
                      Grid.Column="0"
@@ -59,7 +60,8 @@
                 Grid.Row="2"
                 VerticalOptions="Center"
                 HorizontalOptions="Center"
-                Clicked="nextPage_Rules"/>
+                Clicked="nextPage_Rules"
+                Padding="10"/>
 
         <ScrollView Grid.Row="1"
                     Grid.Column="0"
diff --git a/OrderStacks/view/RulesGame.xaml b/OrderStacks/view/RulesGame.xaml
index 4e4d960..bcbac89 100644
--- a/OrderStacks/view/RulesGame.xaml
+++ b/OrderStacks/view/RulesGame.xaml
@@ -43,7 +43,8 @@
                     VerticalOptions="Center"
                     HorizontalOptions="Center"
                     CornerRadius="10"
-                    Clicked="ClickToPlay"/>
+                    Clicked="ClickToPlay"
+                    Padding="10"/>
 
         <ImageButton Source="HomeIcon.png"
                      Grid.Column="0"
@@ -62,7 +63,8 @@
                 Grid.Row="2"
                 VerticalOptions="Center"
                 HorizontalOptions="Center"
-                Clicked="nextPage_Rules"/>
+                Clicked="nextPage_Rules"
+                Padding="10"/>
 
         <ScrollView Grid.Row="1"
                     Grid.Column="0"
diff --git a/OrderStacks/view/SecondePageRules.xaml b/OrderStacks/view/SecondePageRules.xaml
index eae85dc..bbc7946 100644
--- a/OrderStacks/view/SecondePageRules.xaml
+++ b/OrderStacks/view/SecondePageRules.xaml
@@ -40,7 +40,8 @@
                     VerticalOptions="Center"
                     HorizontalOptions="Center"
                     CornerRadius="10"
-                    Clicked="ClickToPlay"/>
+                    Clicked="ClickToPlay"
+                    Padding="10"/>
 
         <ImageButton Source="HomeIcon.png"
                      Grid.Column="0"
@@ -59,7 +60,8 @@
                 Grid.Row="2"
                 VerticalOptions="Center"
                 HorizontalOptions="Center"
-                Clicked="nextPage_Rules"/>
+                Clicked="nextPage_Rules"
+                Padding="10"/>
 
         <ScrollView Grid.Row="1"
                     Grid.Column="0"