From 32d65c5f25ba5f4d738d4440f394b07eacb28f27 Mon Sep 17 00:00:00 2001
From: d0tslash <brian@kearneymail.com>
Date: Mon, 25 Aug 2014 23:22:03 -0700
Subject: [PATCH] cleanuptime
---
.../comandante/creeper/Items/ItemType.java | 6 +-
.../creeper/managers/GameManager.java | 55 +++----------------
.../com/comandante/creeper/npc/Derper.java | 12 +---
3 files changed, 14 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/comandante/creeper/Items/ItemType.java b/src/main/java/com/comandante/creeper/Items/ItemType.java
index 2a1cad59..75b25ce7 100644
--- a/src/main/java/com/comandante/creeper/Items/ItemType.java
+++ b/src/main/java/com/comandante/creeper/Items/ItemType.java
@@ -10,7 +10,7 @@ public enum ItemType {
UNKNOWN(0, "", "", "", false, 0, 0),
KEY(1, "key", new StringBuilder()
.append(YELLOW)
- .append(" a shiny gold key")
+ .append("a shiny gold key")
.append(RESET).toString(),
"A basic key with nothing really remarkable other than its made of gold.",
false,
@@ -18,7 +18,7 @@ public enum ItemType {
2),
BOOK(2, "book", new StringBuilder()
.append(RED)
- .append(" an ancient leather bound book")
+ .append("an ancient leather bound book")
.append(RESET).toString(),
"An ancient book with mysterious engravings.",
false,
@@ -26,7 +26,7 @@ public enum ItemType {
2),
BEER(3, "beer", new StringBuilder()
.append(YELLOW)
- .append(" a cold frosty beer")
+ .append("a cold frosty beer")
.append(RESET).toString(),
"A coors light.",
true,
diff --git a/src/main/java/com/comandante/creeper/managers/GameManager.java b/src/main/java/com/comandante/creeper/managers/GameManager.java
index 4de6572d..3c3e3cee 100644
--- a/src/main/java/com/comandante/creeper/managers/GameManager.java
+++ b/src/main/java/com/comandante/creeper/managers/GameManager.java
@@ -218,48 +218,6 @@ public class GameManager {
sb.append(RESET);
sb.append(WordUtils.wrap(playerCurrentRoom.getRoomDescription(), 80)).append("\r\n");
- if (playerCurrentRoom.getNorthId().isPresent()) {
- Room room = roomManager.getRoom(playerCurrentRoom.getNorthId().get());
- sb.append("North - ");
- if (room != null) {
- sb.append(room.getRoomTitle()).append("\r\n");
- }
- }
- if (playerCurrentRoom.getSouthId().isPresent()) {
- Room room = roomManager.getRoom(playerCurrentRoom.getSouthId().get());
- sb.append("South - ");
- if (room != null) {
- sb.append(room.getRoomTitle()).append("\r\n");
- }
- }
- if (playerCurrentRoom.getEastId().isPresent()) {
- Room room = roomManager.getRoom(playerCurrentRoom.getEastId().get());
- sb.append("East - ");
- if (room != null) {
- sb.append(room.getRoomTitle()).append("\r\n");
- }
- }
- if (playerCurrentRoom.getWestId().isPresent()) {
- Room room = roomManager.getRoom(playerCurrentRoom.getWestId().get());
- sb.append("West - ");
- if (room != null) {
- sb.append(room.getRoomTitle()).append("\r\n");
- }
- }
- if (playerCurrentRoom.getUpId().isPresent()) {
- Room room = roomManager.getRoom(playerCurrentRoom.getUpId().get());
- sb.append("Up - ");
- if (room != null) {
- sb.append(room.getRoomTitle()).append("\r\n");
- }
- }
- if (playerCurrentRoom.getDownId().isPresent()) {
- Room room = roomManager.getRoom(playerCurrentRoom.getDownId().get());
- sb.append("Down - ");
- if (room != null) {
- sb.append(room.getRoomTitle()).append("\r\n");
- }
- }
sb.append(getExits(playerCurrentRoom, player));
for (String searchPlayerId : playerCurrentRoom.getPresentPlayerIds()) {
if (searchPlayerId.equals(player.getPlayerId())) {
@@ -268,18 +226,21 @@ public class GameManager {
Player searchPlayer = playerManager.getPlayer(searchPlayerId);
sb.append(searchPlayer.getPlayerName()).append(" is here.\r\n");
}
- for (String npcId : playerCurrentRoom.getNpcIds()) {
- Npc npcEntity = entityManager.getNpcEntity(npcId);
- sb.append("A ").append(npcEntity.getColorName()).append(" is here.\r\n");
- }
+
for (String itemId : playerCurrentRoom.getItemIds()) {
Item itemEntity = entityManager.getItemEntity(itemId);
if (itemEntity == null) {
playerCurrentRoom.remotePresentItem(itemId);
continue;
}
- sb.append(entityManager.getItemEntity(itemId).getItemName()).append(" is on the ground.\r\n");
+ sb.append(" ").append(entityManager.getItemEntity(itemId).getItemName()).append(" is on the ground.\r\n");
}
+
+ for (String npcId : playerCurrentRoom.getNpcIds()) {
+ Npc npcEntity = entityManager.getNpcEntity(npcId);
+ sb.append("a ").append(npcEntity.getColorName()).append(" is here.\r\n");
+ }
+
sb.append("\r\n");
channelUtils.write(player.getPlayerId(), sb.toString());
}
diff --git a/src/main/java/com/comandante/creeper/npc/Derper.java b/src/main/java/com/comandante/creeper/npc/Derper.java
index 3f7e2ff7..e74458dc 100644
--- a/src/main/java/com/comandante/creeper/npc/Derper.java
+++ b/src/main/java/com/comandante/creeper/npc/Derper.java
@@ -7,9 +7,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Random;
-import static com.comandante.creeper.model.Color.CYAN;
-import static com.comandante.creeper.model.Color.RED;
-import static com.comandante.creeper.model.Color.RESET;
+import static com.comandante.creeper.model.Color.*;
public class Derper extends Npc {
@@ -17,12 +15,8 @@ public class Derper extends Npc {
private final static String NAME = "derper";
private final Random random;
private final static String colorName = new StringBuilder()
- .append(RED)
- .append("d")
- .append(CYAN)
- .append("erpe")
- .append(RED)
- .append("r")
+ .append(GREEN)
+ .append("Federation Sentry")
.append(RESET).toString();
public Derper(GameManager gameManager, Integer roomId) {
--
GitLab