Merge branch 'master' of https://gitlab.isima.fr/audorival/gomoku

src/GomokuGame.java

@@ -15,14 +15,17 @@ public class GomokuGame {
 
     private Player player1;
     private Player player2;
+    private Player currentPlayer;
 
     private GomokuBoard board;
 
     private GomokuRenderer renderer;
+    private boolean playRenderer= true;
 
     Color colorP1;
-    int currP;
-    int nbTokens1, nbTokens2;
+    int currentPlayerInt;
+
+    Coordinate cellCoor = null;
 
     public static void main(String[] args) {
         
@@ -83,37 +86,52 @@ public class GomokuGame {
         
     }
 
-    public void newGame(boolean bot, String name1, String name2) {
+    public void newGame(boolean bot, String name1, String name2, int tokens) {
         Color[] possible = { Color.WHITE, Color.BLACK };
         int rnd = new Random().nextInt(possible.length);
         Color colorPlayer1 = possible[rnd];
         Color colorPlayer2 = colorPlayer1.inverse();
 
-        this.player1 = new Human(name1, colorPlayer1);
+        this.player1 = new Human(name1, colorPlayer1, tokens);
 
         if (bot) {
-            this.player2 = new GomokuAI(name2, colorPlayer2);
+            this.player2 = new GomokuAI(name2, colorPlayer2, tokens);
 
         } else {
-            this.player2 = new Human(name2, colorPlayer2);
+            this.player2 = new Human(name2, colorPlayer2, tokens);
         }
 
         this.board = new GomokuBoard(15, 15);
         this.colorP1 = colorPlayer1;
-        this.currP = this.player1.color == Color.WHITE ? 1 : 2;
-        this.nbTokens1 = 60;
-        this.nbTokens2 = 60;
+        currentPlayer = this.player1.color == Color.WHITE ? this.player1: this.player2;
+        this.currentPlayerInt = this.player1.color == Color.WHITE ? 1 : 2;
+        this.renderer = new SwingRenderer();
 
     }
 
     public void startGame() {
-
+        /*
         GomokuCell actualPlayedCell = play(player1);
-        if( NB_CELL_PLAY >= board.countMax(board.countAlignedCells(actualPlayedCell)))
+        if( NB_CELL_PLAY <= board.countMax(board.countAlignedCells(actualPlayedCell)))
         {
            System.out.println("c'est gangée !");
         }
-        
+        */ 
+        while(this.player1.tokens > 0 || this.player2.tokens > 0){
+            GomokuCell currentPlay = null;
+            while (currentPlay == null) {
+                currentPlay = this.play(this.currentPlayer);
+            }
+
+            if( NB_CELL_PLAY <= board.countMax(board.countAlignedCells(currentPlay)))
+            {
+                this.renderer.updateStatus("Le joueur " + this.currentPlayer + "a gagné !");
+                return;
+            }
+            this.currentPlayer = this.nextPlayer();
+        }
+        this.renderer.updateStatus("Match nul, il ne reste plus de jeton.");
+        return;
     }
 
     /**
@@ -121,10 +139,30 @@ public class GomokuGame {
     * @param Player get player to play the cell.
     */
     public GomokuCell play(Player player) {
-
-        GomokuCell cellToPlay = player.chooseMove(board);
-        cellToPlay.setState(player.color);
+        GomokuCell cellToPlay = null;
+        if (this.playRenderer){ // If we play the game with the renderer.
+            while (this.cellCoor == null) {
+                try{
+                    wait(16); 
+                }
+                catch(InterruptedException e){
+                    this.save(null);
+                    System.out.println(e);
+                }
+            }
+            cellToPlay= this.board.get(this.cellCoor.x, this.cellCoor.y);
+            if (!cellToPlay.isPlayable()) { // If the cell is not playable we return null to not play.
+                return null;
+            }
+            cellToPlay.setState(player.color);
+            this.cellCoor = null;
+        }
+        else{
+            cellToPlay = player.chooseMove(board);
+            cellToPlay.setState(player.color);
+        }
         return cellToPlay;
+
     }
     
 
@@ -133,7 +171,7 @@ public class GomokuGame {
         // save the game state to the file
         // 1. Open the file
         // 2. Write the first line with:
-        // w h colorP1 currP nbTokens1 nbTokens2
+        // w h colorP1 currentPlayerInt nbTokens1 nbTokens2
         // 3. Write the next h lines with the board
         // 4. Close the file
         // 5. Return true if successful, false otherwise
@@ -149,21 +187,21 @@ public class GomokuGame {
                     this.getBoard().getWidth(),
                     this.getBoard().getHeight(),
                     colorP1,
-                    currP,
-                    nbTokens1,
-                    nbTokens2
+                    currentPlayerInt,
+                    this.player1.tokens,
+                    this.player2.tokens
                 ));
 
             // Write the board
             for (int i = 0; i < this.getBoard().getHeight(); ++i) {
                 for (int j = 0; j < this.getBoard().getWidth(); ++j) {
-                    char c = ' ';
+                    char c;
                     switch (board.get(i, j).getState()) {
                         case BLACK:
                             c = 'X';
                             break;
                         case WHITE:
-
+                            c = 'O';
                             break;
                         case NIL:
                             c = '.';
@@ -191,7 +229,7 @@ public class GomokuGame {
         // load the game state from the file
         // 1. Open the file
         // 2. Read the first line to get:
-        // w h colorP1 currP nbTokens1 nbTokens2
+        // w h colorP1 currentPlayerInt nbTokens1 nbTokens2
         // 3. Read the next h lines to get the board
         // 4. Close the file
         // 5. Initialize the board with the read values
@@ -212,9 +250,9 @@ public class GomokuGame {
             w = Integer.parseInt(parts[0]);
             h = Integer.parseInt(parts[1]);
             colorP1 = Color.valueOf(parts[2]);
-            currP = Integer.parseInt(parts[3]);
-            nbTokens1 = Integer.parseInt(parts[4]);
-            nbTokens2 = Integer.parseInt(parts[5]);
+            currentPlayerInt = Integer.parseInt(parts[3]);
+            this.player1.tokens = Integer.parseInt(parts[4]);
+            this.player2.tokens = Integer.parseInt(parts[5]);
 
             if (w <= 0 || h <= 0) {
                 throw new IllegalArgumentException("Invalid board dimensions");
@@ -269,6 +307,13 @@ public class GomokuGame {
         return true;
     }
 
+    private Player nextPlayer(){
+        if (this.currentPlayer == this.player1){
+            return this.player2;
+        }
+        return player1;
+    }
+
     public GomokuBoard getBoard() {
         return this.board;
     }