Skip to content
Snippets Groups Projects
Commit c17d459c authored by Chris Kearney's avatar Chris Kearney
Browse files

fight messages look nicer

parent 3986251c
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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()));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment