Added state property to grid slot.

Author: RUBIUS\chebanovdd

samples/Terminal.Match3/DependencyInjection.cs

@@ -37,16 +37,14 @@ private static GameConfig<ITerminalGridSlot> GetGameConfig(TerminalGameBoardRend
                 GameBoardDataProvider = gameBoardRenderer,
                 LevelGoalsProvider = new LevelGoalsProvider(),
                 ItemSwapper = new TerminalItemSwapper(gameBoardRenderer),
-                GameBoardSolver = GetGameBoardSolver(gameBoardRenderer),
+                GameBoardSolver = GetGameBoardSolver(),
                 SolvedSequencesConsumers = GetSolvedSequencesConsumers()
             };
         }
 
-        private static IGameBoardSolver<ITerminalGridSlot> GetGameBoardSolver(
-            ITerminalGameBoardRenderer gameBoardRenderer)
+        private static IGameBoardSolver<ITerminalGridSlot> GetGameBoardSolver()
         {
-            return new GameBoardSolver<ITerminalGridSlot>(GetSequenceDetectors(),
-                GetSpecialItemDetectors(gameBoardRenderer));
+            return new GameBoardSolver<ITerminalGridSlot>(GetSequenceDetectors(), GetSpecialItemDetectors());
         }
 
         private static ISequenceDetector<ITerminalGridSlot>[] GetSequenceDetectors()
@@ -58,12 +56,11 @@ private static ISequenceDetector<ITerminalGridSlot>[] GetSequenceDetectors()
             };
         }
 
-        private static ISpecialItemDetector<ITerminalGridSlot>[] GetSpecialItemDetectors(
-            ITerminalGameBoardRenderer gameBoardRenderer)
+        private static ISpecialItemDetector<ITerminalGridSlot>[] GetSpecialItemDetectors()
         {
             return new ISpecialItemDetector<ITerminalGridSlot>[]
             {
-                new LockedItemDetector(gameBoardRenderer)
+                new LockedItemDetector()
             };
         }
 

samples/Terminal.Match3/GridTiles/GridTile.cs

@@ -1,12 +1,11 @@
-using Terminal.Match3.Enums;
-using Terminal.Match3.Interfaces;
+using Terminal.Match3.Interfaces;
 
 namespace Terminal.Match3.GridTiles
 {
     public abstract class GridTile : IGridTile
     {
+        public abstract int GroupId { get; }
         public abstract bool IsLocked { get; }
         public abstract bool CanContainItem { get; }
-        public abstract TileGroup Group { get; }
     }
 }

samples/Terminal.Match3/GridTiles/States/AvailableState.cs

@@ -4,8 +4,8 @@ namespace Terminal.Match3.GridTiles.States
 {
     public class AvailableState : GridTile
     {
+        public override int GroupId => (int) TileGroup.Available;
         public override bool IsLocked => false;
         public override bool CanContainItem => true;
-        public override TileGroup Group => TileGroup.Available;
     }
 }

samples/Terminal.Match3/GridTiles/States/LockedState.cs

@@ -1,5 +1,5 @@
 using Terminal.Match3.Enums;
-using Terminal.Match3.Interfaces;
+using Match3.Core.Interfaces;
 
 namespace Terminal.Match3.GridTiles.States
 {
@@ -8,9 +8,9 @@ public class LockedState : GridTile, IStatefulSlot
         private bool _isLocked = true;
         private TileGroup _group = TileGroup.Locked;
 
+        public override int GroupId => (int) _group;
         public override bool IsLocked => _isLocked;
         public override bool CanContainItem => true;
-        public override TileGroup Group => _group;
 
         public bool NextState()
         {
@@ -19,5 +19,11 @@ public bool NextState()
 
             return false;
         }
+
+        public void ResetState()
+        {
+            _isLocked = true;
+            _group = TileGroup.Locked;
+        }
     }
 }

samples/Terminal.Match3/GridTiles/States/NotAvailableState.cs

@@ -4,8 +4,8 @@ namespace Terminal.Match3.GridTiles.States
 {
     public class NotAvailableState : GridTile
     {
+        public override int GroupId => (int) TileGroup.Unavailable;
         public override bool IsLocked => true;
         public override bool CanContainItem => false;
-        public override TileGroup Group => TileGroup.Unavailable;
     }
 }

samples/Terminal.Match3/Interfaces/IGridTile.cs

@@ -1,10 +1,8 @@
 using Match3.Core.Interfaces;
-using Terminal.Match3.Enums;
 
 namespace Terminal.Match3.Interfaces
 {
     public interface IGridTile : IGridSlotState
     {
-        TileGroup Group { get; }
     }
 }

samples/Terminal.Match3/Interfaces/ITerminalGameBoardRenderer.cs

@@ -1,6 +1,5 @@
 using Match3.Core.Structs;
 using Match3.Template.Interfaces;
-using Terminal.Match3.Enums;
 
 namespace Terminal.Match3.Interfaces
 {
@@ -14,7 +13,5 @@ public interface ITerminalGameBoardRenderer : IGameBoardRenderer
         void RedrawGameBoard();
 
         bool IsPositionOnBoard(GridPosition gridPosition);
-        TileGroup GetTileGroup(GridPosition gridPosition);
-        bool TrySetNextTileState(GridPosition gridPosition);
     }
 }

samples/Terminal.Match3/SpecialItemDetectors/LockedItemDetector.cs

@@ -7,28 +7,13 @@ namespace Terminal.Match3.SpecialItemDetectors
 {
     public class LockedItemDetector : ISpecialItemDetector<ITerminalGridSlot>
     {
-        private readonly ITerminalGameBoardRenderer _gameBoardRenderer;
-
-        public LockedItemDetector(ITerminalGameBoardRenderer gameBoardRenderer)
-        {
-            _gameBoardRenderer = gameBoardRenderer;
-        }
-
         public IEnumerable<ITerminalGridSlot> GetSpecialItemGridSlots(IGameBoard<ITerminalGridSlot> gameBoard,
             ITerminalGridSlot gridSlot)
         {
-            if (_gameBoardRenderer.GetTileGroup(gridSlot.GridPosition) != TileGroup.Locked)
+            if (gridSlot.State.GroupId == (int) TileGroup.Locked)
             {
-                yield break;
+                yield return gridSlot;
             }
-
-            var hasNextState = _gameBoardRenderer.TrySetNextTileState(gridSlot.GridPosition);
-            if (hasNextState)
-            {
-                yield break;
-            }
-
-            yield return gridSlot;
         }
     }
 }

samples/Terminal.Match3/TerminalGameBoardRenderer.cs

@@ -95,16 +95,6 @@ public void ActivateItem(GridPosition gridPosition)
             RedrawGameBoard();
         }
 
-        public TileGroup GetTileGroup(GridPosition gridPosition)
-        {
-            return _gridSlotTiles[gridPosition.RowIndex, gridPosition.ColumnIndex].Group;
-        }
-
-        public bool TrySetNextTileState(GridPosition gridPosition)
-        {
-            return ((IStatefulSlot) _gridSlotTiles[gridPosition.RowIndex, gridPosition.ColumnIndex]).NextState();
-        }
-
         public ITerminalGridSlot[,] GetGameBoardSlots(int level)
         {
             return _gameBoardSlots;

samples/Terminal.Match3/TerminalGridSlot.cs

@@ -8,23 +8,22 @@ namespace Terminal.Match3
 {
     public sealed class TerminalGridSlot : ITerminalGridSlot
     {
-        private readonly IGridSlotState _state;
-
         public TerminalGridSlot(IGridSlotState state, GridPosition gridPosition)
         {
-            _state = state;
+            State = state;
             GridPosition = gridPosition;
         }
 
         public int ItemId => Item.ContentId;
 
         public bool HasItem => Item != null;
-        public bool IsLocked => _state.IsLocked;
-        public bool CanContainItem => _state.CanContainItem;
+        public bool IsLocked => State.IsLocked;
+        public bool CanContainItem => State.CanContainItem;
         public bool IsMovable => IsLocked == false && HasItem;
         public bool CanSetItem => CanContainItem && HasItem == false;
 
         public ITerminalItem Item { get; private set; }
+        public IGridSlotState State { get; }
         public GridPosition GridPosition { get; }
 
         public void SetItem(ITerminalItem item)