player can now change rooms!

TODO: finish by updating the player locatio

Adventure Game/adventure_game/GameNavigator.py

@@ -19,7 +19,7 @@ class GameNavigator(npyscreen.FormBaseNew):
     """
 
     def update_log(self, newline):
-        self.logList.append(newline)  # Append the newline
+        self.logList.append('> ' + newline)  # Append the newline
         self.logList = self.logList[-7:]  # Truncate to only the last 5 lines
 
         res = ''  # Convert the list to a string
@@ -29,6 +29,13 @@ class GameNavigator(npyscreen.FormBaseNew):
 
         self.logBox.value = res  # Set the logbox to that value
 
+    def update_location(self, location):
+        """
+        This may not be needed in the future, dynamic
+        handling of location is something the navigator should do and should inherit from player.
+        """
+        pass
+
     def create(self):
         top_division_height = 20
         inventory_width = 20
@@ -95,3 +102,16 @@ class GameNavigator(npyscreen.FormBaseNew):
                                    name="Quit",
                                    relx=1,
                                    rely=1)
+
+        """
+        We've reached end of __init__ basicly by this point
+        its up to Handler.py to actually play the game, but we should
+        do some basic initalization here
+        """
+        #TODO: load art from the last place the player was in
+        #TODO: load up inventory
+
+        #TODO: Expand this by loding the text from the game
+        #WARN: THIS MAY REQUIRE REWRITING HANDLER.PY TO INTALIZE THE ROOM OBJECT OUTSIDE OF HANDLER.PY
+        self.update_log('Welcome back! Try "LOOK AROUND" to get started.')
+        self.update_log('>>Note from joe: Welcome! you\'re playing the demo! Please dont mind text issues like |this| and *this*\ni have yet to implement color!')

Adventure Game/adventure_game/Handler.py

@@ -1,5 +1,7 @@
 import npyscreen
 
+from yaml_parser import parse_datafile as parse
+
 
 class Handler(npyscreen.ButtonPress):
     """
@@ -8,11 +10,14 @@ class Handler(npyscreen.ButtonPress):
     2: prepare new items to display on the screen
     3: re-render the screen
     """
+
     def whenPressed(self):
         self.parent.parentApp.log.debug('Send button pressed!')
         # This is the raw command from the user
-        raw_command = self.parent.dialogueBox.value
-        self.parent.dialogueBox.value = '' # Clear the dialogue box, TODO: This may become unneeded if issue #8 is fixed
+        raw_command = self.parent.dialogueBox.value.upper()
+
+        # Clear the dialogue box, TODO: This may become unneeded if issue #8 is fixed
+        self.parent.dialogueBox.value = ''
 
         # This is the raw command from the user
         parsed_command = raw_command.split()
@@ -20,12 +25,107 @@ class Handler(npyscreen.ButtonPress):
         try:
             command = parsed_command.pop(0)
         except IndexError:
-            self.parent.parentApp.log.warn('Command "{0}" could not be split, was it malformed or incomplete?'.format(raw_command))
+            self.parent.parentApp.log.warn(
+                'Command "{0}" could not be split, was it malformed or incomplete?'.format(raw_command))
             command = ''
-        arguments = parsed_command # Whatever is left in the list, are arguments.
+        arguments = parsed_command  # Whatever is left in the list, are arguments.
 
+        # Handle an empty command
+        if len(command) <= 2:
+            self.parent.update_log('Command was too short, try something like "MOVE", "LOOK AROUND" or "USE".')
+
+        else:
+            # Concatenate everything back together (just to show the user the program understood them correctly
+            self.parent.update_log(command + ' ' + ' '.join(str(s) for s in arguments))
+
+            """
+            This is where real logic can happen!
+            """
+
+            # Localize the player
+            player = self.parent.parentApp.player
+            roomlocation = player.playerData['player']['location'] + '.yaml'
+            try:
+                room = parse(self.parent.parentApp.mainPath / 'gamedata/world' / roomlocation)['room']
+
+                # If the file could not be found
+            except FileNotFoundError:
+                # Log a critical error!
+                self.parent.parentApp.log.critical(
+                    'Handler could not load the current room! Is the player file corrupt or was there a typo? Path was {0}'.format(
+                        self.parent.parentApp.mainPath / 'gamedata/world' / roomlocation))
+                # Put the player in a blank room i forgot to finish
+                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!
+
+            # TODO: Should upgrade these to use fuzzy words library! and not direct comparisons!
+            if command == 'LOOK':
+                try:
+                    if arguments[0] == 'AROUND':
+                        try:
+                            self.parent.update_log(room['look_around'])
+                        except KeyError:
+                            self.parent.update_log('There is nothing to look at?.. This might be a bug.')
+                    if arguments[0] == 'AT':
+                        try:
+                            # Argument[1] is the "thing" you want to look at, yaml is lowercase so we lowercase it.
+                            self.parent.update_log(room[arguments[1].lower()]['look_at'])
+                        except KeyError:
+                            self.parent.update_log("Im not sure what you're trying to look at.")
+                except IndexError:
+                    self.parent.parentApp.log.error('Could not handle {0}, {1}'.format(command, arguments))
+                    self.parent.update_log("You must specify something to look at.")
+
+            elif command == 'PICK':
+                try:
+                    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:
+                                # Argument[1] is the "thing" you want to pick up, yaml is lowercase so we lowercase it.
+                                self.parent.parentApp.log.info('Player tried to pick up {0}'.format(arguments[1]))
+                                self.parent.update_log(room[arguments[1].lower()]['pick_up'])
+                            except KeyError:
+                                self.parent.update_log("You cant pick that up.")
+                        else:  # if its a longer list of args, the player prolly wants to pick up an item with multiple words, like hand_axe, or log_viewer
+                            try:
+                                long_arg = '_'.join(arguments[1:])  # Joins whatever comes after 1 in our args with '_' between
+                                self.parent.parentApp.log.info('Player tried to pick up long object {0}'.format(long_arg))
+                                self.parent.update_log(room[long_arg.lower()]['pick_up'])
+                            except KeyError:
+                                self.parent.update_log("You cant pick that up.")
+                except IndexError:
+                    self.parent.parentApp.log.error('Could not handle {0}, {1}'.format(command, arguments))
+                    self.parent.update_log("You must specify something to pick up.")
+
+            elif command == 'OPEN':
+                #try:
+                self.parent.parentApp.log.info('Player tried to open door: {0}'.format(arguments[0]))
+                new_room = room[arguments[0].lower()]['leads_to']
+                self.parent.parentApp.log.debug('New room is: {0}'.format(new_room))
+                upon_enter = player.change_room(new_room)  # Change the player to that new room.
+                self.parent.update_log(upon_enter)  # Print the new room upon enter text.
+                #except KeyError:
+                #    self.parent.update_log("You cant open that.")
+                #except IndexError:
+                #    self.parent.update_log("you must specify something to open")
+
+            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
+                self.parent.update_log('You are in {0}.'.format(room))
+
+        # Log the command that we parsed
         self.parent.parentApp.log.info('Parsed command "{0}" with arguments "{1}"'.format(command, arguments))
-        self.parent.update_log('command: ' + command)
-        self.parent.update_log('args: {0}'.format(arguments))
+
+        # Make sure to re-draw the art box when we're all done (in case we updated it in logic above)
         self.parent.artContent.display()
+
+        # Switch back to the game menu.
+        # TODO: possibly deprecate this statement?
         self.parent.parentApp.switchForm('GAME')

Adventure Game/adventure_game/Player.py

@@ -1,11 +1,24 @@
 from yaml_parser import parse_datafile as parse
 
+
 class Player:
     """
     This class intended to abstract out the actual yaml data into a player.(item) that is more
     friendly to handle in code. 
     """
+
     def __init__(self, save_location):
         self.save_location = save_location
 
-        self.playerData = parse(save_location)
+        self.playerData = parse(save_location)
+
+    def change_room(self, new_room):
+        """
+        Should move the player to a new room
+        TODO: Put a check here that checks if the room we're moving to exists!
+        """
+        self.playerData['player']['location'] = new_room
+
+        room = self.playerData['player']['location']
+
+        return parse('adventure_game/gamedata/world/' + room)['room']['upon_enter']

Adventure Game/adventure_game/__main__.py

@@ -14,9 +14,14 @@ class AlphaWarning(npyscreen.Popup):
         self.parentApp.setNextForm('MENU')
 
     def create(self):
-        self.add(npyscreen.Pager, values=['Welcome to Unnamed Adventure game!',
-                                          'Please enjoy your stay and report any bugs at',
-                                          'kitsunehosting.net'], editable=False)
+        self.add(npyscreen.MultiLineEdit, value="""Welcome to Unnamed Adventure game!
+This game is still in ALPHA! And a TON
+of features are not implemented.
+Please check out the git project for
+details and updates! and please report
+any bugs! Thank you and enjoy!
+https://kitsunehosting.net/gitea/Kenwood/SNHU-IT-140/issues""",
+                 editable=False)
 
 
 class AdventureGame(npyscreen.NPSAppManaged):
@@ -37,8 +42,7 @@ class AdventureGame(npyscreen.NPSAppManaged):
         self.log.info('Logging started!')
 
         # parse this data first (since it includes graphics for the main menu
-        self.gamelib = parse(
-            self.mainPath / 'gamedata/gamelib.yaml')
+        self.gamelib = parse(self.mainPath / 'gamedata/gamelib.yaml')
         self.log.debug('Gamelib at {0}'.format(self.mainPath / 'gamedata/gamelib.yaml'))
 
         # Intalize the player as none, the player will be created in the main menu.

Adventure Game/adventure_game/gamedata/gamelib.yaml

@@ -13,24 +13,25 @@ menu:
       \____/_/  |_/_/  /_/_____/
 
     not_found: |
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      -----------------------------------------------/  \-----------------------------------------------
-      ----------------------------------------------/ !! \----------------------------------------------
-      ---------------------------------------------/      \---------------------------------------------
-      --------------------------------------No Art for this location------------------------------------
-      ----------------------------------Consider making a pull request?---------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
-      --------------------------------------------------------------------------------------------------
+      +--------------------------------------------------------------------------------NNN0ddk0000kkX--+
+      |--------------------------------------------------------------------------------N0OOkkkO0OkxON--|
+      |--------------------------------------------------------------------------------KkOkkkxkOxloON--|
+      |--------------------------------------------------------------------------------0xOO00000kdokX--|
+      |---------------------------------------------+/  \+-----------------------------XOxdddxdl:;cdX--|
+      |--------------------------------------------+/ !! \+----------------------------XOxoldxllc:oON--|
+      |-------------------------------------------+/      \+---------------------------0xkddkxdOxod0W--|
+      |------------------------------------+No Art for this location+------------------XkddkxodkxkxxX--|
+      |--------------------------------|Consider making a pull request?|---------NXXXKOOkxxxddodxkkOX--|
+      |--------------------------------------------------------------------------NXNNXxclddxkkxkOOO0N--|
+      |--------------------------------------------------------------------------XkxxxdddoxkkxkOkxkKW--|
+      |--------------------------------------------------------------------------KxxxxdollloodO0kkk0N--|
+      |--------------------------------------------------------------------------XkxxxdlclddkOOkk0OON--|
+      |--------------------------------------------------------------------------N0dooxdlcdkOkkkkxcoX--|
+      |--------------------------------------------------------------------------WXKKKKOOO0K0kxxxdodX--|
+      |------------------------------------------------------------------------------------------------|
+      |------------------------------------------------------------------------------------------------|
+      +------------------------------------------------------------------------------------------------+
+
     dimensions:
       inventory_width: 23
       inventory_height: 20

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

@@ -0,0 +1,4 @@
+blank_room:
+  grid: [-1, -1]
+  upon_enter: "You're in a blank room. It looks unfinished, like joe forgot to put something here"
+  look_around: "There is nothing to look at, you should tell joe you're here."

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

@@ -0,0 +1,11 @@
+room:
+  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

@@ -1,12 +1,38 @@
-office:
+room:
   grid: [0, 0]
   upon_enter: "You are standing behind your desk, you see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|"
   look_around: "You look around the room, you see a |DESK|, a |BOOKSHELF| and the |DOOR|"
-  pick_up_logviewer: "You pick the *LOG VIEWER* up."
   desk:
     look_at: "You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|"
-    inspect: "Desk, ornate, stuff"
+    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:
-    look_at: "logviewer looks like garbo"
-    inspect: "beep boop"
-    pick_up: "You pick up the *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: |
+    +                                                                                                +
+    |                                                                                                |
+    |                                          OFFICE STUFF?                                         |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    |                                                                                                |
+    +                                                                                                +

Adventure Game/adventure_game/logs/AdventureGame.log

@@ -0,0 +1,14 @@
+INFO:root:Logging started!
+DEBUG:root:Gamelib at adventure_game\gamedata\gamelib.yaml
+DEBUG:root:Send button pressed!
+DEBUG:root:{'grid': [0, 0], 'upon_enter': 'You are standing behind your desk, you see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'look_around': 'You look around the room, you see a |DESK|, a |BOOKSHELF| and the |DOOR|', 'pick_up_logviewer': 'You pick the *LOG VIEWER* up.', 'desk': {'look_at': 'You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'inspect': 'Desk, ornate, stuff'}, 'log_viewer': {'look_at': 'logviewer looks like garbo', 'inspect': 'beep boop', 'pick_up': 'You pick up the *LOG VIEWER*.'}}
+INFO:root:Parsed command "LOOK" with arguments "['AROUND']"
+DEBUG:root:Send button pressed!
+DEBUG:root:{'grid': [0, 0], 'upon_enter': 'You are standing behind your desk, you see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'look_around': 'You look around the room, you see a |DESK|, a |BOOKSHELF| and the |DOOR|', 'pick_up_logviewer': 'You pick the *LOG VIEWER* up.', 'desk': {'look_at': 'You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'inspect': 'Desk, ornate, stuff'}, 'log_viewer': {'look_at': 'logviewer looks like garbo', 'inspect': 'beep boop', 'pick_up': 'You pick up the *LOG VIEWER*.'}}
+INFO:root:Parsed command "LOOK" with arguments "['AT', 'DESK']"
+DEBUG:root:Send button pressed!
+DEBUG:root:{'grid': [0, 0], 'upon_enter': 'You are standing behind your desk, you see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'look_around': 'You look around the room, you see a |DESK|, a |BOOKSHELF| and the |DOOR|', 'pick_up_logviewer': 'You pick the *LOG VIEWER* up.', 'desk': {'look_at': 'You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'inspect': 'Desk, ornate, stuff'}, 'log_viewer': {'look_at': 'logviewer looks like garbo', 'inspect': 'beep boop', 'pick_up': 'You pick up the *LOG VIEWER*.'}}
+INFO:root:Parsed command "LOOK" with arguments "['AT', 'DOOR']"
+DEBUG:root:Send button pressed!
+DEBUG:root:{'grid': [0, 0], 'upon_enter': 'You are standing behind your desk, you see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'look_around': 'You look around the room, you see a |DESK|, a |BOOKSHELF| and the |DOOR|', 'pick_up_logviewer': 'You pick the *LOG VIEWER* up.', 'desk': {'look_at': 'You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'inspect': 'Desk, ornate, stuff'}, 'log_viewer': {'look_at': 'logviewer looks like garbo', 'inspect': 'beep boop', 'pick_up': 'You pick up the *LOG VIEWER*.'}}
+INFO:root:Parsed command "LOOK" with arguments "['AT', 'BOOKSHELF']"