improved the remove matches from board algorithm so it does not take …

…too much time
ninetailsrabbit · Jun 7, 2024 · 6b328a6 · 6b328a6
1 parent a3b17ed
commit 6b328a6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Match3Maker/src/components/Board.cs b/Match3Maker/src/components/Board.cs
@@ -435,9 +435,15 @@ public void RemoveMatchesFromBoard() {
 
             while (sequences.Count > 0) {
                 foreach (Sequence sequence in sequences) {
+                    var cellsToChange = sequence.Cells.Take((sequence.Cells.Count / 3) + 1);
+                    var pieceTypesToChange = cellsToChange.Select(cell => cell.Piece.Type);
 
-                    foreach (GridCell currentCell in sequence.Cells) {
-                        var availablePieces = AvailablePieces.Where(piece => !piece.Type.Shape.Equals(currentCell.Piece.Type.Shape)).ToList();
+                    var availablePieces = AvailablePieces.Where(piece => {
+                        return !pieceTypesToChange.Contains(piece.Type)
+                        && !pieceTypesToChange.Select(pieceType => pieceType.Shape).Contains(piece.Type.Shape);
+                    }).ToList();
+
+                    foreach (GridCell currentCell in cellsToChange) {
                         var newPiece = PieceGenerator.Roll(availablePieces, [currentCell.Piece.Type.GetType()]);
 
                         if (newPiece is not null) {