From 07a93069e24506c4cbbd4baf1ec3eb4c4e4b6107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= <remi.lavergne@etu.uca.fr>
Date: Thu, 16 May 2024 00:56:28 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Am=C3=A9lioration=20des=20visibilit?=
 =?UTF-8?q?=C3=A9s=20et=20factorisation/traduction=20suppl=C3=A9mentaire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/Trek-12/Models/Game/Game.cs | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/source/Trek-12/Models/Game/Game.cs b/source/Trek-12/Models/Game/Game.cs
index 8ee26f4..7fc24c2 100644
--- a/source/Trek-12/Models/Game/Game.cs
+++ b/source/Trek-12/Models/Game/Game.cs
@@ -8,16 +8,16 @@ namespace Models.Game
 {
     public class Game
     {
-        public Player CurrentPlayer { get; set; }
+        public Player CurrentPlayer { get; private set; }
 
-        private Map UsedMap { get; set; }
+        public Map UsedMap { get; private set; }
 
-        private Dice Dice1 {  get; set; }
-        private Dice Dice2 {  get; set; }
+        private Dice Dice1 { get; }
+        private Dice Dice2 { get; }
 
         private int Turn { get; set; }
 
-        private Rules.Rules Rules { get; set; }
+        private Rules.Rules GameRules { get; }
 
 
         public Game(Player player,Map map)
@@ -27,10 +27,10 @@ namespace Models.Game
             Dice1 = new Dice();
             Dice2 = new Dice(1);
             Turn = 0;
-            Rules = new Rules.Rules();
+            GameRules = new Rules.Rules();
         }
 
-        public void ThrowDice()
+        public void RollAllDice()
         {
             Dice1.Lancer();
             Dice2.Lancer();
@@ -54,6 +54,7 @@ namespace Models.Game
 
                 case Operation.MULTIPLICATION:
                     return Dice2.Nb * Dice1.Nb;
+                
                 default:
                     return 0;
             }
@@ -61,17 +62,10 @@ namespace Models.Game
 
         public void PlaceResult (Cell playerChoice,int result)
         {
-            if (Turn == 1) 
+            if (Turn == 1 || GameRules.NearCell(playerChoice, UsedMap.Cells))
             {
                 playerChoice.Value = result;
             }
-            else
-            {
-                if(Rules.NearCell(playerChoice,UsedMap.Cells))
-                {
-                    playerChoice.Value = result;
-                }
-            }
         }
 
         public void AddRopeZone(Cell playerChoice,RopesZones list)