From 6edfd9266a9e99916450af4b2d5df2fda818fbbc Mon Sep 17 00:00:00 2001
From: Nathan Woodburn <github@nathan.woodburn.au>
Date: Tue, 9 May 2023 13:37:38 +1000
Subject: [PATCH] game: fixed AI can't play and freezes game bug

---
 src/comp1110/ass2/Player.java   |  7 +++++-
 src/comp1110/ass2/gui/Game.java | 44 ++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/comp1110/ass2/Player.java b/src/comp1110/ass2/Player.java
index d759dcb..f77cf4a 100644
--- a/src/comp1110/ass2/Player.java
+++ b/src/comp1110/ass2/Player.java
@@ -385,9 +385,13 @@ public class Player {
     /**
      * Do a calculated move
      */
-    public void doAIMove(State state){
+    public Boolean doAIMove(State state){
 
         String bestMove = createAIMove(state);
+        if (bestMove.equals("")){
+            System.out.println("No AI moves");
+            return false;
+        }
         char pieceType = bestMove.charAt(0);
         String coordStr = bestMove.substring(2);
         int y = Integer.parseInt(coordStr.split(",")[0]);
@@ -396,6 +400,7 @@ public class Player {
         lastMove = coord;
         state.placePiece(coord, pieceType);
         state.nextPlayer();
+        return true;
     }
 
     /**
diff --git a/src/comp1110/ass2/gui/Game.java b/src/comp1110/ass2/gui/Game.java
index fb286a0..77d303f 100644
--- a/src/comp1110/ass2/gui/Game.java
+++ b/src/comp1110/ass2/gui/Game.java
@@ -269,19 +269,23 @@ public class Game extends Application {
      * Do a full AI game. This is good to visualize the AI
      */
     void AIGame(){
-        while (!currentGame.isPhaseOver()){
-            currentGame.getCurrentPlayer().doAIMove(currentGame);
+        while (!game_over){
+            if (!currentGame.getCurrentPlayer().doAIMove(currentGame)){
+                currentGame.nextPlayer();
+            }
+            if (currentGame.isPhaseOver()){
+                if (currentGame.getCurrentPhase() == 'E') {
+                    currentGame.scorePhase();
+                    currentGame.cleanBoard();
+                    currentGame.distributeResources();
+                    currentGame.nextPhase();
+                }
+                else {
+                    game_over = true;
+                }
+            }
         }
-        currentGame.scorePhase();
-        currentGame.cleanBoard();
-        currentGame.distributeResources();
-        currentGame.nextPhase();
-        while (!currentGame.isPhaseOver()){
-            currentGame.getCurrentPlayer().doAIMove(currentGame);
-        }
-        currentGame.scorePhase();
         sendMessage("Game over!",true);
-        game_over = true;
         refresh();
 
     }
@@ -472,6 +476,9 @@ public class Game extends Application {
         Label mapLabel = new Label("Select Map:");
         Label aiLabel = new Label("How many AI players:");
 
+        Label stuckLabel = new Label("Stuck?");
+        Button stuckButton = new Button("Skip my turn");
+
         // Numeric select for AI
         ComboBox aiSelector = new ComboBox();
         aiSelector.getItems().add("0");
@@ -528,8 +535,21 @@ public class Game extends Application {
             }
         });
 
+        stuckButton.setOnAction(new EventHandler<ActionEvent>() {
+            @Override
+            public void handle(ActionEvent e) {
+                currentGame.nextPlayer();
+                StringBuilder message = new StringBuilder("You skipped your turn");
+                while (currentGame.getCurrentPlayer().isAI()) {
+                    message.append("\n").append(doAIMove());
+                }
+                sendMessage(message.toString());
+                refresh();
+            }
+        });
+
         HBox hb = new HBox();
-        hb.getChildren().addAll(mapLabel,mapSelector,aiLabel,aiSelector,newLabel, twoPlayer,threePlayer,fourPlayer);
+        hb.getChildren().addAll(mapLabel,mapSelector,aiLabel,aiSelector,newLabel, twoPlayer,threePlayer,fourPlayer,stuckLabel,stuckButton);
         hb.setSpacing(10);
         hb.setLayoutX(50);
         hb.setLayoutY(WINDOW_HEIGHT - 50);