From 2f9b155e6e909e52ceff4bd8ca3244929b4fad97 Mon Sep 17 00:00:00 2001
From: Bas Antonius de Jong <49651652+BAFGdeJong@users.noreply.github.com>
Date: Wed, 1 Oct 2025 15:20:02 +0200
Subject: [PATCH] Alpha DrawCondition update (#89)

* drawConditions gemaakt en geimplementeerd

* drawConditions gemaakt en geimplementeerd, werkt wanneer je het lokaal draait

* better draw conditions in a shorter amount of lines

* commit for ticho

* working draw conditions (maybe?)

* moved a little bit

* removed a little bit

---------

Co-authored-by: michiel <m.brands.3@st.hanze.nl>
---
 .idea/misc.xml                                |   2 +-
 .../org/toop/game/tictactoe/TicTacToe.java    | 144 ++++++++++--------
 2 files changed, 85 insertions(+), 61 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 72be14a..97dd9e8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,7 +13,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_24" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/game/src/main/java/org/toop/game/tictactoe/TicTacToe.java b/game/src/main/java/org/toop/game/tictactoe/TicTacToe.java
index 4b39df2..cce644f 100644
--- a/game/src/main/java/org/toop/game/tictactoe/TicTacToe.java
+++ b/game/src/main/java/org/toop/game/tictactoe/TicTacToe.java
@@ -6,79 +6,103 @@ import org.toop.game.Player;
 import java.util.ArrayList;
 
 public final class TicTacToe extends Game {
-	private int movesLeft;
+    private int movesLeft;
 
-	public TicTacToe(String player1, String player2) {
-		super(3, 3, new Player(player1, 'X'), new Player(player2, 'O'));
-		movesLeft = board.length;
-	}
+    public TicTacToe(String player1, String player2) {
+        super(3, 3, new Player(player1, 'X'), new Player(player2, 'O'));
+        movesLeft = board.length;
+    }
 
-	public TicTacToe(TicTacToe other) {
-		super(other);
-		movesLeft = other.movesLeft;
-	}
+    public TicTacToe(TicTacToe other) {
+        super(other);
+        movesLeft = other.movesLeft;
+    }
 
-	@Override
-	public Move[] getLegalMoves() {
-		final ArrayList<Move> legalMoves = new ArrayList<>();
+    @Override
+    public Move[] getLegalMoves() {
+        final ArrayList<Move> legalMoves = new ArrayList<>();
 
-		for (int i = 0; i < board.length; i++) {
-			if (board[i] == EMPTY) {
-				legalMoves.add(new Move(i, getCurrentPlayer().values()[0]));
-			}
-		}
+        for (int i = 0; i < board.length; i++) {
+            if (board[i] == EMPTY) {
+                legalMoves.add(new Move(i, getCurrentPlayer().values()[0]));
+            }
+        }
 
-		return legalMoves.toArray(new Move[0]);
-	}
+        return legalMoves.toArray(new Move[0]);
+    }
 
-	@Override
-	public State play(Move move) {
-		assert move != null;
-		assert move.position() >= 0 && move.position() < board.length;
-		assert move.value() == getCurrentPlayer().values()[0];
+    @Override
+    public State play(Move move) {
+        assert move != null;
+        assert move.position() >= 0 && move.position() < board.length;
+        assert move.value() == getCurrentPlayer().values()[0];
 
-		board[move.position()] = move.value();
-		movesLeft--;
+        board[move.position()] = move.value();
+        movesLeft--;
 
-		if (checkForWin()) {
-			return State.WIN;
-		}
+        if (checkForWin()) {
+            return State.WIN;
+        }
 
-		if (movesLeft <= 0) {
-			return State.DRAW;
-		}
+        nextPlayer();
 
-		nextPlayer();
-		return State.NORMAL;
-	}
+        if (movesLeft <= 2) {
+            if (checkDraw(new TicTacToe(this))) {
+                return State.DRAW;
+            }
+        }
+        return State.NORMAL;
+    }
 
-	private boolean checkForWin() {
-		// Horizontal
-		for (int i = 0; i < 3; i++) {
-			final int index = i * 3;
+    private boolean checkForWin() {
+        // Horizontal
+        for (int i = 0; i < 3; i++) {
+            final int index = i * 3;
 
-			if (board[index] != EMPTY
-					&& board[index] == board[index + 1]
-					&& board[index] == board[index + 2]) {
-				return true;
-			}
-		}
+            if (board[index] != EMPTY
+                    && board[index] == board[index + 1]
+                    && board[index] == board[index + 2]) {
+                return true;
+            }
+        }
 
-		// Vertical
-		for (int i = 0; i < 3; i++) {
-			if (board[i] != EMPTY
-					&& board[i] == board[i + 3]
-					&& board[i] == board[i + 6]) {
-				return true;
-			}
-		}
+        // Vertical
+        for (int i = 0; i < 3; i++) {
+            if (board[i] != EMPTY
+                    && board[i] == board[i + 3]
+                    && board[i] == board[i + 6]) {
+                return true;
+            }
+        }
 
-		// B-Slash
-		if (board[0] != EMPTY && board[0] == board[4] && board[0] == board[8]) {
-			return true;
-		}
+        // B-Slash
+        if (board[0] != EMPTY && board[0] == board[4] && board[0] == board[8]) {
+            return true;
+        }
 
-		// F-Slash
-		return board[2] != EMPTY && board[2] == board[4] && board[2] == board[6];
-	}
+        // F-Slash
+        return board[2] != EMPTY && board[2] == board[4] && board[2] == board[6];
+    }
+
+    public boolean checkDraw(TicTacToe game) {
+        if (game.checkForWin()) {
+            return false;
+        }
+        if (game.movesLeft == 0) {
+            return true;
+        }
+        // try every move on a legal copy
+        for (Move move : game.getLegalMoves()) {
+            TicTacToe copy = new TicTacToe(game);
+            State result = copy.play(move);
+
+            if (result == State.WIN) {
+                return false;
+            }
+            if (!checkDraw(copy)) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
\ No newline at end of file