diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java index 656ce23b92abd185a33fb9a77dff7536982138da..661bb8779c44c0221ac14ba5529cc55d7ac8afb1 100644 --- a/src/main/java/com/comandante/creeper/Main.java +++ b/src/main/java/com/comandante/creeper/Main.java @@ -92,8 +92,6 @@ public class Main { creeperCommandRegistry.addCommand(new InfoCommand(gameManager)); creeperCommandRegistry.addCommand(new TeleportCommand(gameManager)); - - createNpcs(entityManager, gameManager); CreeperServer creeperServer = new CreeperServer(PORT, db); @@ -138,15 +136,20 @@ public class Main { entityManager.addEntity(new NpcSpawner(new BergOrc(gameManager, new Loot(4, 10, Sets.<Item>newHashSet())), Sets.newHashSet(Area.BLOODRIDGE1_ZONE), gameManager, new SpawnRule(10, 8, 2, 100))); startUpMessage("Adding Red-Eyed Bears"); - entityManager.addEntity(new NpcSpawner(new RedEyedBear(gameManager, new Loot(8, 13, Sets.<Item>newHashSet())), Sets.newHashSet(Area.TOFT1_ZONE, Area.TOFT2_ZONE), gameManager, new SpawnRule(10, 14, 2, 100))); + entityManager.addEntity(new NpcSpawner(new RedEyedBear(gameManager, new Loot(8, 13, Sets.<Item>newHashSet())), Sets.newHashSet(Area.TOFT1_ZONE), gameManager, new SpawnRule(10, 14, 3, 100))); + entityManager.addEntity(new NpcSpawner(new RedEyedBear(gameManager, new Loot(8, 13, Sets.<Item>newHashSet())), Sets.newHashSet(Area.TOFT2_ZONE), gameManager, new SpawnRule(10, 14, 3, 100))); startUpMessage("Adding Swamp Bears"); - entityManager.addEntity(new NpcSpawner(new SwampBear(gameManager, new Loot(9, 14, Sets.<Item>newHashSet())), Sets.newHashSet(Area.NORTH3_ZONE, Area.NORTH4_ZONE), gameManager, new SpawnRule(10, 12, 2, 100))); + entityManager.addEntity(new NpcSpawner(new SwampBear(gameManager, new Loot(9, 14, Sets.<Item>newHashSet())), Sets.newHashSet(Area.NORTH3_ZONE), gameManager, new SpawnRule(10, 12, 3, 100))); + entityManager.addEntity(new NpcSpawner(new SwampBear(gameManager, new Loot(9, 14, Sets.<Item>newHashSet())), Sets.newHashSet(Area.NORTH4_ZONE), gameManager, new SpawnRule(10, 12, 3, 100))); + + startUpMessage("Adding Gray Ekimmus"); + entityManager.addEntity(new NpcSpawner(new GrayEkimmu(gameManager, new Loot(14, 17, Sets.<Item>newHashSet())), Sets.newHashSet(Area.NORTH4_ZONE), gameManager, new SpawnRule(10, 12, 3, 100))); + entityManager.addEntity(new NpcSpawner(new GrayEkimmu(gameManager, new Loot(14, 17, Sets.<Item>newHashSet())), Sets.newHashSet(Area.NORTH5_ZONE), gameManager, new SpawnRule(10, 12, 3, 100))); startUpMessage("Adding Stealth Panthers"); - entityManager.addEntity(new NpcSpawner(new StealthPanther(gameManager, new Loot(14, 22, Sets.<Item>newHashSet())), Sets.newHashSet(Area.NORTH5_ZONE, Area.NORTH6_ZONE), gameManager, new SpawnRule(10, 12, 2, 100))); + entityManager.addEntity(new NpcSpawner(new StealthPanther(gameManager, new Loot(14, 22, Sets.<Item>newHashSet())), Sets.newHashSet(Area.NORTH5_ZONE), gameManager, new SpawnRule(10, 12, 3, 100))); + entityManager.addEntity(new NpcSpawner(new StealthPanther(gameManager, new Loot(14, 22, Sets.<Item>newHashSet())), Sets.newHashSet(Area.NORTH6_ZONE), gameManager, new SpawnRule(10, 12, 3, 100))); - startUpMessage("Adding Gray Ekimmus"); - entityManager.addEntity(new NpcSpawner(new GrayEkimmu(gameManager, new Loot(14, 17, Sets.<Item>newHashSet())), Sets.newHashSet(Area.NORTH4_ZONE, Area.NORTH5_ZONE), gameManager, new SpawnRule(10, 12, 2, 100))); - } + } } diff --git a/src/main/java/com/comandante/creeper/player/PlayerMetadata.java b/src/main/java/com/comandante/creeper/player/PlayerMetadata.java index d6af7207dd4b1f4be75d944167c85d02e0b4140e..5a8304fa3f1068214231d989afda8dd1f15d6b49 100644 --- a/src/main/java/com/comandante/creeper/player/PlayerMetadata.java +++ b/src/main/java/com/comandante/creeper/player/PlayerMetadata.java @@ -17,15 +17,13 @@ public class PlayerMetadata implements Serializable { Stats stats; String[] inventory; private int gold; - private Set<PlayerRoles> rolesSet; - public PlayerMetadata(String playerName, String password, String playerId, Stats stats, int gold, Set<PlayerRoles> playerRolesSet) { + public PlayerMetadata(String playerName, String password, String playerId, Stats stats, int gold) { this.playerName = playerName; this.password = password; this.playerId = playerId; this.stats = stats; this.gold = gold; - this.rolesSet = playerRolesSet; } public String[] getInventory() { diff --git a/src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java b/src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java index f640334af107ea6198878b17799474701a3f0911..8a2a73510bf01048c6378056423b695652b4d15b 100644 --- a/src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java +++ b/src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java @@ -40,9 +40,12 @@ public class CreeperCommandHandler extends SimpleChannelUpstreamHandler { gameManager.getPlayerManager().removePlayer(creeperSession.getUsername().get()); } - private String getRootCommand(MessageEvent e){ + private String getRootCommand(MessageEvent e) { String origMessage = (String) e.getMessage(); - return origMessage.split(" ")[0].toLowerCase(); + if (origMessage.contains(" ")) { + return origMessage.split(" ")[0].toLowerCase(); + } else { + return origMessage; + } } - } diff --git a/src/main/java/com/comandante/creeper/server/command/Command.java b/src/main/java/com/comandante/creeper/server/command/Command.java index a0c8820ab74c3dfb3f4e1eab5df45e45ba213e64..9d1d23e1d4d03a97c4e77c79364a0e2fdaaa6097 100644 --- a/src/main/java/com/comandante/creeper/server/command/Command.java +++ b/src/main/java/com/comandante/creeper/server/command/Command.java @@ -119,6 +119,10 @@ public abstract class Command extends SimpleChannelUpstreamHandler { channelUtils.write(playerId, msg, leadingBlankLine); } + public void writeToRoom(String msg) { + channelUtils.writeToRoom(playerId, msg); + } + public void currentRoomLogic(){ gameManager.currentRoomLogic(playerId); } diff --git a/src/main/java/com/comandante/creeper/server/command/FightKillCommand.java b/src/main/java/com/comandante/creeper/server/command/FightKillCommand.java index fb7b31975fce0f5a0dbb30ceb89153cbe042537b..ae6c7f09874e518b76d4f491b8f3419d1da11def 100644 --- a/src/main/java/com/comandante/creeper/server/command/FightKillCommand.java +++ b/src/main/java/com/comandante/creeper/server/command/FightKillCommand.java @@ -44,7 +44,7 @@ public class FightKillCommand extends Command { if (npcEntity.getValidTriggers().contains(target)) { npcEntity.setIsInFight(true); FightRun fightRun = new FightRun(player, npcEntity, gameManager); - write("You start a fight!", false); + writeToRoom(player.getPlayerName() + " has attacked a " + npcEntity.getColorName()); Future<FightResults> fight = fightManager.fight(fightRun); creeperSession.setActiveFight(Optional.of(fight)); return; diff --git a/src/main/java/com/comandante/creeper/server/command/admin/BuildCommand.java b/src/main/java/com/comandante/creeper/server/command/admin/BuildCommand.java index 8ff8fe24ef65770b89eab08b5a6717786109aa11..a06ab120972ee8cbc5bbd71793e96200432f46fe 100644 --- a/src/main/java/com/comandante/creeper/server/command/admin/BuildCommand.java +++ b/src/main/java/com/comandante/creeper/server/command/admin/BuildCommand.java @@ -78,7 +78,7 @@ public class BuildCommand extends Command { newFloorModel.setRoomModels(Sets.newHashSet(Iterators.transform(Sets.newHashSet(basicRoom).iterator(), WorldExporter.buildRoomModelsFromRooms()))); floorManager.addFloor(newFloorModel.getId(), newFloorModel.getName()); mapsManager.addFloorMatrix(newFloorModel.getId(), MapMatrix.createMatrixFromCsv(newFloorModel.getRawMatrixCsv())); - mapsManager.generateAllMaps(9, 9); + mapsManager.generateAllMaps(14, 14); gameManager.movePlayer(new PlayerMovement(player, currentRoom.getRoomId(), basicRoom.getRoomId(), null, "", "")); gameManager.currentRoomLogic(player.getPlayerId()); return; @@ -101,7 +101,7 @@ public class BuildCommand extends Command { newFloorModel.setRoomModels(Sets.newHashSet(Iterators.transform(Sets.newHashSet(basicRoom).iterator(), WorldExporter.buildRoomModelsFromRooms()))); floorManager.addFloor(newFloorModel.getId(), newFloorModel.getName()); mapsManager.addFloorMatrix(newFloorModel.getId(), MapMatrix.createMatrixFromCsv(newFloorModel.getRawMatrixCsv())); - mapsManager.generateAllMaps(9, 9); + mapsManager.generateAllMaps(14, 14); gameManager.movePlayer(new PlayerMovement(player, currentRoom.getRoomId(), basicRoom.getRoomId(), null, "", "")); gameManager.currentRoomLogic(player.getPlayerId()); return; @@ -126,7 +126,7 @@ public class BuildCommand extends Command { MapMatrix matrixFromCsv = MapMatrix.createMatrixFromCsv(newFloorModel.getRawMatrixCsv()); matrixFromCsv.addRemote(basicRoom.getRoomId(), returnRemoteExit); mapsManager.addFloorMatrix(newFloorModel.getId(), matrixFromCsv); - mapsManager.generateAllMaps(9, 9); + mapsManager.generateAllMaps(14, 14); gameManager.movePlayer(new PlayerMovement(player, currentRoom.getRoomId(), basicRoom.getRoomId(), null, "", "")); gameManager.currentRoomLogic(player.getPlayerId()); return; diff --git a/src/main/java/com/comandante/creeper/spawner/NpcSpawner.java b/src/main/java/com/comandante/creeper/spawner/NpcSpawner.java index 1efc3ca7fbed3ad49b62325cbbe80dc2b752eee9..cf9b4d20035f76cc135b6b9c47482d49c9b1a30f 100644 --- a/src/main/java/com/comandante/creeper/spawner/NpcSpawner.java +++ b/src/main/java/com/comandante/creeper/spawner/NpcSpawner.java @@ -48,8 +48,8 @@ public class NpcSpawner extends CreeperEntity { createAndAddItem(spawnArea); } } - noTicks = 0; } + noTicks = 0; } }