Refactoring.

Author: RUBIUS\chebanovdd

Assets/Plugins/Match3/App/Interfaces/IGameBoardRenderer.cs

@@ -8,7 +8,7 @@ public interface IGameBoardRenderer : IDisposable
     {
         bool IsPointerOnGrid(Vector3 worldPointerPosition, out GridPosition gridPosition);
         bool IsPointerOnBoard(Vector3 worldPointerPosition, out GridPosition gridPosition);
-        bool IsLockedSlot(GridPosition gridPosition);
+        bool IsInteractableSlot(GridPosition gridPosition);
 
         Vector3 GetWorldPosition(GridPosition gridPosition);
 

Assets/Plugins/Match3/App/Match3Game.cs

@@ -215,12 +215,8 @@ private bool IsPointerOnBoard(Vector2 pointerWorldPosition, out GridPosition slo
 
         private bool IsMovableSlot(GridPosition gridPosition)
         {
-            if (_gameBoardRenderer.IsLockedSlot(gridPosition))
-            {
-                return false;
-            }
-
-            return _gameBoard[gridPosition].State == GridSlotState.Occupied;
+            return _gameBoardRenderer.IsInteractableSlot(gridPosition) &&
+                   _gameBoard[gridPosition].State == GridSlotState.Occupied;
         }
 
         private bool IsSameSlot(GridPosition slotPosition)

Assets/Scripts/Common/GameBoardAgreements.cs

@@ -18,29 +18,19 @@ public bool IsBlocker(TileGroup tileGroup)
             return tileGroup == TileGroup.Ice;
         }
 
-        public bool IsLockedSlot(TileGroup tileGroup)
+        public bool IsInteractableSlot(TileGroup tileGroup)
         {
-            return tileGroup != TileGroup.Available;
+            return tileGroup == TileGroup.Available;
         }
 
         public bool IsMovableSlot(GridSlot<IUnityItem> gridSlot, TileGroup tileGroup)
         {
-            if (IsLockedSlot(tileGroup))
-            {
-                return false;
-            }
-
-            return gridSlot.State == GridSlotState.Occupied;
+            return IsInteractableSlot(tileGroup) && gridSlot.State == GridSlotState.Occupied;
         }
 
         public bool IsAvailableSlot(GridSlot<IUnityItem> gridSlot, TileGroup tileGroup)
         {
-            if (IsLockedSlot(tileGroup))
-            {
-                return false;
-            }
-
-            return gridSlot.State != GridSlotState.NotAvailable;
+            return IsInteractableSlot(tileGroup) && gridSlot.State != GridSlotState.NotAvailable;
         }
     }
 }

Assets/Scripts/Common/Interfaces/IGameBoardAgreements.cs

@@ -7,7 +7,7 @@ public interface IGameBoardAgreements
     {
         bool CanSetItem(GridSlot<IUnityItem> gridSlot, TileGroup tileGroup);
         bool IsBlocker(TileGroup tileGroup);
-        bool IsLockedSlot(TileGroup tileGroup);
+        bool IsInteractableSlot(TileGroup tileGroup);
         bool IsMovableSlot(GridSlot<IUnityItem> gridSlot, TileGroup tileGroup);
         bool IsAvailableSlot(GridSlot<IUnityItem> gridSlot, TileGroup tileGroup);
     }

Assets/Scripts/Common/UnityGameBoardRenderer.cs

@@ -69,9 +69,9 @@ public void DeactivateTile(GridPosition gridPosition)
             SetTile(gridPosition.RowIndex, gridPosition.ColumnIndex, TileGroup.Unavailable);
         }
 
-        public bool IsLockedSlot(GridPosition gridPosition)
+        public bool IsInteractableSlot(GridPosition gridPosition)
         {
-            return _gameBoardAgreements.IsLockedSlot(GetTileGroup(gridPosition));
+            return _gameBoardAgreements.IsInteractableSlot(GetTileGroup(gridPosition));
         }
 
         public bool IsPointerOnGrid(Vector3 worldPointerPosition, out GridPosition gridPosition)