From 1f50fb953de305efa27873cf2c6eb0e8d32f7ce3 Mon Sep 17 00:00:00 2001 From: cldupland Date: Thu, 12 Dec 2019 09:48:16 +0100 Subject: [PATCH] Stabilisation du nouvelle algorythme de recherche de solution + corrections visuelles --- .../Properties/AndroidManifest.xml | 2 +- TheGameExtreme/model/Parametreur.cs | 10 ++++++++ .../gameActions/abstractRules/GameMode.cs | 4 ++-- .../gameActions/classic/GameModeClassic.cs | 1 + TheGameExtreme/model/manager/GameManager.cs | 3 ++- .../view/GamePreparationPage.xaml.cs | 2 +- TheGameExtreme/view/MainPage.xaml | 1 - TheGameExtreme/view/MainPage.xaml.cs | 24 +++++++++++++------ 8 files changed, 34 insertions(+), 13 deletions(-) diff --git a/TheGameExtreme.Android/Properties/AndroidManifest.xml b/TheGameExtreme.Android/Properties/AndroidManifest.xml index 469b73b..fef0c71 100644 --- a/TheGameExtreme.Android/Properties/AndroidManifest.xml +++ b/TheGameExtreme.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/TheGameExtreme/model/Parametreur.cs b/TheGameExtreme/model/Parametreur.cs index b1e0da0..fa18a66 100644 --- a/TheGameExtreme/model/Parametreur.cs +++ b/TheGameExtreme/model/Parametreur.cs @@ -29,5 +29,15 @@ namespace TheGameExtreme.model players.Add(player); } } + + public string getScore() + { + int score = GameMode.getScore(); + players.ForEach(player => + { + score += player.getCardList().Count; + }); + return score.ToString(); + } } } diff --git a/TheGameExtreme/model/gameActions/abstractRules/GameMode.cs b/TheGameExtreme/model/gameActions/abstractRules/GameMode.cs index 82277f8..ab39166 100644 --- a/TheGameExtreme/model/gameActions/abstractRules/GameMode.cs +++ b/TheGameExtreme/model/gameActions/abstractRules/GameMode.cs @@ -112,9 +112,9 @@ namespace TheGameExtreme.model.gameActions.abstractRules public abstract void TestEndGame(List currentHand); - public string getScore() + public int getScore() { - return deck.size().ToString(); + return deck.size(); } } } diff --git a/TheGameExtreme/model/gameActions/classic/GameModeClassic.cs b/TheGameExtreme/model/gameActions/classic/GameModeClassic.cs index 53abaa4..8135616 100644 --- a/TheGameExtreme/model/gameActions/classic/GameModeClassic.cs +++ b/TheGameExtreme/model/gameActions/classic/GameModeClassic.cs @@ -4,6 +4,7 @@ using TheGameExtreme.model.card; using TheGameExtreme.model.deck; using TheGameExtreme.model.gameActions.abstractRules; using TheGameExtreme.model.piles; +using TheGameExtreme.Resx; namespace TheGameExtreme.model.gameActions.classic { diff --git a/TheGameExtreme/model/manager/GameManager.cs b/TheGameExtreme/model/manager/GameManager.cs index 5c4abe1..240d42e 100644 --- a/TheGameExtreme/model/manager/GameManager.cs +++ b/TheGameExtreme/model/manager/GameManager.cs @@ -104,7 +104,7 @@ namespace TheGameExtreme.model.manager { if(parametreur.GameMode.endTurn(currentHand, CurrentCardPlayed, parametreur.players[currentIndexPlayer])) { - EndMessage = parametreur.GameMode.Message + "Il vous restait " + parametreur.GameMode.getScore() + " cartes à jouer!"; + EndMessage = parametreur.GameMode.Message + "Il vous restait " + parametreur.getScore() + " cartes à jouer!"; return true; } else @@ -112,6 +112,7 @@ namespace TheGameExtreme.model.manager EndMessage = parametreur.GameMode.Message; if (win) { + EndMessage = AppResources.StrWin; OnEndGame(this, new EventArgs()); return true; } diff --git a/TheGameExtreme/view/GamePreparationPage.xaml.cs b/TheGameExtreme/view/GamePreparationPage.xaml.cs index 4aa390f..f379d4f 100644 --- a/TheGameExtreme/view/GamePreparationPage.xaml.cs +++ b/TheGameExtreme/view/GamePreparationPage.xaml.cs @@ -105,7 +105,7 @@ namespace TheGameExtreme.view { Placeholder = "Pseudo", BackgroundColor = (Color)Application.Current.Resources["Gold"], - WidthRequest = 200, + WidthRequest = 150, MinimumWidthRequest = 50, HorizontalOptions = LayoutOptions.Center, MaxLength = 18, diff --git a/TheGameExtreme/view/MainPage.xaml b/TheGameExtreme/view/MainPage.xaml index 6bdff1d..3b0f573 100644 --- a/TheGameExtreme/view/MainPage.xaml +++ b/TheGameExtreme/view/MainPage.xaml @@ -67,7 +67,6 @@ HorizontalOptions="End" VerticalOptions="Center" BackgroundColor="{DynamicResource Gold}" - HeightRequest="35" Padding="10" CornerRadius="10" Clicked="EndTurn"/> diff --git a/TheGameExtreme/view/MainPage.xaml.cs b/TheGameExtreme/view/MainPage.xaml.cs index 65fe552..7bd1569 100644 --- a/TheGameExtreme/view/MainPage.xaml.cs +++ b/TheGameExtreme/view/MainPage.xaml.cs @@ -326,11 +326,15 @@ namespace TheGameExtreme.view private void OnEndGame(object sender, EventArgs args) { gameOption.Children.Clear(); - Button retryButton = new Button(); - retryButton.Text = AppResources.StrRetry; - retryButton.CornerRadius = 10; + Button retryButton = new Button() + { + Text = AppResources.StrRetry, + CornerRadius = 10, + BackgroundColor = (Color)Application.Current.Resources["Gold"], + VerticalOptions = LayoutOptions.Center, + HorizontalOptions = LayoutOptions.End + }; retryButton.Clicked += Retry; - retryButton.BackgroundColor = (Color)Application.Current.Resources["Gold"]; gameOption.Children.Add(retryButton); } @@ -375,10 +379,16 @@ namespace TheGameExtreme.view progressBar.Progress = 1f; gameOption.Children.Clear(); - Button button = new Button(); - button.Text = AppResources.StrEndTurn; + Button button = new Button() + { + Padding = 10, + Text = AppResources.StrEndTurn, + BackgroundColor = (Color)Application.Current.Resources["Gold"], + CornerRadius = 10, + VerticalOptions = LayoutOptions.Center, + HorizontalOptions = LayoutOptions.End + }; button.Clicked += EndTurn; - button.BackgroundColor = (Color)Application.Current.Resources["Gold"]; gameOption.Children.Add(button); }