From 581e73b2219fa4347661d247423612bb3993e3f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= <remi.lavergne@etu.uca.fr>
Date: Wed, 15 May 2024 16:53:06 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Usage=20d'op=C3=A9rateurs=20ternair?=
 =?UTF-8?q?es=20(et=20traduction=20de=20variables)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/Trek-12/Models/Game/Game.cs | 46 +++++++++++-------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/source/Trek-12/Models/Game/Game.cs b/source/Trek-12/Models/Game/Game.cs
index fe00778..6f0e93e 100644
--- a/source/Trek-12/Models/Game/Game.cs
+++ b/source/Trek-12/Models/Game/Game.cs
@@ -10,10 +10,10 @@ namespace Models.Game
     {
         public Player CurentPlayer { get; set; }
 
-        public Map NameMap { get; set; }
+        public Map UsedMap { get; set; }
 
-        public De De1 {  get; set; }
-        public De De2 {  get; set; }
+        public De Dice1 {  get; set; }
+        public De Dice2 {  get; set; }
 
         public int Turn { get; set; }
 
@@ -22,18 +22,18 @@ namespace Models.Game
 
         public Game(Player player,Map map)
         {
-            NameMap = map;
+            UsedMap = map;
             CurentPlayer = player;
-            De1 = new De();
-            De2 = new De(1);
+            Dice1 = new De();
+            Dice2 = new De(1);
             Turn = 0;
             rules = new Rules.Rules();
         }
 
         public void ThrowDice()
         {
-            De1.Lancer();
-            De2.Lancer();
+            Dice1.Lancer();
+            Dice2.Lancer();
         }
 
         public int ResultOperation(Operation o)
@@ -41,31 +41,19 @@ namespace Models.Game
             switch (o)
             {
                 case Operation.LOWER:
-                    if (De1.IsLower(De2))
-                    {
-                        return De1.Nb;
-                    }
-                    return De2.Nb;
+                    return Dice1.IsLower(Dice2) ? Dice1.Nb : Dice2.Nb;
 
                 case Operation.HIGHER:
-                    if (De1.IsLower(De2))
-                    {
-                        return De2.Nb;
-                    }
-                    return De1.Nb;
+                    return Dice1.IsLower(Dice2) ? Dice2.Nb : Dice1.Nb;
 
                 case Operation.SUBTRACTION:
-                    if (De1.IsLower(De2))
-                    {
-                        return De2.Nb - De1.Nb;
-                    }
-                    return De1.Nb - De2.Nb; 
+                    return Dice1.IsLower(Dice2) ? Dice2.Nb - Dice1.Nb : Dice1.Nb - Dice2.Nb;
 
                 case Operation.ADDITION:
-                    return De2.Nb + De1.Nb;
+                    return Dice2.Nb + Dice1.Nb;
 
                 case Operation.MULTIPLICATION:
-                    return De2.Nb * De1.Nb;
+                    return Dice2.Nb * Dice1.Nb;
                 default:
                     return 0;
             }
@@ -77,12 +65,12 @@ namespace Models.Game
             {
                 playerChoice.Value = result;
             }
-            else
-            {
-                if(rules.NearCell(playerChoice,NameMap.Cells))
+            else
+            {
+                if(rules.NearCell(playerChoice,UsedMap.Cells))
                 {
                     playerChoice.Value = result;
-                }
+                }
             }
             return;
         }