From fb0add6d8aa1d32bed3e36ab45bc0fd2627696f1 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Thu, 20 Aug 2015 23:16:33 -0700
Subject: [PATCH] sorting the npcs
---
.../comandante/creeper/managers/GameManager.java | 14 +++++++++++---
.../com/comandante/creeper/merchant/Merchant.java | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
mode change 100644 => 100755 src/main/java/com/comandante/creeper/managers/GameManager.java
diff --git a/src/main/java/com/comandante/creeper/managers/GameManager.java b/src/main/java/com/comandante/creeper/managers/GameManager.java
old mode 100644
new mode 100755
index e0221aa3..15cd7fef
--- a/src/main/java/com/comandante/creeper/managers/GameManager.java
+++ b/src/main/java/com/comandante/creeper/managers/GameManager.java
@@ -23,6 +23,7 @@ import com.comandante.creeper.spells.EffectsManager;
import com.comandante.creeper.stat.Stats;
import com.comandante.creeper.stat.StatsBuilder;
import com.comandante.creeper.world.*;
+import com.google.api.client.util.Lists;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Interner;
@@ -337,14 +338,21 @@ public class GameManager {
sb.append(" ").append(entityManager.getItemEntity(itemId).getRestingName()).append("\r\n");
}
+ List<String> npcs = Lists.newArrayList();
for (String npcId : playerCurrentRoom.getNpcIds()) {
+ StringBuilder sbb = new StringBuilder();
Npc npcEntity = entityManager.getNpcEntity(npcId);
if(Main.vowels.contains(Character.toLowerCase(npcEntity.getName().charAt(0)))) {
- sb.append("an ");
+ sbb.append("an ");
} else {
- sb.append("a ");
+ sbb.append("a ");
}
- sb.append(npcEntity.getColorName()).append(" is here.\r\n");
+ sbb.append(npcEntity.getColorName()).append(" is here.\r\n");
+ npcs.add(sbb.toString());
+ }
+ Collections.sort(npcs, String.CASE_INSENSITIVE_ORDER);
+ for (String s: npcs) {
+ sb.append(s);
}
String msg = null;
if (sb.toString().substring(sb.toString().length() - 2).equals("\r\n")) {
diff --git a/src/main/java/com/comandante/creeper/merchant/Merchant.java b/src/main/java/com/comandante/creeper/merchant/Merchant.java
index 8fb7a660..e70bb13e 100755
--- a/src/main/java/com/comandante/creeper/merchant/Merchant.java
+++ b/src/main/java/com/comandante/creeper/merchant/Merchant.java
@@ -41,7 +41,7 @@ public abstract class Merchant extends CreeperEntity {
Table t = new Table(3, BorderStyle.CLASSIC_COMPATIBLE,
ShownBorders.HEADER_FIRST_AND_LAST_COLLUMN);
t.setColumnWidth(0, 5, 5);
- t.setColumnWidth(1, 12, 12);
+ t.setColumnWidth(1, 12, 16);
t.setColumnWidth(2, 50, 69);
t.addCell("#");
t.addCell("price");
--
GitLab