♻️: add GetScore for bot moves

Sierra-KPI · Nov 3, 2021 · f11db9a · f11db9a
1 parent 8f5191d
commit f11db9a
Showing 1 changed file with 32 additions and 11 deletions.
diff --git a/Quoridor.Model/Player/MinimaxAlgorithm.cs b/Quoridor.Model/Player/MinimaxAlgorithm.cs
@@ -31,9 +31,7 @@ public MinimaxAlgorithm(QuoridorGame game)
                     continue;
                 }
 
-                int score = Minimax(Depth, int.MinValue, int.MaxValue, false);
-
-                _game.UnplaceWall(wall);
+                int score = GetWallScore(wall);
 
                 if (score >= bestScore)
                 {
@@ -45,10 +43,7 @@ public MinimaxAlgorithm(QuoridorGame game)
 
             foreach (Cell move in moves)
             {
-                var beforeMove = _game.CurrentPlayer.CurrentCell;
-                _game.MakeMove(move);
-                int score = Minimax(Depth, int.MinValue, int.MaxValue, false);
-                _game.UnmakeMove(beforeMove);
+                int score = GetMoveScore(move);
 
                 if (score >= bestScore)
                 {
@@ -60,10 +55,7 @@ public MinimaxAlgorithm(QuoridorGame game)
 
             foreach (Cell jump in jumps)
             {
-                var beforeMove = _game.CurrentPlayer.CurrentCell;
-                _game.MakeMove(jump, true);
-                int score = Minimax(Depth, int.MinValue, int.MaxValue, false);
-                _game.UnmakeMove(beforeMove);
+                int score = GetJumpScore(jump);
 
                 if (score >= bestScore)
                 {
@@ -76,6 +68,35 @@ public MinimaxAlgorithm(QuoridorGame game)
             return (command, step);
         }
 
+        private int GetWallScore(Wall wall)
+        {
+            int score = Minimax(Depth, int.MinValue, int.MaxValue, false);
+
+            _game.UnplaceWall(wall);
+
+            return score;
+        }
+
+        private int GetMoveScore(Cell move)
+        {
+            var beforeMove = _game.CurrentPlayer.CurrentCell;
+            _game.MakeMove(move);
+            int score = Minimax(Depth, int.MinValue, int.MaxValue, false);
+            _game.UnmakeMove(beforeMove);
+
+            return score;
+        }
+
+        private int GetJumpScore(Cell jump)
+        {
+            var beforeMove = _game.CurrentPlayer.CurrentCell;
+            _game.MakeMove(jump, true);
+            int score = Minimax(Depth, int.MinValue, int.MaxValue, false);
+            _game.UnmakeMove(beforeMove);
+
+            return score;
+        }
+
         private int Sev(bool maximizingPlayer)
         {
             (int pathLenPlayer1, int pathLenPlayer2) = GetPlayersPathes();