knikamo · zupercool · Mar 4, 2016
diff --git a/src/Avatar.class b/src/Avatar.class
diff --git a/src/Backpack.class b/src/Backpack.class
diff --git a/src/Book.class b/src/Book.class
diff --git a/src/BuildWorld.class b/src/BuildWorld.class
diff --git a/src/Course.class b/src/Course.class
diff --git a/src/Creature.class b/src/Creature.class
diff --git a/src/EmptyFileException.class b/src/EmptyFileException.class
diff --git a/src/Item.class b/src/Item.class
diff --git a/src/Key.class b/src/Key.class
diff --git a/src/ListToString.class b/src/ListToString.class
diff --git a/src/MudGame.class b/src/MudGame.class
diff --git a/src/NonExistingRoomException.class b/src/NonExistingRoomException.class
diff --git a/src/Room.class b/src/Room.class
diff --git a/src/Sfinx.class b/src/Sfinx.class
diff --git a/src/Student.class b/src/Student.class
diff --git a/src/Teacher.class b/src/Teacher.class
diff --git a/src/World.class b/src/World.class
diff --git 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++) {