From 9ef2a38f2c2e32e8f1317836e5def2cf966e00d9 Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris.kearney@urbanairship.com>
Date: Sat, 6 Sep 2014 03:25:54 -0700
Subject: [PATCH] refinements
---
src/main/java/com/comandante/creeper/Main.java | 4 ++--
.../com/comandante/creeper/npc/StreetHustler.java | 2 +-
.../com/comandante/creeper/server/ChannelUtils.java | 2 +-
.../{KillCommand.java => FightKillCommand.java} | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
rename src/main/java/com/comandante/creeper/server/command/{KillCommand.java => FightKillCommand.java} (89%)
diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index d9799aea..f033e86c 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -7,6 +7,7 @@ import com.comandante.creeper.managers.SessionManager;
import com.comandante.creeper.npc.StreetHustler;
import com.comandante.creeper.player.PlayerManager;
import com.comandante.creeper.player.PlayerMetadata;
+import com.comandante.creeper.server.command.FightKillCommand;
import com.comandante.creeper.spawner.ItemSpawner;
import com.comandante.creeper.world.Area;
import com.comandante.creeper.world.MapsManager;
@@ -18,7 +19,6 @@ import com.comandante.creeper.server.CreeperServer;
import com.comandante.creeper.server.command.DropCommand;
import com.comandante.creeper.server.command.GossipCommand;
import com.comandante.creeper.server.command.InventoryCommand;
-import com.comandante.creeper.server.command.KillCommand;
import com.comandante.creeper.server.command.LookCommand;
import com.comandante.creeper.server.command.MovementCommand;
import com.comandante.creeper.server.command.PickUpCommand;
@@ -91,7 +91,7 @@ public class Main {
creeperCommandRegistry.addCommand(new DropCommand(gameManager));
creeperCommandRegistry.addCommand(new GossipCommand(gameManager));
creeperCommandRegistry.addCommand(new InventoryCommand(gameManager));
- creeperCommandRegistry.addCommand(new KillCommand(gameManager));
+ creeperCommandRegistry.addCommand(new FightKillCommand(gameManager));
creeperCommandRegistry.addCommand(new LookCommand(gameManager));
creeperCommandRegistry.addCommand(new MovementCommand(gameManager));
creeperCommandRegistry.addCommand(new PickUpCommand(gameManager));
diff --git a/src/main/java/com/comandante/creeper/npc/StreetHustler.java b/src/main/java/com/comandante/creeper/npc/StreetHustler.java
index b147bb89..773f4116 100644
--- a/src/main/java/com/comandante/creeper/npc/StreetHustler.java
+++ b/src/main/java/com/comandante/creeper/npc/StreetHustler.java
@@ -22,7 +22,7 @@ public class
));
private final static String colorName = "street" + BOLD_ON + Color.MAGENTA + " hustler" + Color.RESET ;
- private final static String dieMessage = "a " + colorName + " breathes his last breath in a pool of " + BOLD_ON + Color.RED + "blood" + RESET;
+ private final static String dieMessage = "a " + colorName + " breathes his last breath in a pool of " + BOLD_ON + Color.RED + "blood" + RESET + ".";
public StreetHustler(GameManager gameManager) {
super(gameManager, NAME, colorName, 0, NpcStats.DRUGGED_PIMP.createStats(), dieMessage, Optional.of(Sets.newHashSet(Area.NEWBIE_ZONE)), validTriggers);
diff --git a/src/main/java/com/comandante/creeper/server/ChannelUtils.java b/src/main/java/com/comandante/creeper/server/ChannelUtils.java
index 85487f08..1f871cb3 100644
--- a/src/main/java/com/comandante/creeper/server/ChannelUtils.java
+++ b/src/main/java/com/comandante/creeper/server/ChannelUtils.java
@@ -25,7 +25,7 @@ public class ChannelUtils {
Set<String> presentPlayerIds = playerCurrentRoom.getPresentPlayerIds();
for (String id : presentPlayerIds) {
Player presentPlayer = playerManager.getPlayer(id);
- write(presentPlayer.getPlayerId(), message);
+ write(presentPlayer.getPlayerId(), message, true);
}
}
diff --git a/src/main/java/com/comandante/creeper/server/command/KillCommand.java b/src/main/java/com/comandante/creeper/server/command/FightKillCommand.java
similarity index 89%
rename from src/main/java/com/comandante/creeper/server/command/KillCommand.java
rename to src/main/java/com/comandante/creeper/server/command/FightKillCommand.java
index 76285768..b9c03560 100644
--- a/src/main/java/com/comandante/creeper/server/command/KillCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/FightKillCommand.java
@@ -18,12 +18,12 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.Future;
-public class KillCommand extends Command {
+public class FightKillCommand extends Command {
- final static List<String> validTriggers = Arrays.asList("k", "kill");
- final static String description = "Kill a mob.";
+ final static List<String> validTriggers = Arrays.asList("k", "kill", "fight", "f");
+ final static String description = "Fight a mob.";
- public KillCommand(GameManager gameManager) {
+ public FightKillCommand(GameManager gameManager) {
super(gameManager, validTriggers, description);
}
@@ -38,7 +38,7 @@ public class KillCommand extends Command {
}
List<String> originalMessageParts = getOriginalMessageParts(e);
if (originalMessageParts.size() == 1) {
- getGameManager().getChannelUtils().write(player.getPlayerId(), "You need to specify who you want to kill.");
+ getGameManager().getChannelUtils().write(player.getPlayerId(), "You need to specify who you want to fight.");
return;
}
originalMessageParts.remove(0);
@@ -55,7 +55,7 @@ public class KillCommand extends Command {
return;
}
}
- getGameManager().getChannelUtils().write(player.getPlayerId(), "There's no NPC here to kill by that name.");
+ getGameManager().getChannelUtils().write(player.getPlayerId(), "There's no NPC here to fight by that name.");
} finally {
super.messageReceived(ctx, e);
}
--
GitLab