From 161513af4f6edc98614dd5e3e7023a2b87d52a13 Mon Sep 17 00:00:00 2001 From: Felix Eriksson Date: Wed, 14 Jan 2026 15:26:40 +0100 Subject: [PATCH 1/2] refactoring and cleaning up code --- src/main/java/org/example/App.java | 20 +------------------ .../org/example/TravelGameController.java | 1 - src/main/java/org/example/Traveler.java | 2 +- src/main/java/org/example/player.java | 2 ++ src/main/java/org/example/playerMovement.java | 6 ++---- 5 files changed, 6 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/example/App.java b/src/main/java/org/example/App.java index 9acfaa06..68356857 100644 --- a/src/main/java/org/example/App.java +++ b/src/main/java/org/example/App.java @@ -18,9 +18,6 @@ public static void main(String[] args) throws IOException { Traveler p3; Traveler p4; - - - try { tx.begin(); List transportMethods = em.createQuery("select t from Transport t", Transport.class).getResultList(); @@ -33,15 +30,6 @@ public static void main(String[] args) throws IOException { } switch (pAmount){ -// Test case for debuging and testing -// case 1 ->{ -// while(true){ -// Location current = randomLocation(em); -// Location dest = randomLocation(em); -// -// System.out.println(current.getName()); -// System.out.println(dest.getName());} -// } case 2 ->{ String p1Name = IO.readln("Input name for player 1: "); Location newDestP1 = randomLocation(em); @@ -207,14 +195,8 @@ public static void main(String[] args) throws IOException { em.close(); } } -// random locations -// public static Location randLoc(EntityManager em){ -// Long locSize = em.createQuery("select count(l) from Location l", Long.class).getSingleResult(); -// Location randLoc = em.createQuery("select l from Location l", Location.class).setFirstResult(randomIndex(locSize)).setMaxResults(1).getSingleResult(); -// return randLoc; -// } - //Randomise through all points for continent, country and locations. + //Randomize through all points for continent, country and locations to get a random location. If the country has no locations, loop again until it finds a location. static public Location randomLocation(EntityManager em){ Long contCount = em.createQuery("Select count(c) from Continent c", Long.class).getSingleResult(); diff --git a/src/main/java/org/example/TravelGameController.java b/src/main/java/org/example/TravelGameController.java index 5fce38f0..f0752a5f 100644 --- a/src/main/java/org/example/TravelGameController.java +++ b/src/main/java/org/example/TravelGameController.java @@ -577,7 +577,6 @@ private void doContinueJourney(Long travelerId) { if (!managed.isTravelling() && !wonGame) { currentPlayerIndex = (currentPlayerIndex + 1) % players.size(); } - syncHudAndMap(); } catch (RuntimeException e) { if (tx.isActive()) tx.rollback(); diff --git a/src/main/java/org/example/Traveler.java b/src/main/java/org/example/Traveler.java index 8788ffd8..a6458406 100644 --- a/src/main/java/org/example/Traveler.java +++ b/src/main/java/org/example/Traveler.java @@ -26,7 +26,7 @@ public class Traveler extends playerMovement { private int remainingDistance; @Column(name = "turn_count", nullable = false) - private int turnCount = 0; + private int turnCount = 1; @Column(nullable = false) private BigDecimal money = BigDecimal.valueOf(credits); diff --git a/src/main/java/org/example/player.java b/src/main/java/org/example/player.java index 75afb6bb..cef5f154 100644 --- a/src/main/java/org/example/player.java +++ b/src/main/java/org/example/player.java @@ -5,10 +5,12 @@ abstract class Player { private int playerScore = 0; int credits = 10000; + //Returns the name of the player. public String getPlayerName() { return playerName; } + //Use to get the players current 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 b52d3143..c029670e 100644 --- a/src/main/java/org/example/playerMovement.java +++ b/src/main/java/org/example/playerMovement.java @@ -4,9 +4,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.List; -import org.example.GameConfig; -import org.example.GameMode; - public class playerMovement extends Player{ private int dice = 6; @@ -190,6 +187,7 @@ public void playerTurnGui(int diceAmount) { System.out.println("End of " + playerName + " GUI turn"); checkIfPlayerHasPenalties(); } + public void playerTurnByMode(List transports, int guiDiceAmount) throws IOException { if (GameConfig.MODE == GameMode.CLI) { playerTurn(transports); @@ -203,7 +201,7 @@ public void chooseTransportation(List transport) throws IOException { BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); while (true){ - System.out.println("Player has " + getCredits() + " credits"); + System.out.println("Player: "+playerName+" has " + getCredits() + " credits"); for (int i = 0; i < transport.size(); i++){ System.out.println("Nr " + (i+1) + ": " + transport.get(i).getType() + ". Dice amount: "+ transport.get(i).getDiceCount() + ". Costs: " + transport.get(i).getCostPerMove()); } From 562c20645e375aa7b101cbfea11e54a28500320f Mon Sep 17 00:00:00 2001 From: Felix Eriksson Date: Wed, 14 Jan 2026 17:02:22 +0100 Subject: [PATCH 2/2] refactoring and cleaning up code --- src/main/java/org/example/Traveler.java | 2 +- src/main/java/org/example/playerMovement.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/example/Traveler.java b/src/main/java/org/example/Traveler.java index a6458406..8788ffd8 100644 --- a/src/main/java/org/example/Traveler.java +++ b/src/main/java/org/example/Traveler.java @@ -26,7 +26,7 @@ public class Traveler extends playerMovement { private int remainingDistance; @Column(name = "turn_count", nullable = false) - private int turnCount = 1; + private int turnCount = 0; @Column(nullable = false) private BigDecimal money = BigDecimal.valueOf(credits); diff --git a/src/main/java/org/example/playerMovement.java b/src/main/java/org/example/playerMovement.java index c029670e..c9b7c05e 100644 --- a/src/main/java/org/example/playerMovement.java +++ b/src/main/java/org/example/playerMovement.java @@ -6,8 +6,8 @@ import java.util.List; public class playerMovement extends Player{ - private int dice = 6; - private int walkingDice = 4; + private final int dice = 6; + private final int walkingDice = 4; private int selectedTransportDice; private int availableMovement; private int playerPosX;