From 04c707fed876ca62b8a71e69ed01e6f97de9fd0c Mon Sep 17 00:00:00 2001 From: Tanja Herche Date: Sun, 5 Feb 2023 22:03:31 +0100 Subject: [PATCH] Changed traveloptions Berge --- src/main/java/org/bitbiome/classes/TravelEngine.java | 9 +++++++++ .../java/org/bitbiome/commands/TravelCommand.java | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/org/bitbiome/classes/TravelEngine.java b/src/main/java/org/bitbiome/classes/TravelEngine.java index d7f39f0..51c5cae 100644 --- a/src/main/java/org/bitbiome/classes/TravelEngine.java +++ b/src/main/java/org/bitbiome/classes/TravelEngine.java @@ -71,6 +71,15 @@ public class TravelEngine { return found; } + public boolean locationExistsBerge(String name) { + boolean found = false; + for (int i = 0; i < locations.length(); i++) + if (locations.getJSONObject(0).getString("name").equals(name) | locations.getJSONObject(2).getString("name").equals(name)) { + found = true; + } + return found; + } + public Location getLocationByName(String name) { JsonParser jp = new JsonParser(); JSONObject gameconfig = jp.getJSONObject("gameconfig.json"); diff --git a/src/main/java/org/bitbiome/commands/TravelCommand.java b/src/main/java/org/bitbiome/commands/TravelCommand.java index 8292286..1135aa4 100644 --- a/src/main/java/org/bitbiome/commands/TravelCommand.java +++ b/src/main/java/org/bitbiome/commands/TravelCommand.java @@ -51,6 +51,17 @@ public class TravelCommand implements CommandAPI { System.out.println(Colors.ANSI_BLUE + "Du hast dein Travel-Pad weggesteckt." + Colors.ANSI_RESET); } + } else if (travelEngine.getPlayer().getLocation().getName().equalsIgnoreCase("Berge")) { + System.out.println("- " + locations.getJSONObject(0).getString("name") + "\n" + "- " + locations.getJSONObject(2).getString("name")); + + String locationName = scanner.nextLine(); + if (travelEngine.locationExistsBerge(locationName)) { + travelEngine.travelTo(new Location(locationName, new ArrayList(), new ArrayList())); + System.out.println(Colors.ANSI_BLUE + "Du bist nun hierhin gereist: " + locationName + "\n" + Colors.ANSI_RESET); + } else { + System.out.println(Colors.ANSI_BLUE + "Du hast dein Travel-Pad weggesteckt." + Colors.ANSI_RESET); + } + } else { for (int i = 0; i < locations.length(); i++) { System.out.println("- " + locations.getJSONObject(i).getString("name"));