diff --git a/src/Avatar.class b/src/Avatar.class new file mode 100644 index 0000000..d0ac07b Binary files /dev/null and b/src/Avatar.class differ diff --git a/src/Backpack.class b/src/Backpack.class new file mode 100644 index 0000000..e8a0a88 Binary files /dev/null and b/src/Backpack.class differ diff --git a/src/Book.class b/src/Book.class new file mode 100644 index 0000000..593bfdc Binary files /dev/null and b/src/Book.class differ diff --git a/src/BuildWorld.class b/src/BuildWorld.class new file mode 100644 index 0000000..481a9b3 Binary files /dev/null and b/src/BuildWorld.class differ diff --git a/src/Course.class b/src/Course.class new file mode 100644 index 0000000..1df6b78 Binary files /dev/null and b/src/Course.class differ diff --git a/src/Creature.class b/src/Creature.class new file mode 100644 index 0000000..02863fc Binary files /dev/null and b/src/Creature.class differ diff --git a/src/EmptyFileException.class b/src/EmptyFileException.class new file mode 100644 index 0000000..0b378ce Binary files /dev/null and b/src/EmptyFileException.class differ diff --git a/src/Item.class b/src/Item.class new file mode 100644 index 0000000..216d32c Binary files /dev/null and b/src/Item.class differ diff --git a/src/Key.class b/src/Key.class new file mode 100644 index 0000000..68a815d Binary files /dev/null and b/src/Key.class differ diff --git a/src/ListToString.class b/src/ListToString.class new file mode 100644 index 0000000..4f03c52 Binary files /dev/null and b/src/ListToString.class differ diff --git a/src/MudGame.class b/src/MudGame.class new file mode 100644 index 0000000..2814d8d Binary files /dev/null and b/src/MudGame.class differ diff --git a/src/NonExistingRoomException.class b/src/NonExistingRoomException.class new file mode 100644 index 0000000..7f1e907 Binary files /dev/null and b/src/NonExistingRoomException.class differ diff --git a/src/Room.class b/src/Room.class new file mode 100644 index 0000000..6ccc358 Binary files /dev/null and b/src/Room.class differ diff --git a/src/Sfinx.class b/src/Sfinx.class new file mode 100644 index 0000000..090fc1f Binary files /dev/null and b/src/Sfinx.class differ diff --git a/src/Student.class b/src/Student.class new file mode 100644 index 0000000..40f89a3 Binary files /dev/null and b/src/Student.class differ diff --git a/src/Teacher.class b/src/Teacher.class new file mode 100644 index 0000000..3fe9fe8 Binary files /dev/null and b/src/Teacher.class differ diff --git a/src/World.class b/src/World.class new file mode 100644 index 0000000..a868a98 Binary files /dev/null and b/src/World.class differ diff --git a/src/World.java b/src/World.java index e717105..5e565e5 100644 --- a/src/World.java +++ b/src/World.java @@ -58,17 +58,16 @@ public void createWorld(String name) { placeKeys(); placeBooks(); placeCreatures(); - printRooms(); + //printRooms(); System.out.println(currentRoom); } - public void runGame() { Scanner reader = new Scanner(System.in); Boolean continueGame = true; - + while (continueGame) { reader = new Scanner(System.in); System.out.print("What's next?\n> "); @@ -79,15 +78,9 @@ public void runGame() { switch (splitInput[0].toLowerCase()) { case "help": printHelp(); break; - - case "show": - if (twoWords && splitInput[1].toLowerCase().equals("hp")) - System.out.println("Current HP: " + player.getHp()); - if (twoWords && splitInput[1].toLowerCase().equals("ongoing")) - player.printOngoing(); - if (twoWords && splitInput[1].toLowerCase().equals("completed")) - player.printCompleted(); - break; + + //EX2 + case "show": printShow(twoWords, splitInput[1]); break; case "drop": if (twoWords) @@ -135,6 +128,15 @@ public void runGame() { reader.close(); } + private void printShow(Boolean twoWords, String splitInput) { + if (twoWords && splitInput.toLowerCase().equals("hp")) + System.out.println("Current HP: " + player.getHp()); + if (twoWords && splitInput.toLowerCase().equals("ongoing")) + player.printOngoing(); + if (twoWords && splitInput.toLowerCase().equals("completed")) + player.printCompleted(); + } + private void printHelp() { System.out.println(currentRoom); String help = "--------------------------------------------\n"; @@ -351,6 +353,7 @@ private void placeCreatures() { } } + //EX3 private void placeBooks() { int numberOfCourses = courses.size(); int numberOfStudents = students.size(); @@ -376,7 +379,7 @@ private void placeRandom(Object o) { } } - + //EX1 // TODO: Ta bort när allt är klart! public void printRooms() { for (int i = 0; i < numberOfRooms; i++) {