diff --git a/src/main/java/org/example/Journey.java b/src/main/java/org/example/Journey.java index e9bb3a25..f11132bd 100644 --- a/src/main/java/org/example/Journey.java +++ b/src/main/java/org/example/Journey.java @@ -109,8 +109,4 @@ public int getRemainingDistance() { return remainingDistance; } - public int getTurnNumber() { - return turnNumber; - } - } diff --git a/src/main/java/org/example/Location.java b/src/main/java/org/example/Location.java index fefb79d2..ff59a182 100644 --- a/src/main/java/org/example/Location.java +++ b/src/main/java/org/example/Location.java @@ -34,10 +34,6 @@ public void setName(String name) { this.name = name; } - public void setType(LocationType type) { - this.type = type; - } - public int getX() { return x; } diff --git a/src/main/java/org/example/LocationLink.java b/src/main/java/org/example/LocationLink.java index 53c8f316..5c4f3c25 100644 --- a/src/main/java/org/example/LocationLink.java +++ b/src/main/java/org/example/LocationLink.java @@ -26,15 +26,6 @@ public class LocationLink { @OneToMany(mappedBy = "locationLink") private Set transportLinks = new HashSet<>(); - - public LocationLink() {} - - public LocationLink(Location fromLocation, Location toLocation, int distance) { - this.fromLocation = fromLocation; - this.toLocation = toLocation; - this.distance = distance; - } - public Long getId() { return id; } diff --git a/src/main/java/org/example/Transport.java b/src/main/java/org/example/Transport.java index 827446ee..e1131e1e 100644 --- a/src/main/java/org/example/Transport.java +++ b/src/main/java/org/example/Transport.java @@ -25,25 +25,6 @@ public class Transport { public Transport(){} - public Transport(TransportType type, String costPerMove) { - this.type = type; - this.costPerMove = new BigDecimal(costPerMove); - switch (type){ - case BUSS -> { - this.diceCount = 1; - this.diceSides = 6; - } - case TRAIN -> { - this.diceCount = 2; - this.diceSides = 6; - } - case AIRPLANE -> { - this.diceCount = 3; - this.diceSides = 6; - } - } - } - public int rollDistance() { Random r = new Random(); int total = 0; @@ -65,5 +46,4 @@ public String getType() { return type.toString(); } - } diff --git a/src/main/java/org/example/TransportLink.java b/src/main/java/org/example/TransportLink.java index e9f3ca8d..f3a98129 100644 --- a/src/main/java/org/example/TransportLink.java +++ b/src/main/java/org/example/TransportLink.java @@ -40,10 +40,6 @@ public Long getId() { return id; } - public LocationLink getLocationLink() { - return locationLink; - } - public Transport getTransport() { return transport; } diff --git a/src/main/java/org/example/TravelGame.java b/src/main/java/org/example/TravelGame.java index 7c9d8ab4..c398b412 100644 --- a/src/main/java/org/example/TravelGame.java +++ b/src/main/java/org/example/TravelGame.java @@ -24,7 +24,6 @@ public void start(Stage stage) throws Exception { dialog.setContentText("Ange ditt spelarnamn:"); dialog.setGraphic(null); - DialogPane dialogPane = dialog.getDialogPane(); // ok att ha kvar eller ta bort Optional result = dialog.showAndWait(); if (result.isPresent() && !result.get().trim().isEmpty()) { diff --git a/src/main/java/org/example/Traveler.java b/src/main/java/org/example/Traveler.java index fda55cb4..8788ffd8 100644 --- a/src/main/java/org/example/Traveler.java +++ b/src/main/java/org/example/Traveler.java @@ -206,4 +206,12 @@ public void deductMoney(BigDecimal amount) { this.money = next.signum() < 0 ? BigDecimal.ZERO : next; } + public void cancelJourney() { + this.targetLocation = null; + this.remainingDistance = 0; + // destinationPos kan du låta vara, eller synca till current: + // setDestinationPos(currentLocation.getX(), currentLocation.getY()); + } + + } diff --git a/src/main/java/org/example/service/EventResult.java b/src/main/java/org/example/service/EventResult.java deleted file mode 100644 index 4bce711f..00000000 --- a/src/main/java/org/example/service/EventResult.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.example.service; - -import org.example.EventType; - -import java.math.BigDecimal; - -public record EventResult( - EventType type, - String description, - BigDecimal amount -) { - - public static EventResult penalty(String description, BigDecimal amount) { - return new EventResult(org.example.EventType.PENALTY, description, amount.negate()); - } - - public static EventResult bonus(String description, BigDecimal amount) { - return new EventResult(EventType.BONUS, description, amount); - } -} -