Added state property to grid slot.

aurodev · Apr 21, 2022 · 2f21e51 · 2f21e51
1 parent 0cf66f9
commit 2f21e51
Show file tree

Hide file tree

Showing 32 changed files with 56 additions and 109 deletions.
diff --git a/samples/Terminal.Match3/DependencyInjection.cs b/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()
  };
  }
 

diff --git a/samples/Terminal.Match3/GridTiles/GridTile.cs b/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; }
  }
 }
diff --git a/samples/Terminal.Match3/GridTiles/States/AvailableState.cs b/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;
  }
 }
diff --git a/samples/Terminal.Match3/GridTiles/States/LockedState.cs b/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;
+ }
  }
 }
diff --git a/samples/Terminal.Match3/GridTiles/States/NotAvailableState.cs b/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;
  }
 }
diff --git a/samples/Terminal.Match3/Interfaces/IGridTile.cs b/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; }
  }
 }
diff --git a/samples/Terminal.Match3/Interfaces/ITerminalGameBoardRenderer.cs b/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);
  }
 }
diff --git a/samples/Terminal.Match3/SpecialItemDetectors/LockedItemDetector.cs b/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;
  }
  }
 }
diff --git a/samples/Terminal.Match3/TerminalGameBoardRenderer.cs b/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;

diff --git a/samples/Terminal.Match3/TerminalGridSlot.cs b/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)

diff --git a/samples/Unity.Match3/Assets/Scripts/AppContext.cs b/samples/Unity.Match3/Assets/Scripts/AppContext.cs
@@ -63,7 +63,7 @@ private UnityGame GetUnityGame()
  GameBoardDataProvider = _gameBoardRenderer,
  ItemSwapper = new AnimatedItemSwapper(),
  LevelGoalsProvider = new LevelGoalsProvider(),
- GameBoardSolver = GetGameBoardSolver(_gameBoardRenderer),
+ GameBoardSolver = GetGameBoardSolver(),
  SolvedSequencesConsumers = GetSolvedSequencesConsumers()
  };
 
@@ -75,9 +75,9 @@ private UnityItemGenerator GetItemGenerator()
  return new UnityItemGenerator(_itemPrefab, new GameObject("ItemsPool").transform);
  }
 
- private IGameBoardSolver<IUnityGridSlot> GetGameBoardSolver(IUnityGameBoardRenderer gameBoardRenderer)
+ private IGameBoardSolver<IUnityGridSlot> GetGameBoardSolver()
  {
- return new GameBoardSolver<IUnityGridSlot>(GetSequenceDetectors(), GetSpecialItemDetectors(gameBoardRenderer));
+ return new GameBoardSolver<IUnityGridSlot>(GetSequenceDetectors(), GetSpecialItemDetectors());
  }
 
  private ISequenceDetector<IUnityGridSlot>[] GetSequenceDetectors()
@@ -89,12 +89,12 @@ private ISequenceDetector<IUnityGridSlot>[] GetSequenceDetectors()
  };
  }
 
- private ISpecialItemDetector<IUnityGridSlot>[] GetSpecialItemDetectors(IUnityGameBoardRenderer gameBoardRenderer)
+ private ISpecialItemDetector<IUnityGridSlot>[] GetSpecialItemDetectors()
  {
  return new ISpecialItemDetector<IUnityGridSlot>[]
  {
- new StoneItemDetector(gameBoardRenderer),
- new IceItemDetector(gameBoardRenderer)
+ new StoneItemDetector(),
+ new IceItemDetector()
  };
  }
 

diff --git a/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/GridTile.cs b/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/GridTile.cs
@@ -1,4 +1,3 @@
-using Common.Enums;
 using Common.Interfaces;
 using UnityEngine;
 
@@ -8,9 +7,9 @@ public abstract class GridTile : MonoBehaviour, IGridTile
  {
  private bool _isDestroyed;
 
+ public abstract int GroupId { get; }
  public abstract bool IsLocked { get; }
  public abstract bool CanContainItem { get; }
- public abstract TileGroup Group { get; }
 
  public void SetActive(bool value)
  {

diff --git a/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/StatefulGridTile.cs b/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/StatefulGridTile.cs
@@ -1,4 +1,4 @@
-using Common.Interfaces;
+using Match3.Core.Interfaces;
 using UnityEngine;
 
 namespace Common.GridTiles

diff --git a/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/AvailableState.cs b/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/AvailableState.cs
@@ -4,8 +4,8 @@ namespace Common.GridTiles.States
 {
  public class AvailableState : SpriteGridTile
  {
+ public override int GroupId => (int) TileGroup.Available;
  public override bool IsLocked => false;
  public override bool CanContainItem => true;
- public override TileGroup Group => TileGroup.Available;
  }
 }
diff --git a/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/IceState.cs b/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/IceState.cs
@@ -7,9 +7,9 @@ public class IceState : StatefulGridTile
  private bool _isLocked = true;
  private TileGroup _group = TileGroup.Ice;
 
+ public override int GroupId => (int) _group;
  public override bool IsLocked => _isLocked;
  public override bool CanContainItem => true;
- public override TileGroup Group => _group;
 
  protected override void OnComplete()
  {

diff --git a/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/NotAvailableState.cs b/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/NotAvailableState.cs
@@ -4,8 +4,8 @@ namespace Common.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;
  }
 }
diff --git a/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/StoneState.cs b/samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/StoneState.cs
@@ -8,9 +8,9 @@ public class StoneState : StatefulGridTile
  private bool _canContainItem;
  private TileGroup _group = TileGroup.Stone;
 
+ public override int GroupId => (int) _group;
  public override bool IsLocked => _isLocked;
  public override bool CanContainItem => _canContainItem;
- public override TileGroup Group => _group;
 
  protected override void OnComplete()
  {

diff --git a/samples/Unity.Match3/Assets/Scripts/Common/Interfaces/IGridTile.cs b/samples/Unity.Match3/Assets/Scripts/Common/Interfaces/IGridTile.cs
@@ -1,14 +1,11 @@
 using System;
-using Common.Enums;
 using Match3.Core.Interfaces;
 using UnityEngine;
 
 namespace Common.Interfaces
 {
  public interface IGridTile : IGridSlotState, IDisposable
  {
- TileGroup Group { get; }
-
  void SetActive(bool value);
  void SetWorldPosition(Vector3 worldPosition);
  }

diff --git a/samples/Unity.Match3/Assets/Scripts/Common/Interfaces/IUnityGameBoardRenderer.cs b/samples/Unity.Match3/Assets/Scripts/Common/Interfaces/IUnityGameBoardRenderer.cs
@@ -18,7 +18,6 @@ public interface IUnityGameBoardRenderer : IGameBoardRenderer
 
  Vector3 GetWorldPosition(GridPosition gridPosition);
 
- bool TrySetNextTileState(GridPosition gridPosition);
  TileGroup GetTileGroup(GridPosition gridPosition);
  }
 }
diff --git a/samples/Unity.Match3/Assets/Scripts/Common/Interfaces/IUnityGridSlot.cs b/samples/Unity.Match3/Assets/Scripts/Common/Interfaces/IUnityGridSlot.cs
@@ -8,7 +8,6 @@ public interface IUnityGridSlot : IGridSlot
  bool NotAvailable { get; }
 
  IUnityItem Item { get; }
- IGridSlotState State { get; }
 
  void SetItem(IUnityItem item);
  void SetState(IGridSlotState state);

diff --git a/samples/Unity.Match3/Assets/Scripts/Common/SpecialItemDetectors/IceItemDetector.cs b/samples/Unity.Match3/Assets/Scripts/Common/SpecialItemDetectors/IceItemDetector.cs
@@ -7,28 +7,13 @@ namespace Common.SpecialItemDetectors
 {
  public class IceItemDetector : ISpecialItemDetector<IUnityGridSlot>
  {
- private readonly IUnityGameBoardRenderer _gameBoardRenderer;
-
- public IceItemDetector(IUnityGameBoardRenderer gameBoardRenderer)
- {
- _gameBoardRenderer = gameBoardRenderer;
- }
-
  public IEnumerable<IUnityGridSlot> GetSpecialItemGridSlots(IGameBoard<IUnityGridSlot> gameBoard,
  IUnityGridSlot gridSlot)
  {
- if (_gameBoardRenderer.GetTileGroup(gridSlot.GridPosition) != TileGroup.Ice)
+ if (gridSlot.State.GroupId == (int) TileGroup.Ice)
  {
- yield break;
+ yield return gridSlot;
  }
-
- var hasNextState = _gameBoardRenderer.TrySetNextTileState(gridSlot.GridPosition);
- if (hasNextState)
- {
- yield break;
- }
-
- yield return gridSlot;
  }
  }
 }