win function edit, and highlight winning move on client

Author: Joe O'Regan

src/com/sock/connect5_txt_v2/Board.java

@@ -13,45 +13,45 @@ public void setBoard(int[][] board) {
 
 	public Board(int rows, int cols) {
 		this.board = new int[rows][cols];
-		
-		init();	// Initialise the board with all 0's after creating
+		init(); // Initialise the board with all 0's after creating
 	}
-	
+
 	public void init() {
 		for (int row = 0; row < Game.ROWS; row++) {
 			for (int col = 0; col < Game.COLS; col++) {
 				this.board[row][col] = 0;
 			}
 		}
 	}
-	
+
 	public void setCol(int col, int type) {
 		for (int i = Game.ROWS - 1; i >= 0; i--) {
 			if (board[i][col] == 0) {
 				board[i][col] = type;
+				draw();
 				break;
 			}
 		}
 	}
-	
+
 	public boolean checkCol(int col, int type) {
 		System.out.println("Checking Column: " + col + " for Player " + type);
 		if (topRowFull(col)) {
 			return false;
 		}
-		
+
 		return true;
 	}
-	
+
 	public boolean topRowFull(int col) {
 		if (board[0][col] != 0) { // if top row is not 0, col is full
 			System.out.println("\nERROR: Column " + col + " is full\n");
 			return true;
 		}
-		
+
 		return false;
 	}
-	
+
 	public boolean full() {
 		for (int row = 0; row < Game.ROWS; row++) {
 			for (int col = 0; col < Game.COLS; col++) {
@@ -62,7 +62,7 @@ public boolean full() {
 
 		return true;
 	}
-	
+
 	public void draw() {
 		System.out.println();
 
@@ -79,81 +79,58 @@ public void draw() {
 			System.out.println();
 		}
 	}
-	
-	public void showWin(int[] fiveInARow) {
-		for (int i = 0; i < 10; i += 2) {
-			board[fiveInARow[i]][fiveInARow[i + 1]] = 3; // Highlight winning line
-		}
 
-		System.out.println("Winning Move");
-		
-		draw();
-	}
-	
 	public boolean win() {
-		boolean gameOver = false;
-		int[] fiveInARow = new int[10];
-
-		for (int row = 0; row <= Game.ROWS - Game.CONNECT; row++) {
+		for (int r = 0; r <= Game.ROWS - Game.CONNECT; r++) {
 			// Diagonal /
-			for (int col = Game.CONNECT - 1; col < Game.COLS; col++) {
-				if (board[row][col] != 0 
-						&& board[row + 1][col - 1] == board[row][col]
-						&& board[row + 2][col - 2] == board[row][col] 
-						&& board[row + 3][col - 3] == board[row][col]
-						&& board[row + 4][col - 4] == board[row][col]) {
-					gameOver = true;
-					fiveInARow = new int[] { row, col, row + 1, col - 1, row + 2, col - 2, row + 3, col - 3, row + 4, col - 4 };
-					break;
+			for (int c = Game.CONNECT - 1; c < Game.COLS; c++) {
+				if (winningLine(new int[] { r, c, r + 1, c - 1, r + 2, c - 2, r + 3, c - 3, r + 4, c - 4 })) {
+					return true;
 				}
 			}
 
 			// Diagonal \
 			for (int col = 0; col <= Game.COLS - Game.CONNECT; col++) {
-				if (board[row][col] != 0 
-						&& board[row + 1][col + 1] == board[row][col]
-						&& board[row + 2][col + 2] == board[row][col] 
-						&& board[row + 3][col + 3] == board[row][col]
-						&& board[row + 4][col + 4] == board[row][col]) {
-					gameOver = true;
-					fiveInARow = new int[] { row, col, row + 1, col + 1, row + 2, col + 2, row + 3, col + 3, row + 4, col + 4 };
-					break;
+				if (winningLine(new int[] { r, col, r + 1, col + 1, r + 2, col + 2, r + 3, col + 3, r + 4, col + 4 })) {
+					return true;
 				}
 			}
 		}
 
 		// Check Rows
 		for (int row = 0; row < Game.ROWS; row++) {
 			for (int col = 0; col <= Game.COLS - Game.CONNECT; col++) {
-				if (board[row][col] != 0 
-						&& board[row][col + 1] == board[row][col]
-						&& board[row][col + 2] == board[row][col] 
-						&& board[row][col + 3] == board[row][col]
-						&& board[row][col + 4] == board[row][col]) {
-					gameOver = true;
-					fiveInARow = new int[] { row, col, row, col + 1, row, col + 2, row, col + 3, row, col + 4 };
-					break;
+				if (winningLine(new int[] { row, col, row, col + 1, row, col + 2, row, col + 3, row, col + 4 })) {
+					return true;
 				}
 			}
 		}
 
 		// Check Columns
 		for (int row = 0; row <= Game.ROWS - Game.CONNECT; row++) {
 			for (int col = 0; col < Game.COLS; col++) {
-				if (board[row][col] != 0 && board[row + 1][col] == board[row][col]
-						&& board[row + 2][col] == board[row][col] && board[row + 3][col] == board[row][col]
-						&& board[row + 4][col] == board[row][col]) {
-					gameOver = true;
-					fiveInARow = new int[] { row, col, row + 1, col, row + 2, col, row + 3, col, row + 4, col };
-					break;
+				if (winningLine(new int[] { row, col, row + 1, col, row + 2, col, row + 3, col, row + 4, col })) {
+					return true;
 				}
 			}
 		}
 
-		if (gameOver) {
-			showWin(fiveInARow);
+		return false;
+	}
+
+	private boolean winningLine(int[] b) {
+		if (board[b[0]][b[1]] != 0 && board[b[2]][b[3]] == board[b[0]][b[1]] && board[b[4]][b[5]] == board[b[0]][b[1]]
+				&& board[b[6]][b[7]] == board[b[0]][b[1]] && board[b[8]][b[9]] == board[b[0]][b[1]]) {
+			for (int i = 0; i < 10; i += 2) {
+				board[b[i]][b[i + 1]] = 3; // Highlight winning line
+			}
+
+			System.out.println("Winning Move");
+			draw();
+
+			return true;
 		}
 
-		return gameOver;
+		return false;
 	}
 }

src/com/sock/connect5_txt_v2/Connect5Client.java

@@ -14,7 +14,7 @@
 public class Connect5Client {
 	private Board board = new Board(Game.ROWS, Game.COLS);
 	private Scanner sc = new Scanner(System.in);
-	private int playerIcon, opponentIcon, validMove = 0;
+	private int playerIcon, opponentIcon, validMove = 0, player;
 	private static int PORT = 8000;
 	private Socket socket;
 	private BufferedReader in;
@@ -34,39 +34,43 @@ public void play() throws Exception {
 			response = in.readLine();
 
 			if (response.startsWith("WELCOME")) {
-				int mark = Integer.parseInt(String.valueOf(response.charAt(8))); // Return PLAYER_1 or PLAYER_2
-				playerIcon = (Integer.parseInt(String.valueOf(mark)) == Game.PLAYER_1) ? Game.PLAYER_1 : Game.PLAYER_2;
+				player = Integer.parseInt(String.valueOf(response.charAt(8))); // Return PLAYER_1 or PLAYER_2
+				playerIcon = (Integer.parseInt(String.valueOf(player)) == Game.PLAYER_1) ? Game.PLAYER_1
+						: Game.PLAYER_2;
 				opponentIcon = (playerIcon == Game.PLAYER_1) ? Game.PLAYER_2 : Game.PLAYER_1; // opposite of player
-				System.out.println("Connect 5 - Player " + mark);
+				System.out.println("Connect 5 - Player " + player);
 			}
 
 			while (true) {
 				response = in.readLine();
-
+				 				
 				if (response.startsWith("VALID_MOVE")) {
-					board.setCol(validMove, playerIcon);
-					board.draw();
-					System.out.println("Valid move, please wait");
+				    //System.out.flush();
+				    //Runtime.getRuntime().exec("cls");
+					board.setCol(validMove, playerIcon);	// Player moves
+					System.out.println("\nValid move, please wait");
 				} else if (response.startsWith("OPPONENT_MOVED")) {
+				    //System.out.flush();
+				    //Runtime.getRuntime().exec("cls");
 					int loc = Integer.parseInt(response.substring(15));
-					board.setCol(loc, opponentIcon);
-					board.draw();
-					System.out.println("Opponent moved, your turn");
+					board.setCol(loc, opponentIcon);	// Opponent moves
+					System.out.println("\nPlayer " + ((player == 1) ? Game.PLAYER_2 : Game.PLAYER_1) + " Moved");
 				} else if (response.startsWith("VICTORY")) {
 					System.out.println("You win");
+					board.win();
 					break;
 				} else if (response.startsWith("DEFEAT")) {
 					System.out.println("You lose");
+					board.win();
 					break;
 				} else if (response.startsWith("TIE")) {
-					System.out.println("You tied");
 					break;
 				} else if (response.startsWith("MESSAGE")) {
 					System.out.println(response.substring(8));
 				}
 
 				if (response.startsWith("CONTINUE") || response.toLowerCase().contains("your move")
-						|| response.toLowerCase().contains("?")) { // player move, or returned invalid move
+						|| response.toLowerCase().contains("?")) { // start game, player move, or returned invalid move
 					playerMove();
 				}
 			}
@@ -79,7 +83,7 @@ public void play() throws Exception {
 
 	private void playerMove() {
 		board.draw();
-		System.out.print("Select a column (0 - 8): ");
+		System.out.print("\nSelect a column (0 - 8): ");
 		int move = sc.nextInt();
 		validMove = move;
 		out.println("MOVE " + (move));