From 666fa70a5241645a56c6e67e7da4edae2eae9aed Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:08:06 +0100 Subject: [PATCH 01/17] Created item class --- src/main/java/org/bitbiome/classes/Item.java | 40 ++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/main/java/org/bitbiome/classes/Item.java diff --git a/src/main/java/org/bitbiome/classes/Item.java b/src/main/java/org/bitbiome/classes/Item.java new file mode 100644 index 0000000..4230728 --- /dev/null +++ b/src/main/java/org/bitbiome/classes/Item.java @@ -0,0 +1,40 @@ +package org.bitbiome.classes; + +public class Item { + + public String name; + public boolean doesDamage; + public float damage; + + + public Item(String name, boolean doesDamage, float damage) { + this.name = name; + this.doesDamage = doesDamage; + this.damage = damage; + } + + public String getName() { + return name; + } + + public float getDamage() { + return damage; + } + + public boolean doesDamage() { + return doesDamage; + } + + public void setName(String name) { + this.name = name; + } + + public void setDamage(float damage) { + this.damage = damage; + } + + public void changeDoesDamage(boolean doesDamage) { + this.doesDamage = doesDamage; + } + +} From 9a6f804563ce36d12c3388c167b681534051515e Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:12:17 +0100 Subject: [PATCH 02/17] Created mob class --- src/main/java/org/bitbiome/classes/Mob.java | 47 +++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/main/java/org/bitbiome/classes/Mob.java diff --git a/src/main/java/org/bitbiome/classes/Mob.java b/src/main/java/org/bitbiome/classes/Mob.java new file mode 100644 index 0000000..f214d90 --- /dev/null +++ b/src/main/java/org/bitbiome/classes/Mob.java @@ -0,0 +1,47 @@ +package org.bitbiome.classes; + +public class Mob { + + private String name; + private boolean isFriendly; + + private float hp; + private float damage; + + public Mob(String name, boolean isFriendly, float hp, float damage) { + this.name = name; + this.isFriendly = isFriendly; + this.hp = hp; + this.damage = damage; + } + + public String getName() { + return name; + } + + public boolean isFriendly() { + return isFriendly; + } + + public float getHp() { + return hp; + } + + public float getDamage() { + return damage; + } + + public void setDamage(float damage) { + this.damage = damage; + } + + public void setHp(float hp) { + this.hp = hp; + } + + public void setFriendly(boolean isFriendly) { + this.isFriendly = isFriendly; + } + + +} From f1e40de850973da641a745881ec10929744ff98a Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:14:45 +0100 Subject: [PATCH 03/17] Created location class --- .../java/org/bitbiome/classes/Location.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 src/main/java/org/bitbiome/classes/Location.java diff --git a/src/main/java/org/bitbiome/classes/Location.java b/src/main/java/org/bitbiome/classes/Location.java new file mode 100644 index 0000000..8d608cf --- /dev/null +++ b/src/main/java/org/bitbiome/classes/Location.java @@ -0,0 +1,33 @@ +package org.bitbiome.classes; + +import java.util.ArrayList; + +public class Location { + + private String name; + private ArrayList mobList; + private ArrayList itemList; + + + public Location(String name, ArrayList mobList, ArrayList itemList) { + this.name = name; + this.mobList = mobList; + this.itemList = itemList; + } + + + public String getName() { + return name; + } + + public ArrayList getMobList() { + return mobList; + } + + public ArrayList getItemList() { + return itemList; + } + + + +} From 20a461412839cf25a96ab66d65b84e6d24ba6428 Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:25:03 +0100 Subject: [PATCH 04/17] Created class where locations can be created --- .../java/org/bitbiome/classes/CreateLocations.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/main/java/org/bitbiome/classes/CreateLocations.java diff --git a/src/main/java/org/bitbiome/classes/CreateLocations.java b/src/main/java/org/bitbiome/classes/CreateLocations.java new file mode 100644 index 0000000..7899f48 --- /dev/null +++ b/src/main/java/org/bitbiome/classes/CreateLocations.java @@ -0,0 +1,13 @@ +package org.bitbiome.classes; + +import java.util.ArrayList; + +public class CreateLocations { + + public static Location createForest() { + ArrayList items = new ArrayList<>(); + ArrayList mobs = new ArrayList<>(); + String name = "Wald"; + return new Location(name, mobs, items); + } +} From 6e24f5651ba4776c5cea8d5870d7de4a6fe17bdc Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:25:14 +0100 Subject: [PATCH 05/17] Created player class --- .../java/org/bitbiome/classes/Player.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 src/main/java/org/bitbiome/classes/Player.java diff --git a/src/main/java/org/bitbiome/classes/Player.java b/src/main/java/org/bitbiome/classes/Player.java new file mode 100644 index 0000000..1090d7e --- /dev/null +++ b/src/main/java/org/bitbiome/classes/Player.java @@ -0,0 +1,51 @@ +package org.bitbiome.classes; + +import java.util.ArrayList; + +public class Player { + private String name; + private float hp; + private Location location; + + private ArrayList inventory; + + public Player(String name) { + this.name = name; + hp = 100.0F; + location = CreateLocations.createForest(); + inventory = new ArrayList<>(); + } + + public String getName() { + return name; + } + + public ArrayList getInventory() { + return inventory; + } + + public float getHp() { + return hp; + } + + public Location getLocation() { + return location; + } + + public void setLocation(Location location) { + this.location = location; + } + + public void setHp(float hp) { + this.hp = hp; + } + + public boolean addToInventory(Item item) { + return inventory.add(item); + } + + public boolean removeFromInventory(Item item) { + return inventory.remove(item); + } + +} From 20bc727d77f2cb6dd1d01af37cb3b25c7f2ba8be Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:25:31 +0100 Subject: [PATCH 06/17] Created traveling engine --- .../java/org/bitbiome/classes/TravelEngine.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/main/java/org/bitbiome/classes/TravelEngine.java diff --git a/src/main/java/org/bitbiome/classes/TravelEngine.java b/src/main/java/org/bitbiome/classes/TravelEngine.java new file mode 100644 index 0000000..f02fa63 --- /dev/null +++ b/src/main/java/org/bitbiome/classes/TravelEngine.java @@ -0,0 +1,15 @@ +package org.bitbiome.classes; + +public class TravelEngine { + + private Location location; + + public TravelEngine() { + + } + + public void travelTo(Location location) { + this.location = location; + } + +} From a3722db6333cb3c667241529d9f44ff0e807ce33 Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:28:10 +0100 Subject: [PATCH 07/17] refactoring: outsourced the entities in the entities package --- .../java/org/bitbiome/classes/CreateLocations.java | 4 ++++ src/main/java/org/bitbiome/classes/TravelEngine.java | 10 +++++++--- .../java/org/bitbiome/{classes => entities}/Item.java | 2 +- .../org/bitbiome/{classes => entities}/Location.java | 2 +- .../java/org/bitbiome/{classes => entities}/Mob.java | 2 +- .../org/bitbiome/{classes => entities}/Player.java | 4 +++- 6 files changed, 17 insertions(+), 7 deletions(-) rename src/main/java/org/bitbiome/{classes => entities}/Item.java (95%) rename src/main/java/org/bitbiome/{classes => entities}/Location.java (94%) rename src/main/java/org/bitbiome/{classes => entities}/Mob.java (96%) rename src/main/java/org/bitbiome/{classes => entities}/Player.java (92%) diff --git a/src/main/java/org/bitbiome/classes/CreateLocations.java b/src/main/java/org/bitbiome/classes/CreateLocations.java index 7899f48..5223fdf 100644 --- a/src/main/java/org/bitbiome/classes/CreateLocations.java +++ b/src/main/java/org/bitbiome/classes/CreateLocations.java @@ -1,5 +1,9 @@ package org.bitbiome.classes; +import org.bitbiome.entities.Item; +import org.bitbiome.entities.Location; +import org.bitbiome.entities.Mob; + import java.util.ArrayList; public class CreateLocations { diff --git a/src/main/java/org/bitbiome/classes/TravelEngine.java b/src/main/java/org/bitbiome/classes/TravelEngine.java index f02fa63..25fbc62 100644 --- a/src/main/java/org/bitbiome/classes/TravelEngine.java +++ b/src/main/java/org/bitbiome/classes/TravelEngine.java @@ -1,15 +1,19 @@ package org.bitbiome.classes; +import org.bitbiome.entities.Location; +import org.bitbiome.entities.Player; + public class TravelEngine { private Location location; + private Player player; - public TravelEngine() { - + public TravelEngine(Player player) { + this.player = player; } public void travelTo(Location location) { - this.location = location; + player.setLocation(location); } } diff --git a/src/main/java/org/bitbiome/classes/Item.java b/src/main/java/org/bitbiome/entities/Item.java similarity index 95% rename from src/main/java/org/bitbiome/classes/Item.java rename to src/main/java/org/bitbiome/entities/Item.java index 4230728..2817cd5 100644 --- a/src/main/java/org/bitbiome/classes/Item.java +++ b/src/main/java/org/bitbiome/entities/Item.java @@ -1,4 +1,4 @@ -package org.bitbiome.classes; +package org.bitbiome.entities; public class Item { diff --git a/src/main/java/org/bitbiome/classes/Location.java b/src/main/java/org/bitbiome/entities/Location.java similarity index 94% rename from src/main/java/org/bitbiome/classes/Location.java rename to src/main/java/org/bitbiome/entities/Location.java index 8d608cf..98c04d1 100644 --- a/src/main/java/org/bitbiome/classes/Location.java +++ b/src/main/java/org/bitbiome/entities/Location.java @@ -1,4 +1,4 @@ -package org.bitbiome.classes; +package org.bitbiome.entities; import java.util.ArrayList; diff --git a/src/main/java/org/bitbiome/classes/Mob.java b/src/main/java/org/bitbiome/entities/Mob.java similarity index 96% rename from src/main/java/org/bitbiome/classes/Mob.java rename to src/main/java/org/bitbiome/entities/Mob.java index f214d90..af479ce 100644 --- a/src/main/java/org/bitbiome/classes/Mob.java +++ b/src/main/java/org/bitbiome/entities/Mob.java @@ -1,4 +1,4 @@ -package org.bitbiome.classes; +package org.bitbiome.entities; public class Mob { diff --git a/src/main/java/org/bitbiome/classes/Player.java b/src/main/java/org/bitbiome/entities/Player.java similarity index 92% rename from src/main/java/org/bitbiome/classes/Player.java rename to src/main/java/org/bitbiome/entities/Player.java index 1090d7e..8f07072 100644 --- a/src/main/java/org/bitbiome/classes/Player.java +++ b/src/main/java/org/bitbiome/entities/Player.java @@ -1,4 +1,6 @@ -package org.bitbiome.classes; +package org.bitbiome.entities; + +import org.bitbiome.classes.CreateLocations; import java.util.ArrayList; From c8ea2a75fe4d49673ba4f92821701d7e971769df Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:44:57 +0100 Subject: [PATCH 08/17] Added getPlayer method to the travel engine --- src/main/java/org/bitbiome/classes/TravelEngine.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/bitbiome/classes/TravelEngine.java b/src/main/java/org/bitbiome/classes/TravelEngine.java index 25fbc62..ec21dde 100644 --- a/src/main/java/org/bitbiome/classes/TravelEngine.java +++ b/src/main/java/org/bitbiome/classes/TravelEngine.java @@ -16,4 +16,8 @@ public class TravelEngine { player.setLocation(location); } + public Player getPlayer() { + return player; + } + } From 3cedb71e90dc9424af3e28b76e8163d5f4b133d4 Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:45:35 +0100 Subject: [PATCH 09/17] Added the travel engine to the InteractionLoop --- src/main/java/org/bitbiome/Boot.java | 6 +++++- src/main/java/org/bitbiome/classes/InteractionLoop.java | 5 +++-- src/main/java/org/bitbiome/commands/CommandAPI.java | 4 +++- src/main/java/org/bitbiome/commands/CommandListener.java | 6 ++++-- src/main/java/org/bitbiome/commands/HelpCommand.java | 3 ++- src/main/java/org/bitbiome/commands/QuitCommand.java | 4 +++- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/bitbiome/Boot.java b/src/main/java/org/bitbiome/Boot.java index b264413..9706de6 100644 --- a/src/main/java/org/bitbiome/Boot.java +++ b/src/main/java/org/bitbiome/Boot.java @@ -1,7 +1,9 @@ package org.bitbiome; import org.bitbiome.classes.InteractionLoop; +import org.bitbiome.classes.TravelEngine; import org.bitbiome.commands.CommandListener; +import org.bitbiome.entities.Player; public class Boot { @@ -11,7 +13,9 @@ public class Boot { instance = this; cmdListener = new CommandListener(); InteractionLoop game = new InteractionLoop(); - game.run(); + Player player = new Player("Dave"); + TravelEngine travelEngine = new TravelEngine(player); + game.run(travelEngine); } public CommandListener getCmdListener(){ diff --git a/src/main/java/org/bitbiome/classes/InteractionLoop.java b/src/main/java/org/bitbiome/classes/InteractionLoop.java index 6566b0a..879c345 100644 --- a/src/main/java/org/bitbiome/classes/InteractionLoop.java +++ b/src/main/java/org/bitbiome/classes/InteractionLoop.java @@ -8,11 +8,12 @@ public class InteractionLoop { Scanner input = new Scanner(System.in); - public void run() { + public void run(TravelEngine travelEngine) { boolean isRunning = true; + System.out.println("Willkommen zu BitBiome " + travelEngine.getPlayer().getName() + "!\n\n"); while (isRunning) { String line = input.nextLine().toLowerCase(); - if (!Boot.instance.getCmdListener().perform(line.toLowerCase().split(" ")[0], input, isRunning, line)) { + if (!Boot.instance.getCmdListener().perform(line.toLowerCase().split(" ")[0], input, isRunning, line, travelEngine)) { System.out.println("Unknown Command"); } } diff --git a/src/main/java/org/bitbiome/commands/CommandAPI.java b/src/main/java/org/bitbiome/commands/CommandAPI.java index d3a67c6..a5c48be 100644 --- a/src/main/java/org/bitbiome/commands/CommandAPI.java +++ b/src/main/java/org/bitbiome/commands/CommandAPI.java @@ -1,8 +1,10 @@ package org.bitbiome.commands; +import org.bitbiome.classes.TravelEngine; + import java.util.Scanner; public interface CommandAPI { - public void performCommand(Scanner scanner, boolean isRunning, String message); + public void performCommand(Scanner scanner, boolean isRunning, String message, TravelEngine travelEngine); } diff --git a/src/main/java/org/bitbiome/commands/CommandListener.java b/src/main/java/org/bitbiome/commands/CommandListener.java index 2e62105..d1dd278 100644 --- a/src/main/java/org/bitbiome/commands/CommandListener.java +++ b/src/main/java/org/bitbiome/commands/CommandListener.java @@ -1,5 +1,7 @@ package org.bitbiome.commands; +import org.bitbiome.classes.TravelEngine; + import java.util.HashMap; import java.util.Scanner; @@ -21,11 +23,11 @@ public class CommandListener { } - public boolean perform(String command, Scanner scanner, boolean isRunning, String message) { + public boolean perform(String command, Scanner scanner, boolean isRunning, String message, TravelEngine travelEngine) { CommandAPI cmd; if ((cmd = commands.get(command)) != null) { - cmd.performCommand(scanner, isRunning, message); + cmd.performCommand(scanner, isRunning, message, travelEngine); return true; } return false; diff --git a/src/main/java/org/bitbiome/commands/HelpCommand.java b/src/main/java/org/bitbiome/commands/HelpCommand.java index 4d88e3a..ce85922 100644 --- a/src/main/java/org/bitbiome/commands/HelpCommand.java +++ b/src/main/java/org/bitbiome/commands/HelpCommand.java @@ -1,6 +1,7 @@ package org.bitbiome.commands; import org.bitbiome.Boot; +import org.bitbiome.classes.TravelEngine; import java.util.HashMap; import java.util.Scanner; @@ -9,7 +10,7 @@ public class HelpCommand implements CommandAPI { @Override - public void performCommand(Scanner scanner, boolean isRunning, String message) { + public void performCommand(Scanner scanner, boolean isRunning, String message, TravelEngine travelEngine) { System.out.println(getHelpMessage()); } diff --git a/src/main/java/org/bitbiome/commands/QuitCommand.java b/src/main/java/org/bitbiome/commands/QuitCommand.java index d969852..25dbb00 100644 --- a/src/main/java/org/bitbiome/commands/QuitCommand.java +++ b/src/main/java/org/bitbiome/commands/QuitCommand.java @@ -1,11 +1,13 @@ package org.bitbiome.commands; +import org.bitbiome.classes.TravelEngine; + import java.util.Scanner; public class QuitCommand implements CommandAPI { @Override - public void performCommand(Scanner scanner, boolean isRunning, String message) { + public void performCommand(Scanner scanner, boolean isRunning, String message, TravelEngine travelEngine) { System.out.println(getQuitMessage()); System.exit(0); } From 201e2aa1fb739ff9db261c786c671bf24ae1eb6f Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 18:55:52 +0100 Subject: [PATCH 10/17] Created class with ansi color codes --- .../java/org/bitbiome/classes/Colors.java | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/main/java/org/bitbiome/classes/Colors.java diff --git a/src/main/java/org/bitbiome/classes/Colors.java b/src/main/java/org/bitbiome/classes/Colors.java new file mode 100644 index 0000000..d08f59e --- /dev/null +++ b/src/main/java/org/bitbiome/classes/Colors.java @@ -0,0 +1,56 @@ +package org.bitbiome.classes; + +public class Colors { + + public static final String ANSI_RESET = "\u001B[0m"; + + public static final String ANSI_BLACK = "\u001B[30m"; + public static final String ANSI_RED = "\u001B[31m"; + public static final String ANSI_GREEN = "\u001B[32m"; + public static final String ANSI_YELLOW = "\u001B[33m"; + public static final String ANSI_BLUE = "\u001B[34m"; + public static final String ANSI_PURPLE = "\u001B[35m"; + public static final String ANSI_CYAN = "\u001B[36m"; + public static final String ANSI_WHITE = "\u001B[37m"; + + public static final String ANSI_BRIGHT_BLACK = "\u001B[90m"; + public static final String ANSI_BRIGHT_RED = "\u001B[91m"; + public static final String ANSI_BRIGHT_GREEN = "\u001B[92m"; + public static final String ANSI_BRIGHT_YELLOW = "\u001B[93m"; + public static final String ANSI_BRIGHT_BLUE = "\u001B[94m"; + public static final String ANSI_BRIGHT_PURPLE = "\u001B[95m"; + public static final String ANSI_BRIGHT_CYAN = "\u001B[96m"; + public static final String ANSI_BRIGHT_WHITE = "\u001B[97m"; + + public static final String[] FOREGROUNDS = { + ANSI_BLACK, ANSI_RED, ANSI_GREEN, ANSI_YELLOW, + ANSI_BLUE, ANSI_PURPLE, ANSI_CYAN, ANSI_WHITE, + ANSI_BRIGHT_BLACK, ANSI_BRIGHT_RED, ANSI_BRIGHT_GREEN, ANSI_BRIGHT_YELLOW, + ANSI_BRIGHT_BLUE, ANSI_BRIGHT_PURPLE, ANSI_BRIGHT_CYAN, ANSI_BRIGHT_WHITE + }; + + public static final String ANSI_BG_BLACK = "\u001B[40m"; + public static final String ANSI_BG_RED = "\u001B[41m"; + public static final String ANSI_BG_GREEN = "\u001B[42m"; + public static final String ANSI_BG_YELLOW = "\u001B[43m"; + public static final String ANSI_BG_BLUE = "\u001B[44m"; + public static final String ANSI_BG_PURPLE = "\u001B[45m"; + public static final String ANSI_BG_CYAN = "\u001B[46m"; + public static final String ANSI_BG_WHITE = "\u001B[47m"; + + public static final String ANSI_BRIGHT_BG_BLACK = "\u001B[100m"; + public static final String ANSI_BRIGHT_BG_RED = "\u001B[101m"; + public static final String ANSI_BRIGHT_BG_GREEN = "\u001B[102m"; + public static final String ANSI_BRIGHT_BG_YELLOW = "\u001B[103m"; + public static final String ANSI_BRIGHT_BG_BLUE = "\u001B[104m"; + public static final String ANSI_BRIGHT_BG_PURPLE = "\u001B[105m"; + public static final String ANSI_BRIGHT_BG_CYAN = "\u001B[106m"; + public static final String ANSI_BRIGHT_BG_WHITE = "\u001B[107m"; + + public static final String[] BACKGROUNDS = { + ANSI_BG_BLACK, ANSI_BG_RED, ANSI_BG_GREEN, ANSI_BG_YELLOW, + ANSI_BG_BLUE, ANSI_BG_PURPLE, ANSI_BG_CYAN, ANSI_BG_WHITE, + ANSI_BRIGHT_BG_BLACK, ANSI_BRIGHT_BG_RED, ANSI_BRIGHT_BG_GREEN, ANSI_BRIGHT_BG_YELLOW, + ANSI_BRIGHT_BG_BLUE, ANSI_BRIGHT_BG_PURPLE, ANSI_BRIGHT_BG_CYAN, ANSI_BRIGHT_BG_WHITE }; + +} From 157ceabc59f7473671646ce2d213005746065c68 Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 19:32:30 +0100 Subject: [PATCH 11/17] Edited TravelEngine, added getLocationList and locationExist method --- .../org/bitbiome/classes/TravelEngine.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bitbiome/classes/TravelEngine.java b/src/main/java/org/bitbiome/classes/TravelEngine.java index ec21dde..26a84a1 100644 --- a/src/main/java/org/bitbiome/classes/TravelEngine.java +++ b/src/main/java/org/bitbiome/classes/TravelEngine.java @@ -2,13 +2,19 @@ package org.bitbiome.classes; import org.bitbiome.entities.Location; import org.bitbiome.entities.Player; +import org.json.JSONArray; + +import java.util.ArrayList; public class TravelEngine { - private Location location; + private JSONArray locations; + JsonParser jp; private Player player; public TravelEngine(Player player) { + jp = new JsonParser(); + locations = jp.getJSONObject("../gameconfig.json").getJSONArray("locations"); this.player = player; } @@ -20,4 +26,17 @@ public class TravelEngine { return player; } + public JSONArray getLocationList() { + return locations; + } + + public boolean locationExists(String name) { + boolean found = false; + for (int i = 0; i < locations.length(); i++) + if (locations.getJSONObject(i).getString("name").equals(name)) { + found = true; + } + return found; + } + } From 456b7d8c5994d5701ff6fa6361a78cc377edbacf Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 19:32:41 +0100 Subject: [PATCH 12/17] Added beach to the gameconfig.json --- src/main/resources/gameconfig.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/resources/gameconfig.json b/src/main/resources/gameconfig.json index a29ef19..cb08775 100644 --- a/src/main/resources/gameconfig.json +++ b/src/main/resources/gameconfig.json @@ -33,6 +33,23 @@ ] } ] + }, + { + "name": "Strand", + "items": [ + "Holz", + "Stein" + ], + "mobs": [ + { + "name": "Big Foot", + "hp": 50, + "damage": "10-15", + "items": [ + "Fell" + ] + } + ] } ] } \ No newline at end of file From a9f0ec154b29d75976d1342b74af6cba23550039 Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 19:32:55 +0100 Subject: [PATCH 13/17] Added createBeach method to createLocations class --- src/main/java/org/bitbiome/classes/CreateLocations.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/bitbiome/classes/CreateLocations.java b/src/main/java/org/bitbiome/classes/CreateLocations.java index 5223fdf..ed237a1 100644 --- a/src/main/java/org/bitbiome/classes/CreateLocations.java +++ b/src/main/java/org/bitbiome/classes/CreateLocations.java @@ -14,4 +14,11 @@ public class CreateLocations { String name = "Wald"; return new Location(name, mobs, items); } + + public static Location createBeach() { + ArrayList items = new ArrayList<>(); + ArrayList mobs = new ArrayList<>(); + String name = "Strand"; + return new Location(name, mobs, items); + } } From 06d01e97b44c433bb9c787002b7347bdb220a181 Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 19:44:37 +0100 Subject: [PATCH 14/17] Added location command to get the current location of the player --- .../java/org/bitbiome/commands/CommandListener.java | 1 + .../java/org/bitbiome/commands/LocationCommand.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/main/java/org/bitbiome/commands/LocationCommand.java diff --git a/src/main/java/org/bitbiome/commands/CommandListener.java b/src/main/java/org/bitbiome/commands/CommandListener.java index d1dd278..b1a5378 100644 --- a/src/main/java/org/bitbiome/commands/CommandListener.java +++ b/src/main/java/org/bitbiome/commands/CommandListener.java @@ -16,6 +16,7 @@ public class CommandListener { commands.put("exit", new QuitCommand()); commands.put("quit", new QuitCommand()); + commands.put("location", new LocationCommand()); } public HashMap returnCommands() { diff --git a/src/main/java/org/bitbiome/commands/LocationCommand.java b/src/main/java/org/bitbiome/commands/LocationCommand.java new file mode 100644 index 0000000..5b690d0 --- /dev/null +++ b/src/main/java/org/bitbiome/commands/LocationCommand.java @@ -0,0 +1,13 @@ +package org.bitbiome.commands; + +import org.bitbiome.classes.TravelEngine; + +import java.util.Scanner; + +public class LocationCommand implements CommandAPI{ + + @Override + public void performCommand(Scanner scanner, boolean isRunning, String message, TravelEngine travelEngine) { + System.out.println("Du befindest dich gerade hier: " + travelEngine.getPlayer().getLocation().getName()); + } +} From 48af98341b5989d992e972d02e36c1395d4d2dfc Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 19:45:26 +0100 Subject: [PATCH 15/17] Added Travel command, to travel to different places --- .../bitbiome/commands/CommandListener.java | 1 + .../org/bitbiome/commands/TravelCommand.java | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/main/java/org/bitbiome/commands/TravelCommand.java diff --git a/src/main/java/org/bitbiome/commands/CommandListener.java b/src/main/java/org/bitbiome/commands/CommandListener.java index b1a5378..d59813c 100644 --- a/src/main/java/org/bitbiome/commands/CommandListener.java +++ b/src/main/java/org/bitbiome/commands/CommandListener.java @@ -17,6 +17,7 @@ public class CommandListener { commands.put("exit", new QuitCommand()); commands.put("quit", new QuitCommand()); commands.put("location", new LocationCommand()); + commands.put("travel", new TravelCommand()); } public HashMap returnCommands() { diff --git a/src/main/java/org/bitbiome/commands/TravelCommand.java b/src/main/java/org/bitbiome/commands/TravelCommand.java new file mode 100644 index 0000000..ca68bf5 --- /dev/null +++ b/src/main/java/org/bitbiome/commands/TravelCommand.java @@ -0,0 +1,33 @@ +package org.bitbiome.commands; + +import org.bitbiome.classes.Colors; +import org.bitbiome.classes.CreateLocations; +import org.bitbiome.classes.TravelEngine; +import org.bitbiome.entities.Item; +import org.bitbiome.entities.Location; +import org.bitbiome.entities.Mob; +import org.json.JSONArray; + +import java.util.ArrayList; +import java.util.Scanner; + + +public class TravelCommand implements CommandAPI { + + @Override + public void performCommand(Scanner scanner, boolean isRunning, String message, TravelEngine travelEngine) { + System.out.println(Colors.ANSI_BLUE + "Du hast dein Travel-Pad gezückt. Wohin möchtest du reisen?" + Colors.ANSI_RESET); + JSONArray locations = travelEngine.getLocationList(); + for (int i = 0; i < locations.length(); i++) { + System.out.println("- " + locations.getJSONObject(i).getString("name")); + } + + String locationName = scanner.nextLine(); + if (travelEngine.locationExists(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); + } + } +} From c18cb6190aa674351719c81b4e51e9deebc97be4 Mon Sep 17 00:00:00 2001 From: David Hermann Date: Wed, 18 Jan 2023 19:52:22 +0100 Subject: [PATCH 16/17] refactoring: outsourced current location message --- src/main/java/org/bitbiome/commands/LocationCommand.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bitbiome/commands/LocationCommand.java b/src/main/java/org/bitbiome/commands/LocationCommand.java index 5b690d0..cbbca02 100644 --- a/src/main/java/org/bitbiome/commands/LocationCommand.java +++ b/src/main/java/org/bitbiome/commands/LocationCommand.java @@ -8,6 +8,11 @@ public class LocationCommand implements CommandAPI{ @Override public void performCommand(Scanner scanner, boolean isRunning, String message, TravelEngine travelEngine) { - System.out.println("Du befindest dich gerade hier: " + travelEngine.getPlayer().getLocation().getName()); + System.out.println(getLocationMessage(travelEngine)); + } + + + public static String getLocationMessage(TravelEngine travelEngine) { + return "Du befindest dich gerade hier: " + travelEngine.getPlayer().getLocation().getName(); } } From ec70ab4803b82d109a585892b70208379846564d Mon Sep 17 00:00:00 2001 From: David Hermann Date: Mon, 23 Jan 2023 19:52:36 +0100 Subject: [PATCH 17/17] Summary Commit Boot.java: Added getPlayerSave() InteractionLoop: Asks for name if the player's name is null JsonParser: New method writeObject Travel Engine: getLocationByName() method Edited Help Command Added setter for Player's name New Quiz questions Edited Help unit test Added unit test for Location Command --- src/main/java/org/bitbiome/Boot.java | 12 +- .../org/bitbiome/classes/InteractionLoop.java | 13 +- .../java/org/bitbiome/classes/JsonParser.java | 23 +- .../org/bitbiome/classes/TravelEngine.java | 31 ++- .../org/bitbiome/commands/HelpCommand.java | 14 +- .../java/org/bitbiome/entities/Player.java | 10 +- src/main/resources/quiz.json | 204 ++++++++++++++++++ .../bitbiome/commands/HelpCommandTest.java | 17 +- .../commands/LocationCommandTest.java | 22 ++ 9 files changed, 336 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/quiz.json create mode 100644 src/test/java/org/bitbiome/commands/LocationCommandTest.java diff --git a/src/main/java/org/bitbiome/Boot.java b/src/main/java/org/bitbiome/Boot.java index 9706de6..0f5ebdd 100644 --- a/src/main/java/org/bitbiome/Boot.java +++ b/src/main/java/org/bitbiome/Boot.java @@ -1,9 +1,11 @@ package org.bitbiome; import org.bitbiome.classes.InteractionLoop; +import org.bitbiome.classes.JsonParser; import org.bitbiome.classes.TravelEngine; import org.bitbiome.commands.CommandListener; import org.bitbiome.entities.Player; +import org.json.JSONObject; public class Boot { @@ -13,7 +15,7 @@ public class Boot { instance = this; cmdListener = new CommandListener(); InteractionLoop game = new InteractionLoop(); - Player player = new Player("Dave"); + Player player = getPlayerSave(); TravelEngine travelEngine = new TravelEngine(player); game.run(travelEngine); } @@ -22,6 +24,14 @@ public class Boot { return cmdListener; } + private Player getPlayerSave() { + String name; + JsonParser jp = new JsonParser(); + JSONObject playerconfig = jp.getJSONObject("playerconfig.json"); + name = playerconfig.getString("name"); + return new Player(name); + } + } diff --git a/src/main/java/org/bitbiome/classes/InteractionLoop.java b/src/main/java/org/bitbiome/classes/InteractionLoop.java index 879c345..2523644 100644 --- a/src/main/java/org/bitbiome/classes/InteractionLoop.java +++ b/src/main/java/org/bitbiome/classes/InteractionLoop.java @@ -1,7 +1,7 @@ package org.bitbiome.classes; import org.bitbiome.Boot; - +import org.json.JSONObject; import java.util.Scanner; public class InteractionLoop { @@ -10,7 +10,16 @@ public class InteractionLoop { public void run(TravelEngine travelEngine) { boolean isRunning = true; - System.out.println("Willkommen zu BitBiome " + travelEngine.getPlayer().getName() + "!\n\n"); + if (travelEngine.getPlayer().getName().equals("null")) { + System.out.println(Colors.ANSI_BLUE + "Oh, ein Fremder!\nBist du bereit für dein womöglich größtes Abenteuer?\nDann sag mir doch zunächst wie du heißt: " + Colors.ANSI_RESET); + String name = input.nextLine(); + JsonParser jp = new JsonParser(); + JSONObject playerconf = jp.getJSONObject("playerconfig.json"); + playerconf.put("name", name); + travelEngine.getPlayer().setName(name); + jp.writeObject("playerconfig.json", playerconf); + } + System.out.println(Colors.ANSI_BG_CYAN + Colors.ANSI_BLACK + "Willkommen zu BitBiome " + travelEngine.getPlayer().getName() + "!" + Colors.ANSI_RESET + "\n\n"); while (isRunning) { String line = input.nextLine().toLowerCase(); if (!Boot.instance.getCmdListener().perform(line.toLowerCase().split(" ")[0], input, isRunning, line, travelEngine)) { diff --git a/src/main/java/org/bitbiome/classes/JsonParser.java b/src/main/java/org/bitbiome/classes/JsonParser.java index e63dd87..0eb23d5 100644 --- a/src/main/java/org/bitbiome/classes/JsonParser.java +++ b/src/main/java/org/bitbiome/classes/JsonParser.java @@ -2,8 +2,14 @@ package org.bitbiome.classes; import org.json.JSONObject; import org.json.JSONTokener; +import org.json.JSONWriter; +import java.io.FileWriter; +import java.io.IOException; import java.io.InputStream; +import java.io.StringWriter; + + public class JsonParser { @@ -23,14 +29,27 @@ public class JsonParser { */ public JSONObject getJSONObject(String fileName) { - String resourceName = "./../../" + fileName; + String resourceName = "./../../../" + fileName; InputStream is = JsonParser.class.getResourceAsStream(resourceName); if (is == null) { throw new NullPointerException("Cannot find resource file " + resourceName); } JSONTokener tokener = new JSONTokener(is); - return new JSONObject(tokener); } + + public void writeObject(String fileName, JSONObject object) { + + String resourceName = System.getProperty("user.dir") + "/src/main/resources/" + fileName; + try { + FileWriter fw = new FileWriter(resourceName, false); + fw.write(object.toString(1)); + fw.close(); + } catch (IOException e) { + throw new RuntimeException(e); + } + + + } } diff --git a/src/main/java/org/bitbiome/classes/TravelEngine.java b/src/main/java/org/bitbiome/classes/TravelEngine.java index 26a84a1..a8d3213 100644 --- a/src/main/java/org/bitbiome/classes/TravelEngine.java +++ b/src/main/java/org/bitbiome/classes/TravelEngine.java @@ -3,23 +3,28 @@ package org.bitbiome.classes; import org.bitbiome.entities.Location; import org.bitbiome.entities.Player; import org.json.JSONArray; +import org.json.JSONObject; import java.util.ArrayList; public class TravelEngine { private JSONArray locations; - JsonParser jp; + private JsonParser jp; private Player player; public TravelEngine(Player player) { jp = new JsonParser(); - locations = jp.getJSONObject("../gameconfig.json").getJSONArray("locations"); + locations = jp.getJSONObject("gameconfig.json").getJSONArray("locations"); this.player = player; } public void travelTo(Location location) { player.setLocation(location); + JSONObject jObj = jp.getJSONObject("playerconfig.json"); + jObj.put("currentLocation", location.getName()); + + jp.writeObject("playerconfig.json", jObj); } public Player getPlayer() { @@ -39,4 +44,26 @@ public class TravelEngine { return found; } + public Location getLocationByName(String name) { + JsonParser jp = new JsonParser(); + JSONObject gameconfig = jp.getJSONObject("gameconfig.json"); + JSONArray locations = gameconfig.getJSONArray("locations"); + JSONObject location = null; + if (locationExists(name)) { + for (int i = 0; i < locations.length(); i++) { + if (locations.getJSONObject(i).getString("name").equals(name)) { + location = locations.getJSONObject(i); + } + } + assert location != null; + //TODO Create Location by name and add mobs and times to the location + JSONArray items = location.getJSONArray("items"); + JSONArray mobs = location.getJSONArray("mobs"); + System.out.println(items.toString(1)); + System.out.println(mobs.toString(1)); + return new Location(name, new ArrayList<>(), new ArrayList<>()); + } else { + return null; + } + } } diff --git a/src/main/java/org/bitbiome/commands/HelpCommand.java b/src/main/java/org/bitbiome/commands/HelpCommand.java index ce85922..90702cc 100644 --- a/src/main/java/org/bitbiome/commands/HelpCommand.java +++ b/src/main/java/org/bitbiome/commands/HelpCommand.java @@ -1,6 +1,7 @@ package org.bitbiome.commands; import org.bitbiome.Boot; +import org.bitbiome.classes.Colors; import org.bitbiome.classes.TravelEngine; import java.util.HashMap; @@ -16,7 +17,18 @@ public class HelpCommand implements CommandAPI { public static String getHelpMessage() { StringBuilder outputMessage = new StringBuilder(); - outputMessage.append("Hier ist eine Liste der Commands:\n").append("- help -> Gibt diese Nachricht aus\n").append("- exit/quit -> Beendet das Spiel\n"); + outputMessage + .append("|______________|_____________________________|\n") + .append("|" + Colors.ANSI_PURPLE + " Command" + Colors.ANSI_RESET + " | " + Colors.ANSI_PURPLE + "Description" + Colors.ANSI_RESET + " |\n") + .append("|--------------|-----------------------------|\n") + .append("|" + Colors.ANSI_GREEN + " help" + Colors.ANSI_RESET + " | Gibt diese Nachricht aus |\n") + .append("|--------------|-----------------------------|\n") + .append("|" + Colors.ANSI_GREEN + " exit/quit" + Colors.ANSI_RESET + " | Beendet das Spiel |\n") + .append("|--------------|-----------------------------|\n") + .append("|" + Colors.ANSI_GREEN + " travel" + Colors.ANSI_RESET + " | Startet das Reise System |\n") + .append("|--------------|-----------------------------|\n") + .append("|" + Colors.ANSI_GREEN + " location" + Colors.ANSI_RESET + " | Gibt deine Location aus |\n") + .append("|______________|_____________________________|\n"); return outputMessage.toString(); } diff --git a/src/main/java/org/bitbiome/entities/Player.java b/src/main/java/org/bitbiome/entities/Player.java index 8f07072..6fe3152 100644 --- a/src/main/java/org/bitbiome/entities/Player.java +++ b/src/main/java/org/bitbiome/entities/Player.java @@ -1,6 +1,7 @@ package org.bitbiome.entities; import org.bitbiome.classes.CreateLocations; +import org.bitbiome.classes.JsonParser; import java.util.ArrayList; @@ -11,10 +12,13 @@ public class Player { private ArrayList inventory; + private JsonParser jp; + public Player(String name) { + jp = new JsonParser(); this.name = name; hp = 100.0F; - location = CreateLocations.createForest(); + location = new Location(jp.getJSONObject("playerconfig.json").getString("currentLocation"), new ArrayList<>(), new ArrayList<>()); inventory = new ArrayList<>(); } @@ -50,4 +54,8 @@ public class Player { return inventory.remove(item); } + public void setName(String name) { + this.name = name; + } + } diff --git a/src/main/resources/quiz.json b/src/main/resources/quiz.json new file mode 100644 index 0000000..cc58a3f --- /dev/null +++ b/src/main/resources/quiz.json @@ -0,0 +1,204 @@ +{ + "Quiz": [ + { + "frage": "Wie lang ist der Äquator der Erde?", + "antworten": [ + "20.000m", + "30km", + "60.000km", + "40.000km" + ], + "korrekteAntwort": "40.000km" + }, + { + "frage": "Was ist der längste Fluss der Welt?", + "antworten": [ + "Amazonas", + "Nil", + "Rhein", + "Niger" + ], + "korrekteAntwort": "Nil" + }, + { + "frage": "Wie viele Tasten hat ein Klavier?", + "antworten": [ + "74", + "86", + "82", + "88" + ], + "korrekteAntwort": "88" + }, + { + "frage": "Von wem wird der Bundespräsident gewählt?", + "antworten": [ + "Vom Europäischen Parlament", + "Vom Bundeskanzler", + "Vom Bundestag", + "Von der Bundesversammlung" + ], + "korrekteAntwort": "von der Bundesversammlung" + }, + { + "frage": "Welches Land produziert jährlich die meisten Filme?", + "antworten": [ + "USA", + "Indien", + "Japan", + "Nigeria" + ], + "korrekteAntwort": "Indien" + }, + { + "frage": "Wie heißt der am schnellsten schwimmende Fisch auf Erden?", + "antworten": [ + "Flugfisch", + "Tigerhai", + "Segelfisch", + "Windfisch" + ], + "korrekteAntwort": "Segelfisch" + }, + { + "frage": "Was ist KEIN Gewächs?", + "antworten": [ + "Geranie", + "Moosfarn", + "Incolornis", + "Strandflieder" + ], + "korrekteAntwort": "Incolornis" + }, + { + "frage": "Was nutzt eine Fledermaus zur Orientierung in der Luft?", + "antworten": [ + "Infrarot", + "Röntgenstrahlen", + "Speichel", + "Ultraschall" + ], + "korrekteAntwort": "Ultraschall" + }, + { + "frage": "Von wem stammt der berühmte Satz: 'Ich denke, also bin ich'?", + "antworten": [ + "John Fitzgerald Kennedy", + "George Walker Bush", + "René Descartes", + "Julius Caesar" + ], + "korrekteAntwort": "René Descartes" + }, + { + "frage": "Welches Lebensmittel enthält das meiste Wasser?", + "antworten": [ + "Gurke", + "Wassermelone", + "Zitrone", + "Paprika" + ], + "korrekteAntwort": "Gurke" + }, + { + "frage": "Welches Lebensmittel gehört im botanischen Sinne zu den Früchten?", + "antworten": [ + "Möhre", + "Kartoffel", + "Tomate", + "Weißkohl" + ], + "korrekteAntwort": "Tomate" + }, + { + "frage": "Haptische Wahrnehmung beruht auf dem...?", + "antworten": [ + "Greifreflex", + "Gleichgewichtssinn", + "Hörsinn", + "Tastsinn" + ], + "korrekteAntwort": "Tastsinn" + }, + { + "frage": "Wie nennt man den letzten Tanz einer Tanzveranstaltung?", + "antworten": [ + "Voraus", + "Garaus", + "Kehraus", + "Durchaus" + ], + "korrekteAntwort": "Kehraus" + }, + { + "frage": "Wie nennt man ein tiefes, enges Tal, durch das ein Gebirgsbach fließt?", + "antworten": [ + "Klamm", + "Feucht", + "Nass", + "Schwamm" + ], + "korrekteAntwort": "Klamm" + }, + { + "frage": "Wer oder was ist Gerbera?", + "antworten": [ + "eine europäische Landschaft", + "eine Pflanze", + "die erste Präsidentin von Südafrika", + "eine Stadt in Lichtenstein" + ], + "korrekteAntwort": "eine Pflanze" + }, + { + "frage": "Nach wem wurde ein Gesellschaftsanzug benannt?", + "antworten": [ + "Richard von Weizsäcker", + "Gustav Heinemann", + "Jürgen Klinsmann", + "Gustav Stresemann" + ], + "korrekteAntwort": "Gustav Stresemann" + }, + { + "frage": "Was ist Speckstein?", + "antworten": [ + "eine Fischart, die sich als Stein tarnt", + "ein Gericht aus dem Mittelalter", + "eine Skulptur im Römischen Reich unter Nero", + "ein besonders weicher Stein" + ], + "korrekteAntwort": "ein besonders weicher Stein" + }, + { + "frage": "In welcher Religion gibt es Gurus?", + "antworten": [ + "im Christentum", + "im Hinduismus", + "im Islam", + "im Judentum" + ], + "korrekteAntwort": "im Hinduismus" + }, + { + "frage": "Was versteht man unter Brunsbüttel?", + "antworten": [ + "eine Industriestadt an der Unterelbe", + "einen Plakatkleber", + "eine 630 Mark-Kraft", + "ein Staatssekretär" + ], + "korrekteAntwort": "eine Industriestadt an der Unterelbe" + }, + { + "frage": "Welcher im 11. Jahrhundert gegründeter Orden rettet und pfelgt auch noch heute Verletzte und Kranke?", + "antworten": [ + "die Dominikaner", + "die Augustiner", + "die Zisterzienser", + "die Johanniter" + ], + "korrekteAntwort": "die Johanniter" + } + ] +} \ No newline at end of file diff --git a/src/test/java/org/bitbiome/commands/HelpCommandTest.java b/src/test/java/org/bitbiome/commands/HelpCommandTest.java index 75006ed..dab4d90 100644 --- a/src/test/java/org/bitbiome/commands/HelpCommandTest.java +++ b/src/test/java/org/bitbiome/commands/HelpCommandTest.java @@ -1,14 +1,29 @@ package org.bitbiome.commands; +import org.bitbiome.classes.Colors; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class HelpCommandTest { @Test public void testHelpCommand() { String helpMessage = HelpCommand.getHelpMessage(); - assertEquals("Hier ist eine Liste der Commands:\n- help -> Gibt diese Nachricht aus\n- exit/quit -> Beendet das Spiel\n", helpMessage); + StringBuilder outputMessage = new StringBuilder(); + outputMessage + .append("|______________|_____________________________|\n") + .append("|" + Colors.ANSI_PURPLE + " Command" + Colors.ANSI_RESET + " | " + Colors.ANSI_PURPLE + "Description" + Colors.ANSI_RESET + " |\n") + .append("|--------------|-----------------------------|\n") + .append("|" + Colors.ANSI_GREEN + " help" + Colors.ANSI_RESET + " | Gibt diese Nachricht aus |\n") + .append("|--------------|-----------------------------|\n") + .append("|" + Colors.ANSI_GREEN + " exit/quit" + Colors.ANSI_RESET + " | Beendet das Spiel |\n") + .append("|--------------|-----------------------------|\n") + .append("|" + Colors.ANSI_GREEN + " travel" + Colors.ANSI_RESET + " | Startet das Reise System |\n") + .append("|--------------|-----------------------------|\n") + .append("|" + Colors.ANSI_GREEN + " location" + Colors.ANSI_RESET + " | Gibt deine Location aus |\n") + .append("|______________|_____________________________|\n"); + assertEquals(outputMessage.toString(), helpMessage); } diff --git a/src/test/java/org/bitbiome/commands/LocationCommandTest.java b/src/test/java/org/bitbiome/commands/LocationCommandTest.java new file mode 100644 index 0000000..23c6541 --- /dev/null +++ b/src/test/java/org/bitbiome/commands/LocationCommandTest.java @@ -0,0 +1,22 @@ +package org.bitbiome.commands; + +import org.bitbiome.classes.TravelEngine; +import org.bitbiome.entities.Player; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.Arrays; + +public class LocationCommandTest { + + @Test + public void testLocationCommand() { + Player p = new Player("Unit"); + TravelEngine tE = new TravelEngine(p); + String[] standorte = {"Wald", "Strand"}; + String locationMessage = LocationCommand.getLocationMessage(tE).split(": ")[1]; + assertTrue(Arrays.asList(standorte).contains(locationMessage)); + } + +}