From c17d459c5cf87925975b1432fd48ecce243f39f5 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris.kearney@urbanairship.com>
Date: Mon, 1 Sep 2014 14:06:24 -0700
Subject: [PATCH] fight messages look nicer
---
.../com/comandante/creeper/fight/FightManager.java | 8 ++++----
.../comandante/creeper/server/ChannelUtils.java | 14 ++++++++++----
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/comandante/creeper/fight/FightManager.java b/src/main/java/com/comandante/creeper/fight/FightManager.java
index b9eb943e..b70fa3a3 100644
--- a/src/main/java/com/comandante/creeper/fight/FightManager.java
+++ b/src/main/java/com/comandante/creeper/fight/FightManager.java
@@ -52,9 +52,9 @@ public class FightManager {
}
if (damageToVictim > 0) {
doNpcDamage(npc.getEntityId(), damageToVictim);
- channelUtils.writeNoPrompt(player.getPlayerId(), damageToVictim + Color.BOLD_ON + Color.RED + " damage" + Color.RESET + " done to " + npc.getColorName());
+ channelUtils.writeNoPromptNoAfterSpace(player.getPlayerId(), damageToVictim + Color.BOLD_ON + Color.RED + " damage" + Color.RESET + " done to " + npc.getColorName());
} else {
- channelUtils.writeNoPrompt(player.getPlayerId(), "You miss " + npc.getName());
+ channelUtils.writeNoPromptNoAfterSpace(player.getPlayerId(), "You miss " + npc.getName());
}
try {
Thread.sleep(600);
@@ -68,9 +68,9 @@ public class FightManager {
int damageBack = getAttack(victim, challenger);
if (randInt(0, 100) < chanceToHitBack) {
doPlayerDamage(player.getPlayerId(), damageBack);
- channelUtils.writeNoPrompt(player.getPlayerId(), npc.getColorName() + Color.BOLD_ON + Color.RED + " damages" + Color.RESET + " you for " + damageBack);
+ channelUtils.writeNoPromptNoAfterSpace(player.getPlayerId(), npc.getColorName() + Color.BOLD_ON + Color.RED + " damages" + Color.RESET + " you for " + damageBack);
} else {
- channelUtils.writeNoPrompt(player.getPlayerId(), npc.getColorName() + " misses you");
+ channelUtils.writeNoPromptNoAfterSpace(player.getPlayerId(), npc.getColorName() + " misses you");
}
try {
Thread.sleep(600);
diff --git a/src/main/java/com/comandante/creeper/server/ChannelUtils.java b/src/main/java/com/comandante/creeper/server/ChannelUtils.java
index 0799b252..b6116bb6 100644
--- a/src/main/java/com/comandante/creeper/server/ChannelUtils.java
+++ b/src/main/java/com/comandante/creeper/server/ChannelUtils.java
@@ -18,7 +18,11 @@ public class ChannelUtils {
}
public void writeNoPrompt(String playerId, String message) {
- write(playerId, message, false);
+ write(playerId, message, false, true);
+ }
+
+ public void writeNoPromptNoAfterSpace(String playerId, String message) {
+ write(playerId, message, false, false);
}
public void writeOnlyPrompt(String playerId) {
@@ -41,16 +45,18 @@ public class ChannelUtils {
public void write(String playerId, String message) {
- write(playerId, message, true);
+ write(playerId, message, true, true);
}
- public void write(String playerId, String message, boolean isPrompt) {
+ public void write(String playerId, String message, boolean isPrompt, boolean isAfterSpace) {
Player player = playerManager.getPlayer(playerId);
Room playerCurrentRoom = roomManager.getPlayerCurrentRoom(player).get();
StringBuilder sb = new StringBuilder();
sb.append("\r\n");
sb.append(sanitze(message));
- sb.append(("\r\n"));
+ if (isAfterSpace) {
+ sb.append(("\r\n"));
+ }
if (isPrompt) {
sb.append(playerManager.getPrompt(playerId, playerCurrentRoom.getRoomId()));
}
--
GitLab