From e584e3a9193de4d035f786f2e304888ea3266748 Mon Sep 17 00:00:00 2001
From: Malte Tammena <malte.tammena@gmx.de>
Date: Wed, 18 Oct 2017 23:35:26 +0200
Subject: [PATCH] Moved the method

---
 src/game/Game.java                  | 83 ++++++++++++++++++++++++++++-
 src/player/maurizio/MaurizioAI.java | 77 --------------------------
 2 files changed, 81 insertions(+), 79 deletions(-)

diff --git a/src/game/Game.java b/src/game/Game.java
index 6b84c57..d6da950 100644
--- a/src/game/Game.java
+++ b/src/game/Game.java
@@ -202,14 +202,14 @@ public class Game {
      * @return the state of the game, -1 = still undecided , 0 = draw, 1 = Player 1 wins, ...
      */
     private int checkState(boolean output) {
-        if(MaurizioAI.checkWin(this.board, p1.getID())){
+        if(checkWin(this.board, p1.getID())){
             this.gameOn = false;
             if(output){
                 System.out.println(p1.getP().getName() + " wins!");
             }
             return p1.getID(); // player 1 wins
         }
-        if(MaurizioAI.checkWin(this.board, p2.getID())){
+        if(checkWin(this.board, p2.getID())){
             this.gameOn = false;
             if(output){
                 System.out.println(p2.getP().getName() + " wins!");
@@ -276,4 +276,83 @@ public class Game {
         }
         System.out.println();
     }
+
+    public static boolean checkWin(int[][] board, int player){
+        int winLength = 4;
+        boolean win = false;
+        // check columns for win
+        for(int i=0;i<board.length;i++){
+            for(int j=0;j<(board[0].length-winLength+1);j++){
+                if(board[i][j] == player){
+                    win = true;
+                    for(int k=1;k<winLength;k++){
+                        if(board[i][j+k] != board[i][j]){
+                            win = false;
+                            break;
+                        }
+                    }
+                    if(win){
+                        return true;
+                    }
+                }
+            }
+        }
+
+        // check rows for win
+        for(int i=0;i<board[0].length;i++){
+            for(int j=0;j<(board.length-winLength+1);j++){
+                if(board[j][i] == player){
+                    win = true;
+                    for(int k=1;k<winLength;k++){
+                        if(board[j+k][i] != board[j][i]){
+                            win = false;
+                            break;
+                        }
+                    }
+                    if(win){
+                        return true;
+                    }
+                }
+            }
+        }
+
+        // check diagonals for win
+        //bottom-left to top-right diagonals
+        for(int i=0;i<(board.length-winLength+1);i++){
+            for(int j=(winLength-1);j<board[0].length;j++){
+                if(board[i][j] == player){
+                    win = true;
+                    for(int k=1;k<winLength;k++){
+                        if(board[i+k][j-k] != board[i][j]){
+                            win = false;
+                            break;
+                        }
+                    }
+                    if(win){
+                        return true;
+                    }
+                }
+            }
+        }
+
+        //top-left to bottom-right diagonals
+        for(int i=0;i<(board.length-winLength+1);i++){
+            for(int j=0;j<(board[0].length-winLength+1);j++){
+                if(board[i][j] == player){
+                    win = true;
+                    for(int k=1;k<winLength;k++){
+                        if(board[i+k][j+k] != board[i][j]){
+                            win = false;
+                            break;
+                        }
+                    }
+                    if(win){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
 }
diff --git a/src/player/maurizio/MaurizioAI.java b/src/player/maurizio/MaurizioAI.java
index a73ddce..c613e3a 100644
--- a/src/player/maurizio/MaurizioAI.java
+++ b/src/player/maurizio/MaurizioAI.java
@@ -27,83 +27,6 @@ public class MaurizioAI implements Player {
         return choice;
     }
 
-    public static boolean checkWin(int[][] board, int player){
-        int winLength = 4;
-        boolean win = false;
-        // check columns for win
-        for(int i=0;i<board.length;i++){
-            for(int j=0;j<(board[0].length-winLength+1);j++){
-                if(board[i][j] == player){
-                    win = true;
-                    for(int k=1;k<winLength;k++){
-                        if(board[i][j+k] != board[i][j]){
-                            win = false;
-                            break;
-                        }
-                    }
-                    if(win){
-                        return true;
-                    }
-                }
-            }
-        }
-
-        // check rows for win
-        for(int i=0;i<board[0].length;i++){
-            for(int j=0;j<(board.length-winLength+1);j++){
-                if(board[j][i] == player){
-                    win = true;
-                    for(int k=1;k<winLength;k++){
-                        if(board[j+k][i] != board[j][i]){
-                            win = false;
-                            break;
-                        }
-                    }
-                    if(win){
-                        return true;
-                    }
-                }
-            }
-        }
-
-        // check diagonals for win
-        //bottom-left to top-right diagonals
-        for(int i=0;i<(board.length-winLength+1);i++){
-            for(int j=(winLength-1);j<board[0].length;j++){
-                if(board[i][j] == player){
-                    win = true;
-                    for(int k=1;k<winLength;k++){
-                        if(board[i+k][j-k] != board[i][j]){
-                            win = false;
-                            break;
-                        }
-                    }
-                    if(win){
-                        return true;
-                    }
-                }
-            }
-        }
-
-        //top-left to bottom-right diagonals
-        for(int i=0;i<(board.length-winLength+1);i++){
-            for(int j=0;j<(board[0].length-winLength+1);j++){
-                if(board[i][j] == player){
-                    win = true;
-                    for(int k=1;k<winLength;k++){
-                        if(board[i+k][j+k] != board[i][j]){
-                            win = false;
-                            break;
-                        }
-                    }
-                    if(win){
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
 
     public String getName(){
         return this.name;