From 0cb025edb9c6a339a528cb22e285f0d94dafc00e Mon Sep 17 00:00:00 2001
From: Stef <stbuwalda@gmail.com>
Date: Thu, 27 Nov 2025 18:37:34 +0100
Subject: [PATCH] Changed the way turns are being stored in TurnBasedGame.

---
 .../main/java/org/toop/game/TurnBasedGame.java  | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/game/src/main/java/org/toop/game/TurnBasedGame.java b/game/src/main/java/org/toop/game/TurnBasedGame.java
index 4746f56..2e51519 100644
--- a/game/src/main/java/org/toop/game/TurnBasedGame.java
+++ b/game/src/main/java/org/toop/game/TurnBasedGame.java
@@ -1,26 +1,25 @@
 package org.toop.game;
 
 public abstract class TurnBasedGame extends Game {
-    private final int turns;
-    private int currentTurn;
+    private final int playerCount;  // How many players are playing
+    private int turn = 0;           // What turn it is in the game
 
-    protected TurnBasedGame(int rowSize, int columnSize, int turns) {
+    protected TurnBasedGame(int rowSize, int columnSize, int playerCount) {
         super(rowSize, columnSize);
-        assert turns >= 2;
-        this.turns = turns;
+        this.playerCount = playerCount;
     }
 
     protected TurnBasedGame(TurnBasedGame other) {
         super(other);
-        turns = other.turns;
-        currentTurn = other.currentTurn;
+        playerCount = other.playerCount;
+        turn = other.turn;
     }
 
     protected void nextTurn() {
-        currentTurn = (currentTurn + 1) % turns;
+        turn += 1;
     }
 
     public int getCurrentTurn() {
-        return currentTurn;
+        return turn % playerCount;
     }
 }