refactoring boosts

Assets/Scripts/BackgroundSetter.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;

Assets/Scripts/Board/BoardSolver.cs

@@ -3,14 +3,14 @@
 
 public class BoardSolver
 {
-    private BoostExicuter _boostExicuter;
+    private IBoostExicuter _boostExicuter;
     private SequenceSolver _sequenceSolver;
     private ISwapSolwer _regularSwapSolver;
     private ISwapSolwer _boostSwapSolver;
 
     public event UnityAction CountedSwapMaked;
 
-    public BoardSolver(Workers workers, ItemSwaper itemSwaper, BoostExicuter boostExicuter)
+    public BoardSolver(Workers workers, ItemSwaper itemSwaper, IBoostExicuter boostExicuter)
     {
         _boostExicuter = boostExicuter;
         _sequenceSolver = new(workers);

Assets/Scripts/Board/BoostSwapSolver.cs

@@ -3,10 +3,10 @@
 
 public class BoostSwapSolver : ISwapSolwer
 {
-    private BoostExicuter _boostExicuter;
+    private IBoostExicuter _boostExicuter;
     private UnityAction _swapCallback;
 
-    public BoostSwapSolver(BoostExicuter boostExicuter, UnityAction swapCallback)
+    public BoostSwapSolver(IBoostExicuter boostExicuter, UnityAction swapCallback)
     {
         _boostExicuter = boostExicuter;
         _swapCallback = swapCallback;

Assets/Scripts/Board/DiagonalBoardFaller.cs

@@ -1,6 +1,4 @@
 using Cysharp.Threading.Tasks;
-using System.Collections.Generic;
-using UnityEngine;
 
 public class DiagonalBoardFaller : IBoardFaller
 {

Assets/Scripts/Board/ISwapSolwer.cs

@@ -1,5 +1,4 @@
 using Cysharp.Threading.Tasks;
-using UnityEngine.Events;
 
 public interface ISwapSolwer
 {

Assets/Scripts/Board/MidleCellFinder.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
 
 public class MidleCellFinder

Assets/Scripts/Boost/BombBoostAction.cs

@@ -8,13 +8,13 @@ public class BombBoostAction : IBoostAction
     private const float BombRadius = 2f;
     private Board _board;
     private ItemNextStateMover _itemRemover;
-    private BoostExicuter _boostExicuter;
+    private IBoostExicuter _boostExicuter;
     private BoardClearer _boardClearer;
 
-    public BombBoostAction(Board board, ItemNextStateMover itemRemover, BoostExicuter boostExicuter)
+    public BombBoostAction(Board board,  IBoostExicuter boostExicuter)
     {
         _board = board;
-        _itemRemover = itemRemover;
+        _itemRemover = new();
         _boostExicuter = boostExicuter;
         _boardClearer = new(board);
     }

Assets/Scripts/Boost/BoostExicuter.cs

@@ -1,8 +1,14 @@
 using Cysharp.Threading.Tasks;
 
 
+public interface IBoostExicuter
+{
+    UniTask Execute(IBoostItem boostItem);
+    UniTask Execute(IItem item, ToolTypes toolTypes);
+}
+
 
-public class BoostExicuter
+public class BoostExicuter : IBoostExicuter
 {
     private IBoostAction _horisontal;
     private IBoostAction _vertical;
@@ -13,44 +19,46 @@ public class BoostExicuter
 
     private BoardClearer _boardClearer;
 
-    public BoostExicuter(ItemNextStateMover itemRemover, Board board, GoalCellOnBoardFinder goalItemFinder)
+    public BoostExicuter(Board board, GoalCellOnBoardFinder goalItemFinder)
     {
-        _horisontal = new HorizontalLineRemover(board, itemRemover, this);
-        _vertical = new VerticalLineRemover(board, itemRemover, this);
-        _bomb = new BombBoostAction(board, itemRemover, this);
-        _rainbow = new RainbowBoostAction(board, itemRemover, this);
-        _rocket = new RocketBoostAction(board, goalItemFinder, itemRemover, this);
-        _xlines = new XLineRemover(board, itemRemover, this);
+        _horisontal = new HorizontalLineRemover(board,  this);
+        _vertical = new VerticalLineRemover(board,  this);
+        _bomb = new BombBoostAction(board,  this);
+        _rainbow = new RainbowBoostAction(board,  this);
+        _rocket = new RocketBoostAction(board, goalItemFinder,  this);
+        _xlines = new XLineRemover(board,  this);
 
         _boardClearer = new(board);
     }
 
-    public async UniTask Execute(IItem item)
+    public async UniTask Execute(IBoostItem boostItem)
     {
-        if (item is IBoostItem boostItem)
+        if (boostItem.IsUsed == true)
+        {
+            return;
+        }
+
+        boostItem.IsUsed = true;
+
+        switch (boostItem.GetBoostType())
         {
-            switch (boostItem.GetBoostType())
-            {
-                case BoostTypes.None:
-                    break;
-                case BoostTypes.Bomb:
-                    await _bomb.Execute(boostItem);
-                    break;
-                case BoostTypes.Horizontal:
-                    await _horisontal.Execute(boostItem);
-                    break;
-                case BoostTypes.Vertical:
-                    await _vertical.Execute(boostItem);
-                    break;
-                case BoostTypes.Rainbow:
-                    await _rainbow.Execute(boostItem);
-                    break;
-                case BoostTypes.Rocket:
-                    await _rocket.Execute(boostItem);
-                    break;
-                default:
-                    break;
-            }
+            case BoostTypes.None:
+                break;
+            case BoostTypes.Bomb:
+                await _bomb.Execute(boostItem);
+                break;
+            case BoostTypes.Horizontal:
+                await _horisontal.Execute(boostItem);
+                break;
+            case BoostTypes.Vertical:
+                await _vertical.Execute(boostItem);
+                break;
+            case BoostTypes.Rainbow:
+                await _rainbow.Execute(boostItem);
+                break;
+            case BoostTypes.Rocket:
+                await _rocket.Execute(boostItem);
+                break;           
         }
 
         _boardClearer.ClearBordFromDeadItems();

Assets/Scripts/Boost/BoostInjector.cs

@@ -1,6 +1,5 @@
 using UnityEngine;
 using Zenject;
-using Cysharp.Threading.Tasks;
 
 
 public class BoostInjector : MonoBehaviour

Assets/Scripts/Boost/BoostItem.cs

@@ -4,17 +4,20 @@ public class BoostItem : Item, IBoostItem
 {
     private BoostTypes _type;
 
-    public IItem SwapWith { get; set; }
+    public bool IsUsed { get; set; }
 
     public event UnityAction<BoostTypes> SetedType;
 
     public event UnityAction<BoostTypes> LeavedBoostState;
 
-    public void SetBoostType(BoostTypes value)
+    public void Init(BoostTypes value)
     {
+        IsUsed = false;
         _type = value;
         SetedType?.Invoke(value);
     }
+
+
     public BoostTypes GetBoostType() => _type;
 
     protected override void OnStateChanged(ItemStateTypes old, ItemStateTypes @new)

Assets/Scripts/Boost/BoostLineRemoverBase.cs

@@ -8,10 +8,10 @@ public abstract class BoostLineRemoverBase : IBoostAction
     private ItemNextStateMover _itemNextStateMover;
     private BoardClearer _boardClearer;
 
-    protected BoostLineRemoverBase(Board board, ItemNextStateMover itemRemover)
+    protected BoostLineRemoverBase(Board board)
     {
         _board = board;
-        _itemNextStateMover = itemRemover;
+        _itemNextStateMover = new();
         _boardClearer = new(board);
     }
 

Assets/Scripts/Boost/BoostSelector.cs

@@ -1,9 +1,6 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using TMPro;
 using UnityEngine.Events;
-using System;
 
 public class BoostSelector : MonoBehaviour
 {

Assets/Scripts/Boost/RainbowBoostAction.cs

@@ -6,16 +6,15 @@ public class RainbowBoostAction : IBoostAction
 {
     private Board _board;
     private ItemNextStateMover _itemRemover;
-    private BoostExicuter _boostExicuter;
+    private IBoostExicuter _boostExicuter;
     private BoardClearer _boardClearer;
 
-    public RainbowBoostAction(Board board, ItemNextStateMover itemRemover, BoostExicuter boostExicuter)
+    public RainbowBoostAction(Board board, IBoostExicuter boostExicuter)
     {
         _board = board;
-        _itemRemover = itemRemover;
+        _itemRemover = new();
         _boostExicuter = boostExicuter;
         _boardClearer = new(board);
-
     }
 
     public async UniTask Execute(IItem item)

Assets/Scripts/Boost/RocketBoostAction.cs

@@ -5,18 +5,19 @@ public class RocketBoostAction : IBoostAction
     private Board _board;
     private GoalCellOnBoardFinder _goalItemFinder;
     private ItemNextStateMover _itemRemover;
-    private BoostExicuter _boostExicuter;
+    private IBoostExicuter _boostExicuter;
     private BoardClearer _boardClearer;
     private NeighbourRemover _neighbourRemover;
 
     private ICell _executedOnCell;
 
+
     public RocketBoostAction(Board board,
             GoalCellOnBoardFinder goalItemFinder,
-            ItemNextStateMover itemRemover, BoostExicuter boostExicuter)
+           IBoostExicuter boostExicuter)
     {
         _goalItemFinder = goalItemFinder;
-        _itemRemover = itemRemover;
+        _itemRemover = new();
         _boostExicuter = boostExicuter;
         _board = board;
         _boardClearer = new(board);

Assets/Scripts/Boost/XLineRemover.cs

@@ -2,9 +2,9 @@
 
 public class XLineRemover : BoostLineRemoverBase
 {
-    private BoostExicuter _boostExicuter;
+    private IBoostExicuter _boostExicuter;
 
-    public XLineRemover(Board board, ItemNextStateMover itemRemover, BoostExicuter boostExicuter) : base(board, itemRemover)
+    public XLineRemover(Board board,  IBoostExicuter boostExicuter) : base(board)
     {
         Directons = new GridPosition[] { GridPosition.Left, GridPosition.Right, GridPosition.Up, GridPosition.Down };
         _boostExicuter = boostExicuter;

Assets/Scripts/CameraPositioner.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using Zenject;
 

Assets/Scripts/Cell/Cell.cs

@@ -1,5 +1,4 @@
-using System;
-using UnityEngine;
+using UnityEngine;
 
 public class Cell : MonoBehaviour, ICell
 {

Assets/Scripts/CellSelector.cs

@@ -1,6 +1,4 @@
-using Cysharp.Threading.Tasks;
-using System;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.Events;
 
 public class CellSelector

Assets/Scripts/Code/BackToMainMenu.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class BackToMainMenu : MonoBehaviour

Assets/Scripts/Code/Bank/BankDefault.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 namespace Assets.Scripts.Code.Bank

Assets/Scripts/Code/Bank/Coins.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
 

Assets/Scripts/Code/Bank/Hearts.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using TMPro;
-using Unity.VisualScripting;
 using UnityEngine;
 
 namespace Assets.Scripts.Code.Bank

Assets/Scripts/Code/Bank/Stars.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
 

Assets/Scripts/Code/Camera/CameraStopZone.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class CameraStopZone : MonoBehaviour

Assets/Scripts/Code/Camera/CameraZone.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class CameraZone : MonoBehaviour

Assets/Scripts/Code/Cells/CellProfile.cs

@@ -1,7 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Profiling;
 using UnityEngine.UI;
 
 public delegate void SwitchProfileCell(CellProfile cell);

Assets/Scripts/Code/Cells/CellsProfileController.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.UI;
 
 public class CellsProfileController : MonoBehaviour
 {

Assets/Scripts/Code/DynamicMessage.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
 

Assets/Scripts/Code/History.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
 using UnityEngine.SceneManagement;

Assets/Scripts/Code/Player/PlayerBehaviour.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.AI;
 

Assets/Scripts/Code/Player/PlayerNotificationPlay.cs

@@ -1,4 +1,3 @@
-using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine;

Assets/Scripts/Code/Player/PseudorandomPoints.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class PseudorandomPoints : MonoBehaviour

Assets/Scripts/Code/ProfilePanel.cs

@@ -1,9 +1,5 @@
-using Assets.Scripts.Code.UI;
-using System.Collections;
-using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
-using UnityEngine.UI;
 
 public class ProfilePanel : MonoBehaviour
 {