From 8331d16fe478cafb3f41e8e389181c386deb3e28 Mon Sep 17 00:00:00 2001
From: Benjamyn Love <benjamyn.love@gmail.com>
Date: Mon, 26 Feb 2024 15:08:34 +1100
Subject: [PATCH] Sync

---
 Pipfile                          |  11 ++++++
 __pycache__/main.cpython-310.pyc | Bin 0 -> 3123 bytes
 main.py                          |  65 +++++++++++++++++++++++++------
 test.py                          |  56 ++++++++++++++++++++++++++
 4 files changed, 120 insertions(+), 12 deletions(-)
 create mode 100644 Pipfile
 create mode 100644 __pycache__/main.cpython-310.pyc
 create mode 100644 test.py

diff --git a/Pipfile b/Pipfile
new file mode 100644
index 0000000..c398b0d
--- /dev/null
+++ b/Pipfile
@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3.10"
diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ba8b19ab3dde677d37dda09a4f4b2cea34c92d82
GIT binary patch
literal 3123
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

literal 0
HcmV?d00001

diff --git a/main.py b/main.py
index fd020b1..5fc5689 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 
 import time
+import sys
 import os
 
 class Game:
@@ -37,18 +38,54 @@ class Game:
             self.board[len(self.board) - 1][slot] = self.player
 
         self.player = 2 if self.player == 1 else 1
+    
+    def is_board_won(self):
+        def _verticle_win(board):
+            for x in range(7):
+                instances = [0,0]
+                for y in range(6):
+                    if board[y][x] == 1:
+                        instances[0] += 1
+                    elif board[y][x] == 2:
+                        instances[1] += 1
+                
+                if instances[0] == 4:
+                    return 1
+                elif instances[1] == 4:
+                    return 2
+                
+            return 0
 
-    def check_victory(self):
-        # Write logic to determine winner
-        for x in range(len(self.board)):
-            if any(self.board[x]):
-                for y in range(len(self.board[x])):
-                    if self.board[x][y] != 0:
-                        current_value = self.board[x][y]
-                        print(f"checking current value: {current_value}")
-                            
-                        pass
-        return False
+        def _horizontal_win(board):
+            for x in range(6):
+                for y in range(7):
+                    f = board[x][y]
+                    if board[x][y] != 0:
+                        try:
+                            if board[x][y + 1] == board[x][y] and board[x][y + 2] == board[x][y] and board[x][y + 3] == board[x][y]:
+                                return board[x][y]
+                        except IndexError:
+                            # We hit the bounds of the board so we don't care
+                            pass
+            return 0
+
+        def _diagonal_win(board):
+            return 0
+
+
+        
+        hor = _horizontal_win(self.board)
+        ver = _verticle_win(self.board)
+        diag = _diagonal_win(self.board)
+
+        if hor != 0:
+            return hor
+        if ver != 0:
+            return ver
+        if diag != 0:
+            return diag
+        
+        return 0
 
 
 if __name__ == '__main__':
@@ -57,7 +94,11 @@ if __name__ == '__main__':
 
     while playing is True:
         os.system('clear')
-        game.check_victory()
+        win = game.is_board_won()
+        if win != 0: 
+            print(f"Player {win} has won")
+            game.draw_board()
+            sys.exit()
         print(f"It is player {game.player}'s turn")
         game.draw_board()
         print('-------------')
diff --git a/test.py b/test.py
new file mode 100644
index 0000000..e0655e7
--- /dev/null
+++ b/test.py
@@ -0,0 +1,56 @@
+# board = [[0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0, 0, 1, 0, 0, 0, 0], [0, 0, 1, 0, 0, 0, 0], [0, 0, 1, 2, 0, 0, 0], [0, 2, 1, 2, 0, 0, 0]]
+board = [[0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 1], [1, 0, 0, 0, 0, 1, 2], [1, 0, 0, 0, 1, 2, 1], [1, 2, 2, 1, 2, 2, 2]]
+
+import main
+
+g = main.Game()
+g.board = board
+g.draw_board()
+
+
+def is_board_won(board):
+    def _verticle_win(board):
+        for x in range(7):
+            instances = [0,0]
+            for y in range(6):
+                if board[y][x] == 1:
+                    instances[0] += 1
+                elif board[y][x] == 2:
+                    instances[1] += 1
+            
+            if instances[0] == 4:
+                return 1
+            elif instances[1] == 4:
+                return 2
+            
+        return 0
+
+    def _horizontal_win(board):
+        for x in range(6):
+            for y in range(7):
+                f = board[x][y]
+                if board[x][y] != 0:
+                    try:
+                        if board[x][y + 1] == board[x][y] and board[x][y + 2] == board[x][y] and board[x][y + 3] == board[x][y]:
+                            return board[x][y]
+                    except IndexError:
+                        # We hit the bounds of the board so we don't care
+                        pass
+        return 0
+
+    def _diagonal_win(board):
+        return 0
+
+
+    hor = _horizontal_win(board)
+    ver = _verticle_win(board)
+    diag = _diagonal_win(board)
+
+    if hor != 0:
+        return hor
+    if ver != 0:
+        return ver
+    if diag != 0:
+        return diag
+
+is_board_won(board)