diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java index d9799aea3ccbdb3ce700ceb9370fc9aac2826da2..f033e86cbd0e9aa945df956ae978da60704ea380 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 b147bb897396b5e87d1f44f0cd3f290a4bfec4c3..773f41164dfc6206840cf0292556c4ee53981e29 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 85487f081d01a246d5a8389ab71735f665a3ac94..1f871cb38ee71b52539373ce55361fb2f233fa6f 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 76285768ad92be37e5768ee08264554f1813865c..b9c0356090230e7fbbd7a4fc61c411c747044da1 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); }