Added NotAvailable property to grid slot.

Author: ChebanovDD

Assets/Plugins/Match3/Core/Models/GridSlot.cs

@@ -9,6 +9,7 @@ public class GridSlot<TItem> where TItem : IItem
         public bool HasItem => Item != null;
         public bool IsMovable => State.IsLocked == false && HasItem;
         public bool CanSetItem => State.CanContainItem && HasItem == false;
+        public bool NotAvailable => State.CanContainItem == false || State.IsLocked;
 
         public TItem Item { get; private set; }
         public IGridSlotState State { get; }
@@ -27,11 +28,6 @@ public void SetItem(TItem item)
             Item = item;
         }
 
-        public IGridSlotState GetState()
-        {
-            return State;
-        }
-
         public void Clear()
         {
             if (State.CanContainItem == false)

Assets/Scripts/Common/GridSlotStates.meta

@@ -44,7 +44,7 @@ private int GetMaxRowLength(IGameBoard<IUnityItem> gameBoard)
 
                 for (var columnIndex = 0; columnIndex < gameBoard.ColumnCount; columnIndex++)
                 {
-                    if (gameBoard[rowIndex, columnIndex].CanSetItem)
+                    if (gameBoard[rowIndex, columnIndex].State.CanContainItem)
                     {
                         availableSlots++;
                         continue;

Assets/Scripts/Common/LevelGoals/CollectRowMaxItems.cs

@@ -69,7 +69,7 @@ private List<ItemMoveData> GetItemsMoveData(IGameBoard<IUnityItem> gameBoard, in
             for (var rowIndex = gameBoard.RowCount - 1; rowIndex >= 0; rowIndex--)
             {
                 var gridSlot = gameBoard[rowIndex, columnIndex];
-                if (gridSlot.HasItem == false || gridSlot.IsMovable == false)
+                if (gridSlot.IsMovable == false)
                 {
                     continue;
                 }
@@ -131,7 +131,7 @@ private GridPosition GetItemGeneratorPosition(IGameBoard<IUnityItem> gameBoard,
             while (rowIndex >= 0)
             {
                 var gridSlot = gameBoard[rowIndex, columnIndex];
-                if (gridSlot.State.IsLocked || gridSlot.State.CanContainItem == false)
+                if (gridSlot.NotAvailable)
                 {
                     return new GridPosition(rowIndex, columnIndex);
                 }

Assets/Scripts/FillStrategies/FallDownFillStrategy.cs

@@ -170,7 +170,7 @@ private List<ItemMoveData> GetColumnItemsMoveData(IGameBoard<IUnityItem> gameBoa
         private ItemMoveData GetItemMoveData(IGameBoard<IUnityItem> gameBoard, int rowIndex, int columnIndex)
         {
             var gridSlot = gameBoard[rowIndex, columnIndex];
-            if (gridSlot.HasItem == false || gridSlot.IsMovable == false)
+            if (gridSlot.IsMovable == false)
             {
                 return null;
             }
@@ -198,7 +198,7 @@ private bool CanDropFromTop(IGameBoard<IUnityItem> gameBoard, int rowIndex, int
             while (rowIndex >= 0)
             {
                 var gridSlot = gameBoard[rowIndex, columnIndex];
-                if (gridSlot.State.IsLocked || gridSlot.State.CanContainItem == false)
+                if (gridSlot.NotAvailable)
                 {
                     return false;
                 }
@@ -241,7 +241,7 @@ private bool CanDropDiagonally(IGameBoard<IUnityItem> gameBoard, GridSlot<IUnity
             GridPosition direction, out GridPosition gridPosition)
         {
             var sideGridSlot = gameBoard.GetSideGridSlot(gridSlot, direction);
-            if (sideGridSlot != null && (sideGridSlot.State.IsLocked || sideGridSlot.State.CanContainItem == false))
+            if (sideGridSlot is { NotAvailable: true })
             {
                 return gameBoard.CanMoveDown(sideGridSlot, out gridPosition);
             }