diff --git a/Documentations/Rapport.docx b/Documentations/Rapport.docx deleted file mode 100644 index e763561..0000000 Binary files a/Documentations/Rapport.docx and /dev/null differ diff --git a/Documentations/Rapport_DUPLAND.docx b/Documentations/Rapport_DUPLAND.docx new file mode 100644 index 0000000..c9ffa9f Binary files /dev/null and b/Documentations/Rapport_DUPLAND.docx differ diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj index d19dec3..7061e0b 100644 --- a/TheGameExtreme/TheGameExtreme.csproj +++ b/TheGameExtreme/TheGameExtreme.csproj @@ -6,7 +6,7 @@ - + diff --git a/TheGameExtreme/model/gameActions/classic/GameMode.cs b/TheGameExtreme/model/gameActions/classic/GameMode.cs index c0dcc4d..d04ff3b 100644 --- a/TheGameExtreme/model/gameActions/classic/GameMode.cs +++ b/TheGameExtreme/model/gameActions/classic/GameMode.cs @@ -46,25 +46,11 @@ namespace TheGameExtreme.model.gameActions.classic gameActions.Add(new JouerUneCarte(piles)); gameActions.Add(new TerminerSonTour(piles)); - createDeck(); + deck = new ClassicDeck(); defineNbMaxCard(nbPlayer); distribueCard(players); } - protected void createDeck() - { - switch (true) - { - case false: - deck = new ClassicDeck(); - break; - - default: - deck = new ExtremeDeck(); - break; - } - } - protected void defineNbMaxCard(int nbPlayer) { switch (nbPlayer) diff --git a/TheGameExtreme/view/GamePreparationPage.xaml b/TheGameExtreme/view/GamePreparationPage.xaml index 3a7aa28..55fee3b 100644 --- a/TheGameExtreme/view/GamePreparationPage.xaml +++ b/TheGameExtreme/view/GamePreparationPage.xaml @@ -11,8 +11,8 @@ - - + + @@ -35,26 +35,43 @@ - - + Grid.Column="0" + Margin="50,0,50,0"> + - + Grid.Column="1" + Margin="50,20,50,0"> - + + + + + + Grid.ColumnSpan="2">