From 012a8b57fe9b64ff75fed595a46cd827423bcd7a Mon Sep 17 00:00:00 2001
From: Felix Eriksson <felix.eriksson1996@hotmail.com>
Date: Wed, 14 Jan 2026 09:40:27 +0100
Subject: [PATCH 1/8] win con for gui

---
 src/main/java/org/example/TravelGameController.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/example/TravelGameController.java b/src/main/java/org/example/TravelGameController.java
index 0557bdea..5a7f0365 100644
--- a/src/main/java/org/example/TravelGameController.java
+++ b/src/main/java/org/example/TravelGameController.java
@@ -356,7 +356,7 @@ private void doMove(Long travelerId, PossibleMoves chosen) {
 
             tx.commit();
             players.set(currentPlayerIndex, managed);
-
+            doesPLayerWin();
             if (!wonGame) {
                 currentPlayerIndex = (currentPlayerIndex + 1) % players.size();
             }
@@ -370,6 +370,15 @@ private void doMove(Long travelerId, PossibleMoves chosen) {
         }
     }
 
+    private void doesPLayerWin() {
+        for (int i = 0; i < players.size(); i++){
+            if (players.get(i).checkScore()){
+                wonGame = true;
+                System.out.println(players.get(i).getPlayerName() + " Wins the game. Congratulations");
+            }
+        }
+    }
+
 
     private List<Location> distinctLocationsById(List<Location> locations) {
         java.util.Map<Long, Location> byId = new java.util.LinkedHashMap<>();

From d0f0838a608017933392033652c7e0cd1f23106b Mon Sep 17 00:00:00 2001
From: Felix Eriksson <felix.eriksson1996@hotmail.com>
Date: Wed, 14 Jan 2026 09:43:03 +0100
Subject: [PATCH 2/8] win con for gui

---
 src/main/java/org/example/TravelGameController.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/example/TravelGameController.java b/src/main/java/org/example/TravelGameController.java
index 5a7f0365..8a872625 100644
--- a/src/main/java/org/example/TravelGameController.java
+++ b/src/main/java/org/example/TravelGameController.java
@@ -356,7 +356,7 @@ private void doMove(Long travelerId, PossibleMoves chosen) {
 
             tx.commit();
             players.set(currentPlayerIndex, managed);
-            doesPLayerWin();
+            doesPlayerWin();
             if (!wonGame) {
                 currentPlayerIndex = (currentPlayerIndex + 1) % players.size();
             }
@@ -370,11 +370,11 @@ private void doMove(Long travelerId, PossibleMoves chosen) {
         }
     }
 
-    private void doesPLayerWin() {
-        for (int i = 0; i < players.size(); i++){
-            if (players.get(i).checkScore()){
+    private void doesPlayerWin() {
+        for (Traveler player : players) {
+            if (player.checkScore()) {
                 wonGame = true;
-                System.out.println(players.get(i).getPlayerName() + " Wins the game. Congratulations");
+                System.out.println(player.getPlayerName() + " Wins the game. Congratulations");
             }
         }
     }

From 731b2492c1216b8a0c03f953401b9c9640f8febc Mon Sep 17 00:00:00 2001
From: Felix Eriksson <felix.eriksson1996@hotmail.com>
Date: Wed, 14 Jan 2026 10:02:34 +0100
Subject: [PATCH 3/8] win con for gui

---
 src/main/java/org/example/TravelGameController.java | 3 +++
 src/main/resources/travelGame.fxml                  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/org/example/TravelGameController.java b/src/main/java/org/example/TravelGameController.java
index 8a872625..007efcd8 100644
--- a/src/main/java/org/example/TravelGameController.java
+++ b/src/main/java/org/example/TravelGameController.java
@@ -8,6 +8,7 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.DialogPane;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
 import javafx.scene.image.Image;
@@ -24,6 +25,7 @@
 
 public class TravelGameController {
 
+    @FXML private DialogPane winConLabel;
     @FXML private ImageView mapView;
     @FXML private StackPane drawingPane;
     @FXML private Pane gridLayer;
@@ -375,6 +377,7 @@ private void doesPlayerWin() {
             if (player.checkScore()) {
                 wonGame = true;
                 System.out.println(player.getPlayerName() + " Wins the game. Congratulations");
+                winConLabel.setContentText(player.getPlayerName() + " Wins the game. Congratulations");
             }
         }
     }
diff --git a/src/main/resources/travelGame.fxml b/src/main/resources/travelGame.fxml
index e36d7fb6..ddc7cfae 100644
--- a/src/main/resources/travelGame.fxml
+++ b/src/main/resources/travelGame.fxml
@@ -77,6 +77,7 @@
                         <Label text="Destination:" style="-fx-text-fill: white; -fx-font-weight: bold;"/>
                         <Label fx:id="destinationLabel" text="-" style="-fx-text-fill: white;"/>
                     </HBox>
+                    <DialogPane fx:id="winConLabel" style="-fx-font-weight: bold;"/>
                 </VBox>
 
                 <Region HBox.hgrow="ALWAYS"/>

From e60944f32088f239876ed5c314e6a302bb9aee41 Mon Sep 17 00:00:00 2001
From: Felix Eriksson <felix.eriksson1996@hotmail.com>
Date: Wed, 14 Jan 2026 10:05:36 +0100
Subject: [PATCH 4/8] added points to gui

---
 src/main/java/org/example/TravelGameController.java | 2 ++
 src/main/resources/travelGame.fxml                  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/org/example/TravelGameController.java b/src/main/java/org/example/TravelGameController.java
index 007efcd8..40973b36 100644
--- a/src/main/java/org/example/TravelGameController.java
+++ b/src/main/java/org/example/TravelGameController.java
@@ -45,6 +45,7 @@ public class TravelGameController {
     @FXML private Label currentTurnLabel;
     @FXML private Label currentLocationLabel;
     @FXML private Label destinationLabel;
+    @FXML private Label currentPointLabel;
 
     private MapVisualizer visualizer;
     private JourneyService journeyService;
@@ -260,6 +261,7 @@ private void updateHud() {
 
         currentCreditsLabel.setText(current.getMoney() != null ? current.getMoney().toPlainString() : "-");
         currentTurnLabel.setText(String.valueOf(current.getTurnCount()));
+        currentPointLabel.setText(String.valueOf(current.getPlayerScore()));
 
         currentLocationLabel.setText("[" + clampToGrid(current.getPlayerPosX()) + "," + clampToGrid(current.getPlayerPosY()) + "]");
 
diff --git a/src/main/resources/travelGame.fxml b/src/main/resources/travelGame.fxml
index ddc7cfae..d90d2039 100644
--- a/src/main/resources/travelGame.fxml
+++ b/src/main/resources/travelGame.fxml
@@ -66,6 +66,8 @@
                         <Label fx:id="currentCreditsLabel" text="0" style="-fx-text-fill: white;"/>
                         <Label text="Turn:" style="-fx-text-fill: white; -fx-font-weight: bold;"/>
                         <Label fx:id="currentTurnLabel" text="0" style="-fx-text-fill: white;"/>
+                        <Label text="Points:" style="-fx-text-fill: white; -fx-font-weight: bold;"/>
+                        <Label fx:id="currentPointLabel" text="0" style="-fx-text-fill: white;"/>
                     </HBox>
 
                     <HBox spacing="10">

From 8457a5f84a48f36d71e63b0d4e10ae3a0c8409cb Mon Sep 17 00:00:00 2001
From: Felix Eriksson <felix.eriksson1996@hotmail.com>
Date: Wed, 14 Jan 2026 11:23:06 +0100
Subject: [PATCH 5/8] win con works

---
 src/main/java/org/example/TravelGameController.java | 1 +
 src/main/java/org/example/player.java               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/example/TravelGameController.java b/src/main/java/org/example/TravelGameController.java
index 40973b36..281120b2 100644
--- a/src/main/java/org/example/TravelGameController.java
+++ b/src/main/java/org/example/TravelGameController.java
@@ -356,6 +356,7 @@ private void doMove(Long travelerId, PossibleMoves chosen) {
                         + " kom fram till " + targetName
                         + " (rolled=" + journey.getDistanceMoved() + ")"
                 );
+                managed.increaseScore();
             }
 
             tx.commit();
diff --git a/src/main/java/org/example/player.java b/src/main/java/org/example/player.java
index e77928e2..9b1d44dc 100644
--- a/src/main/java/org/example/player.java
+++ b/src/main/java/org/example/player.java
@@ -148,7 +148,7 @@ public int getPlayerScore() {
     }
 
     public boolean checkScore() {
-        if (playerScore == 5) {
+        if (playerScore == 1) {
             return true;
         }
         return false;

From f4e0f699685f66f583f3d22d0e4b12e2c1927f28 Mon Sep 17 00:00:00 2001
From: Felix Eriksson <felix.eriksson1996@hotmail.com>
Date: Wed, 14 Jan 2026 11:24:26 +0100
Subject: [PATCH 6/8] win con works with text showing up and correct score
 check

---
 src/main/java/org/example/player.java | 2 +-
 src/main/resources/travelGame.fxml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/example/player.java b/src/main/java/org/example/player.java
index 9b1d44dc..e77928e2 100644
--- a/src/main/java/org/example/player.java
+++ b/src/main/java/org/example/player.java
@@ -148,7 +148,7 @@ public int getPlayerScore() {
     }
 
     public boolean checkScore() {
-        if (playerScore == 1) {
+        if (playerScore == 5) {
             return true;
         }
         return false;
diff --git a/src/main/resources/travelGame.fxml b/src/main/resources/travelGame.fxml
index d90d2039..d3c3ef88 100644
--- a/src/main/resources/travelGame.fxml
+++ b/src/main/resources/travelGame.fxml
@@ -79,7 +79,7 @@
                         <Label text="Destination:" style="-fx-text-fill: white; -fx-font-weight: bold;"/>
                         <Label fx:id="destinationLabel" text="-" style="-fx-text-fill: white;"/>
                     </HBox>
-                    <DialogPane fx:id="winConLabel" style="-fx-font-weight: bold;"/>
+                    <DialogPane fx:id="winConLabel" style="-fx-font-size: 20px; -fx-font-weight: bold;"/>
                 </VBox>
 
                 <Region HBox.hgrow="ALWAYS"/>

From 7865809ff14448cc7cefbabbaa5a97942dd5054a Mon Sep 17 00:00:00 2001
From: Felix Eriksson <felix.eriksson1996@hotmail.com>
Date: Wed, 14 Jan 2026 13:00:44 +0100
Subject: [PATCH 7/8] refactoring

---
 src/main/java/org/example/TravelGameController.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/example/TravelGameController.java b/src/main/java/org/example/TravelGameController.java
index 281120b2..1baacb3f 100644
--- a/src/main/java/org/example/TravelGameController.java
+++ b/src/main/java/org/example/TravelGameController.java
@@ -444,6 +444,8 @@ private void doContinueJourney(Long travelerId) {
                 );
             } else {
                 logList.getItems().add("✅ " + safeName(managed) + " kom fram till " + targetName + "!");
+                managed.increaseScore();
+                doesPlayerWin();
             }
 
             tx.commit();

From a8c5d4b32063b89c5751368d2e93ce13a3d47f7d Mon Sep 17 00:00:00 2001
From: Felix Eriksson <felix.eriksson1996@hotmail.com>
Date: Wed, 14 Jan 2026 13:28:07 +0100
Subject: [PATCH 8/8] refactoring/cleaning

---
 src/main/java/org/example/player.java         | 14 --------------
 src/main/java/org/example/playerMovement.java |  4 ----
 2 files changed, 18 deletions(-)

diff --git a/src/main/java/org/example/player.java b/src/main/java/org/example/player.java
index e77928e2..75afb6bb 100644
--- a/src/main/java/org/example/player.java
+++ b/src/main/java/org/example/player.java
@@ -5,24 +5,10 @@ abstract class Player {
     private int playerScore = 0;
     int credits = 10000;
 
-    //set the player name
-    public void setPlayerName(String playerName) {
-        this.playerName = playerName;
-    }
-
     public String getPlayerName() {
         return playerName;
     }
 
-    public void setPlayerCredits(int credits) {
-        if (credits < 0){
-            System.out.println("Invalid, credits cannot be under zero!");
-            this.credits = 0;
-        } else {
-            this.credits = credits;
-        }
-    }
-
     public int getCredits() {
         return credits;
     }
diff --git a/src/main/java/org/example/playerMovement.java b/src/main/java/org/example/playerMovement.java
index 83bb825a..b52d3143 100644
--- a/src/main/java/org/example/playerMovement.java
+++ b/src/main/java/org/example/playerMovement.java
@@ -19,10 +19,6 @@ record destinationPos(int destinationX, int destinationY) {}
     private destinationPos destination;
     private int playerTurnCount = 0;
 
-    public int getTransDiceCount(){
-        return selectedTransportDice;
-    }
-
     public int getTurns(){
         return playerTurnCount;
     }