Adventure Game/adventure_game/Handler.py

@@ -59,7 +59,7 @@ class Handler(npyscreen.ButtonPress):
                 room = parse(self.parent.parentApp.mainPath / 'gamedata/world/blank_room.yaml')
 
             # By now we should be situated in our room, and with our player.
-            #self.parent.parentApp.log.debug(room) # We dont need to log this, its too verbose!
+            self.parent.parentApp.log.debug(room)
 
             # TODO: Should upgrade these to use fuzzy words library! and not direct comparisons!
             if command == 'LOOK':
@@ -75,7 +75,7 @@ class Handler(npyscreen.ButtonPress):
                     except KeyError:
                         self.parent.update_log("Not sure what you're trying to look at.")
 
-            elif command == 'PICK':
+            if command == 'PICK':
                 if arguments[0] == 'UP':
                     if len(arguments) <= 2: # If there are only 2 args ex:up, item then we dont need to merge that last arg
                         try:
@@ -91,9 +91,6 @@ class Handler(npyscreen.ButtonPress):
                             self.parent.update_log(room[long_arg.lower()]['pick_up'])
                         except KeyError:
                             self.parent.update_log("You cant pick that up.")
-            else:
-                self.parent.parentApp.log.info('Player\'s command was not understood: {0}'.format(command))
-                self.parent.update_log('I didn\'t understand {0}'.format(command))
 
             if command == 'WHERE':
                 # TODO: this should take the human readable room name, not the code-name

Adventure Game/adventure_game/gamedata/world/hallway.yaml

@@ -1,11 +0,0 @@
-office:
-  grid: [0, 1]
-  upon_enter: "You are standing just outside your office door."
-  look_around: "You look up, and down the hallway, you see the receptionists |desk|. And a |closet| at the other end of the hall."
-  closet:
-    look_at: "Its a closet door."
-    inspect: "Its still a closet door."
-    open: "You cant open this door."
-  desk:
-    look_at: "Its your receptionists desks, she's not sitting behind it."
-    inspect: "She's still not there."

Adventure Game/adventure_game/gamedata/world/office.yaml

@@ -5,18 +5,11 @@ office:
   desk:
     look_at: "You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|"
     inspect: "The desk is large and ornate with one of those silly lamps hovering over it."
-  bookshelf:
-    look_at: "The bookshelf is a bookshelf."
-    inspect: "Its still a bookshelf."
   log_viewer:
     item: yes
     look_at: "The log viewer is a small piece of ornate code, allowing you to examine |entities| more closely."
     inspect: "The dials are wiggly and the viewer makes Beep Boop sounds sometimes."
     pick_up: "You pick up the *LOG VIEWER*."
-  door:
-    leads_to: hallway.yaml
-    look_at: "Its a door, it leads to the Hallway. You should try to |OPEN| it."
-    inspect: "Its ornate but basic, the other side of the door has your name on a plaque."
   art: |
     +                                                                                                +
     |                                                                                                |