From b2745f47127136a745a0b983526959b60bd0f011 Mon Sep 17 00:00:00 2001 From: Chris Kearney <chris.kearney@urbanairship.com> Date: Mon, 18 Aug 2014 20:02:41 -0700 Subject: [PATCH] added some test users, fixed a bug, added to the map --- src/main/java/com/comandante/Main.java | 9 ++++++--- .../java/com/comandante/SimpleGameAuthenticator.java | 5 +++++ .../com/comandante/telnetserver/TelnetServerHandler.java | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/comandante/Main.java b/src/main/java/com/comandante/Main.java index 9f6b24c1..1beee280 100644 --- a/src/main/java/com/comandante/Main.java +++ b/src/main/java/com/comandante/Main.java @@ -11,13 +11,16 @@ public class Main { "This is the lobby. It's pretty empty and the paint still smells fresh."); Room hallway = new Room(2, Optional.of(3), Optional.<Integer>absent(), Optional.<Integer>absent(), Optional.of(1), "This is the hallway. It's long and hallway-ish with exposed wires and floorboards showing."); - Room bedroom = new Room(3, Optional.<Integer>absent(), Optional.<Integer>absent(), Optional.<Integer>absent(), Optional.of(2), - "This is the bedroom. It's for sleeping."); + Room intake = new Room(3, Optional.<Integer>absent(), Optional.of(6), Optional.<Integer>absent(), Optional.of(2), + "This is the intake area. People are lined up like cattle waiting to be prodded."); + Room janitorialCloset = new Room(6, Optional.<Integer>absent(), Optional.<Integer>absent(), Optional.of(3), Optional.<Integer>absent(), + "You find yourself in the janitorial closet. It smells like bleach."); GameManager gameManager = new GameManager(); gameManager.addRoom(lobby); gameManager.addRoom(hallway); - gameManager.addRoom(bedroom); + gameManager.addRoom(intake); + gameManager.addRoom(janitorialCloset); Ansi ansi = new Ansi(); ansi.fg(Ansi.Color.RED); diff --git a/src/main/java/com/comandante/SimpleGameAuthenticator.java b/src/main/java/com/comandante/SimpleGameAuthenticator.java index 6c5d4bb3..cf6580ea 100644 --- a/src/main/java/com/comandante/SimpleGameAuthenticator.java +++ b/src/main/java/com/comandante/SimpleGameAuthenticator.java @@ -18,6 +18,11 @@ public class SimpleGameAuthenticator implements GameAuthenticator { userMap = new HashMap<String, String>(); userMap.put("chris", "poop"); userMap.put("brian", "poop"); + userMap.put("test1", "poop"); + userMap.put("test2", "poop"); + userMap.put("test3", "poop"); + userMap.put("test4", "poop"); + } @Override diff --git a/src/main/java/com/comandante/telnetserver/TelnetServerHandler.java b/src/main/java/com/comandante/telnetserver/TelnetServerHandler.java index 3393b5da..cfc5773b 100644 --- a/src/main/java/com/comandante/telnetserver/TelnetServerHandler.java +++ b/src/main/java/com/comandante/telnetserver/TelnetServerHandler.java @@ -79,7 +79,7 @@ public class TelnetServerHandler extends SimpleChannelUpstreamHandler { } } if (command.equals("e")) { - if (room.getSouthId().isPresent()) { + if (room.getEastId().isPresent()) { Movement movement = new Movement(player, room.getRoomId(), room.getEastId().get(), command); gameManager.movePlayer(movement); currentRoomLogic(ctx, e); -- GitLab