added reverse bool in checker.cs to do checking from right to left

robertoguazon · Nov 4, 2016 · 7bc66c3 · 7bc66c3
1 parent 487419b
commit 7bc66c3
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 13 deletions.
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/.vs/Project1_Borais-Francisco-Mabasa-Guazon/v14/.suo b/Project1_Borais-Francisco-Mabasa-Guazon/.vs/Project1_Borais-Francisco-Mabasa-Guazon/v14/.suo
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/prefabs/game/Grid.prefab b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/prefabs/game/Grid.prefab
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scenes/Game.unity b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scenes/Game.unity
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scripts/Checker.cs b/Project1_Borais-Francisco-Mabasa-Guazon/Assets/scripts/Checker.cs
@@ -12,6 +12,11 @@ public class Checker : MonoBehaviour {
     [SerializeField]
     private int[] checkerRows;
 
+    //EXPERIMENTAL
+    [SerializeField]
+    private bool reverse = false;
+    //END OF EXPERIMENTAL
+
     private Sprite _currentChipSprite;
 
     private int _currentRow;
@@ -39,6 +44,7 @@ public void Start() {
     public void CheckPlacedCells(Grid grid, List<GameObject> placedCells) {
 
         int orig = placedCells.Count;
+
         for (int i = 0; i < placedCells.Count; i++) {
             GameObject cellObject = placedCells[i];
             Cell cell = cellObject.GetComponent<Cell>();
@@ -68,25 +74,49 @@ public bool CheckCell(Grid grid, Cell cell) {
         {
 
             if ((checkerRow + cell.Row) >= grid.GetRows()) return false;
-            for (int checkerCol = 0; (checkerCol < checkerRows[checkerRow]); checkerCol++)
-            {
+
+            if (reverse) {
+                for (int checkerCol = checkerRows[checkerRow] - 1; (checkerCol >= 0); checkerCol--)
+                {
 
-                if ((checkerCol + cell.Col) >= grid.GetCols()) return false;
-                // Debug.Log("checker row,col (: " + checkerRow + ", " + checkerCol + ")");
+                    if ((cell.Col - checkerCol) < 0) return false;
+                    // Debug.Log("checker row,col (: " + checkerRow + ", " + checkerCol + ")");
 
 
-                GameObject cellObject = grid.GetCellAt(cell.Row + checkerRow, cell.Col + checkerCol);
-                Cell checkCell = cellObject.GetComponent<Cell>();
-                if (checkCell.isChecked()) return false;
+                    GameObject cellObject = grid.GetCellAt(cell.Row + checkerRow, cell.Col - checkerCol);
+                    Cell checkCell = cellObject.GetComponent<Cell>();
+                    if (checkCell.isChecked()) return false;
 
-                // Debug.Log("Final(" + (cell.Row + checkerRow) + ", " + (cell.Col + checkerCol) + ")");
-                if (_currentChipSprite != grid.GetChipSpriteAt(checkerRow + cell.Row, checkerCol + cell.Col))
-                {
-                    return false;
+                    // Debug.Log("Final(" + (cell.Row + checkerRow) + ", " + (cell.Col + checkerCol) + ")");
+                    if (_currentChipSprite != grid.GetChipSpriteAt(cell.Row + checkerRow, cell.Col - checkerCol))
+                    {
+                        return false;
+                    }
+
+                    vertices.Add(cellObject.transform.position);
+                    cellsToCheck.Add(checkCell);
                 }
+            } else {
+                for (int checkerCol = 0; (checkerCol < checkerRows[checkerRow]); checkerCol++)
+                {
+
+                    if ((checkerCol + cell.Col) >= grid.GetCols()) return false;
+                    // Debug.Log("checker row,col (: " + checkerRow + ", " + checkerCol + ")");
+
 
-                vertices.Add(cellObject.transform.position);
-                cellsToCheck.Add(checkCell);
+                    GameObject cellObject = grid.GetCellAt(cell.Row + checkerRow, cell.Col + checkerCol);
+                    Cell checkCell = cellObject.GetComponent<Cell>();
+                    if (checkCell.isChecked()) return false;
+
+                    // Debug.Log("Final(" + (cell.Row + checkerRow) + ", " + (cell.Col + checkerCol) + ")");
+                    if (_currentChipSprite != grid.GetChipSpriteAt(checkerRow + cell.Row, checkerCol + cell.Col))
+                    {
+                        return false;
+                    }
+
+                    vertices.Add(cellObject.transform.position);
+                    cellsToCheck.Add(checkCell);
+                }
             }
         }
 

diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/CurrentLayout.dwlt b/Project1_Borais-Francisco-Mabasa-Guazon/Library/CurrentLayout.dwlt
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/CurrentMaximizeLayout.dwlt b/Project1_Borais-Francisco-Mabasa-Guazon/Library/CurrentMaximizeLayout.dwlt
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/EditorUserBuildSettings.asset b/Project1_Borais-Francisco-Mabasa-Guazon/Library/EditorUserBuildSettings.asset
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/ScriptAssemblies/Assembly-CSharp.dll b/Project1_Borais-Francisco-Mabasa-Guazon/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Project1_Borais-Francisco-Mabasa-Guazon/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/assetDatabase3 b/Project1_Borais-Francisco-Mabasa-Guazon/Library/assetDatabase3
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/expandedItems b/Project1_Borais-Francisco-Mabasa-Guazon/Library/expandedItems
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/00/00000000000000004000000000000000 b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/00/00000000000000004000000000000000
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/00/00000000000000006100000000000000 b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/00/00000000000000006100000000000000
diff --git a/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/36/368eae74bf294954e8f436d3ea8a09bd b/Project1_Borais-Francisco-Mabasa-Guazon/Library/metadata/36/368eae74bf294954e8f436d3ea8a09bd