diff --git a/src/main/java/com/comandante/creeper/bot/commands/RandomRoomDescriptionCommand.java b/src/main/java/com/comandante/creeper/bot/commands/RandomRoomDescriptionCommand.java index 0524fd320ecd5947cf4aafd1e03975b1b8846fc3..054d8d80686753af7e5cc6229d4d4ffee403e1a2 100644 --- a/src/main/java/com/comandante/creeper/bot/commands/RandomRoomDescriptionCommand.java +++ b/src/main/java/com/comandante/creeper/bot/commands/RandomRoomDescriptionCommand.java @@ -2,7 +2,9 @@ package com.comandante.creeper.bot.commands; import com.comandante.creeper.bot.BotCommandManager; +import com.comandante.creeper.world.Coords; import com.comandante.creeper.world.Room; +import com.google.api.client.util.Lists; import com.google.common.collect.Sets; import java.util.*; @@ -23,7 +25,17 @@ public class RandomRoomDescriptionCommand extends BotCommand { Map<Integer, Room> getrooms = botCommandManager.getGameManager().getRoomManager().getrooms(); int size = getrooms.size(); int randomRoomNumber = randInt(1, size); - return Collections.singletonList(getrooms.get(randomRoomNumber).getRoomDescription()); + Room randomRoom = getrooms.get(randomRoomNumber); + ArrayList<String> output = Lists.newArrayList(); + output.add(randomRoom.getRoomTitle()); + output.add(" "); + output.add(randomRoom.getRoomDescription()); + String mapString = botCommandManager.getGameManager().getMapsManager().drawMap(randomRoom.getRoomId(), new Coords(5, 5)); + String[] split = mapString.split("\\r?\\n"); + for (String s: split) { + output.add(s); + } + return output; } private int randInt(int min, int max) { diff --git a/src/main/java/com/comandante/creeper/world/MapMatrix.java b/src/main/java/com/comandante/creeper/world/MapMatrix.java index 4fa0ffd4376f1da14b0860bca4f75c4fcf09e7a7..4b8ee70b9c7a80c13d2bd88a17baddd7f622d55b 100644 --- a/src/main/java/com/comandante/creeper/world/MapMatrix.java +++ b/src/main/java/com/comandante/creeper/world/MapMatrix.java @@ -171,7 +171,6 @@ public class MapMatrix { }; } - public String getCsv() { StringBuilder sb = new StringBuilder(); for (List<Integer> list : matrix) {