From adc7b1a8f3920991fc853b1f9cedf22a5d9e3a21 Mon Sep 17 00:00:00 2001
From: Ticho Hidding <tichohidding@gmail.com>
Date: Mon, 8 Dec 2025 17:14:31 +0100
Subject: [PATCH] fixed reversi colors being switched, causing multiple issues

---
 app/src/main/java/org/toop/app/App.java               | 11 +++++------
 .../toop/app/gameControllers/ReversiController.java   |  6 +++---
 .../java/org/toop/game/games/reversi/ReversiR.java    |  8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/toop/app/App.java b/app/src/main/java/org/toop/app/App.java
index aea9500..3557848 100644
--- a/app/src/main/java/org/toop/app/App.java
+++ b/app/src/main/java/org/toop/app/App.java
@@ -89,12 +89,6 @@ public final class App extends Application {
 
 		setKeybinds(root);
 
-        stage.setFullScreenExitKeyCombination(
-                new KeyCodeCombination(
-                        KeyCode.F11
-                )
-        );
-
         LoadingWidget loading = new LoadingWidget(Primitive.text(
                 "Loading...", false), 0, 0, Integer.MAX_VALUE, false, false // Just set a high default
         );
@@ -154,6 +148,11 @@ public final class App extends Application {
 				escapePopup();
 			}
 		});
+        stage.setFullScreenExitKeyCombination(
+                new KeyCodeCombination(
+                        KeyCode.F11
+                )
+        );
 	}
 
 	public void escapePopup() {
diff --git a/app/src/main/java/org/toop/app/gameControllers/ReversiController.java b/app/src/main/java/org/toop/app/gameControllers/ReversiController.java
index 1f6842f..a52d1f6 100644
--- a/app/src/main/java/org/toop/app/gameControllers/ReversiController.java
+++ b/app/src/main/java/org/toop/app/gameControllers/ReversiController.java
@@ -65,9 +65,9 @@ public class ReversiController extends AbstractGameController<ReversiR> {
         canvas.clearAll();
 
         for (int i = 0; i < game.getBoard().length; i++) {
-            if (game.getBoard()[i] == 0) {
+            if (game.getBoard()[i] == 1) {
                 canvas.drawDot(Color.WHITE, i);
-            } else if (game.getBoard()[i] == 1) {
+            } else if (game.getBoard()[i] == 0) {
                 canvas.drawDot(Color.BLACK, i);
             }
         }
@@ -109,7 +109,7 @@ public class ReversiController extends AbstractGameController<ReversiR> {
 
     public void drawLegalPosition(int cell, int player) {
         Color innerColor;
-        if (player == 1) {
+        if (player == 0) {
             innerColor = new Color(0.0f, 0.0f, 0.0f, 0.6f);
         }
         else {
diff --git a/game/src/main/java/org/toop/game/games/reversi/ReversiR.java b/game/src/main/java/org/toop/game/games/reversi/ReversiR.java
index 85d6334..bf946db 100644
--- a/game/src/main/java/org/toop/game/games/reversi/ReversiR.java
+++ b/game/src/main/java/org/toop/game/games/reversi/ReversiR.java
@@ -39,10 +39,10 @@ public final class ReversiR extends AbstractGame<ReversiR> {
 
 
     private void addStartPieces() {
-        this.setBoard(27, 1);
-        this.setBoard(28, 0);
-        this.setBoard(35, 0);
-        this.setBoard(36, 1);
+        this.setBoard(27, 0);
+        this.setBoard(28, 1);
+        this.setBoard(35, 1);
+        this.setBoard(36, 0);
         updateFilledCellsSet();
     }
     private void updateFilledCellsSet() {