Player can pick up items but cannot yet add them to the inventory.

How was this not fixed?

.gitignore

@@ -1,3 +1,4 @@
 
 *.pyc
-.idea
+.idea
+Adventure Game/adventure_game/logs/AdventureGame.log

Adventure Game/adventure_game/GameNavigator.py

@@ -1,17 +1,39 @@
-import npyscreen, sys
+import npyscreen
+import sys
 
-class ExitButton(npyscreen.ButtonPress):
+from Handler import Handler
+
+
+class QuitButton(npyscreen.ButtonPress):
     def whenPressed(self):
         sys.exit(0)
 
+
 class GameNavigator(npyscreen.FormBaseNew):
-    def afterEditing(self):
-        self.parentApp.setNextForm('GAME')
+    """
+    This class handles all the drawing and 'graphics' of our game.
+    only basic logic like initial loading should happen here. re-drawing
+    and game logic should be done in Handler.py
+    TODO: Find a fix for initial room startup
+    TODO: Find a way to reset the cursor after a user hits sendButton
+    """
+
+    def update_log(self, 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
+        for element in self.logList:
+            res = res + str(element) + '\n'
+        res = res.upper()  # Log is always uppercase
+
+        self.logBox.value = res  # Set the logbox to that value
 
     def create(self):
         top_division_height = 20
         inventory_width = 20
         art_width = 100
+        self.logList = []
 
         self.artBox = self.add(npyscreen.BoxBasic,
                                name='ArtBox',
@@ -37,17 +59,39 @@ class GameNavigator(npyscreen.FormBaseNew):
                                rely=2,
                                editable=False)
 
+        self.logBoxOutline = self.add(npyscreen.BoxBasic,
+                                      max_width=inventory_width + art_width,
+                                      max_height=9,
+                                      relx=1,
+                                      rely=top_division_height + 2,
+                                      editable=False)
+
+        self.logBox = self.add(npyscreen.MultiLineEdit,
+                               max_width=inventory_width + art_width - 7,
+                               max_height=7,
+                               relx=2,
+                               rely=top_division_height + 3,
+                               editable=False)
+
         self.dialogueBoxOutline = self.add(npyscreen.BoxBasic,
                                            max_width=inventory_width + art_width,
                                            max_height=3,
                                            relx=1,
-                                           rely=top_division_height + 2)
+                                           rely=top_division_height + 2 + 9,
+                                           editable=False)
 
         self.dialogueBox = self.add(npyscreen.Textfield,
                                     name='Type Here',
-                                    max_width=inventory_width + art_width - 7,
+                                    max_width=inventory_width + art_width - 14,
                                     max_height=1,
                                     relx=2,
-                                    rely=top_division_height + 3)
+                                    rely=top_division_height + 3 + 9)
 
-        self.tryAction = self.add(ExitButton, name="Send", relx=inventory_width + art_width - 7, rely=top_division_height + 3)
+        self.sendButton = self.add(Handler,
+                                   name="Send",
+                                   relx=inventory_width + art_width - 7,
+                                   rely=top_division_height + 3 + 9)
+        self.quitButton = self.add(QuitButton,
+                                   name="Quit",
+                                   relx=1,
+                                   rely=1)

Adventure Game/adventure_game/Handler.py

@@ -0,0 +1,107 @@
+import npyscreen
+
+from yaml_parser import parse_datafile as parse
+
+
+class Handler(npyscreen.ButtonPress):
+    """
+    Very important, called when the player hits send, there are several things we need to do here:
+    1: handle the player's input, and run logic, this is done in handler.py
+    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.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()
+
+        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))
+            command = ''
+        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)[
+                    player.playerData['player']['location']]
+
+                # 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)
+
+            # TODO: Should upgrade these to use fuzzy words library! and not direct comparisons!
+            if command == 'LOOK':
+                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("Not sure what you're trying to look at.")
+
+            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:
+                            # 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.")
+
+            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))
+
+        # 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/MainMenu.py

@@ -0,0 +1,21 @@
+import npyscreen
+
+
+from Player import Player
+
+
+class MainMenu(npyscreen.Form):
+    """
+    This is the main menu, code here should only be for
+    initializing the player data and any settings they want to change
+    """
+    def afterEditing(self):
+        # TODO: the game needs to happen after this inital main menu
+        self.parentApp.setNextForm('GAME')
+
+    def create(self):
+        self.add(npyscreen.FixedText, value='You cannot select a file yet! Just hit OK', editable=False)
+        self.playerSaveLocation = self.add(npyscreen.TitleFilenameCombo, name="Your save file:")
+
+        self.parentApp.player = Player(self.parentApp.mainPath / 'playerdata/defaults/default_player.yaml')
+        self.add(npyscreen.MultiLineEdit, value=self.parentApp.gamelib['menu']['graphics']['logo'], editable=False)

Adventure Game/adventure_game/Player.py

@@ -1,6 +1,10 @@
 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
 

Adventure Game/adventure_game/__main__.py

@@ -0,0 +1,83 @@
+import pathlib
+import npyscreen
+import logging
+from npyscreen import NotEnoughSpaceForWidget
+from os import system
+
+from yaml_parser import parse_datafile as parse
+from GameNavigator import GameNavigator
+from MainMenu import MainMenu
+
+
+class AlphaWarning(npyscreen.Popup):
+    def afterEditing(self):
+        self.parentApp.setNextForm('MENU')
+
+    def create(self):
+        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):
+    """
+    This is the 'root' of the entire game!
+    """
+    # Do on creation
+    def onStart(self):
+        # Setup some important 'global' values we'll need later
+        # Set the path all other files will follow
+        self.mainPath = pathlib.Path(__file__).parent
+
+        # Setup logging
+        self.log = logging
+        self.log.basicConfig(filename=self.mainPath / 'logs/AdventureGame.log',
+                             filemode='w',
+                             level=logging.DEBUG)
+        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.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.
+        self.player = None
+
+
+
+        # Set screen size before drawing windows
+        dimensions = self.gamelib['menu']['graphics']['dimensions']
+        #system('mode con: cols={0} lines={1}'.format(
+        #    dimensions['inventory_width']+dimensions['art_width'],
+        #    30)) # TODO: Finish setting this up.
+
+        # Set theme
+        #TODO: modify custom theme?
+        npyscreen.setTheme(npyscreen.Themes.ElegantTheme)
+
+        # Draw game windows
+        self.addForm('GAME', GameNavigator, name='Unnamed Adventure Game')  # This window should draw the actual game
+        self.addForm('MENU', MainMenu, name='Welcome to the main menu')  # This window should draw the main menu
+        self.addForm('MAIN', AlphaWarning, name='Welcome to the alpha!')  # This window is only needed for the ALPHA
+
+        # TODO: Create a 'splash screen' or, traditional "main menu"
+
+
+if __name__ == '__main__':
+    # Set the screen size bigger
+    system('mode con: cols={0} lines={1}'.format(124, 36))
+
+    # Make a new adventure game if not imported
+    adventure_game = AdventureGame()
+
+    # Run the game!
+    try:
+        adventure_game.run()
+    except NotEnoughSpaceForWidget:
+        # This exception should catch if a player tries to play in a screen that is too small.
+        print('Your screen is too small!\nOr, Joe has not fixed https://kitsunehosting.net/gitea/Kenwood/SNHU-IT-140/issues/7')

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/office.yaml

@@ -7,6 +7,6 @@ office:
     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"
+    look_at: "log viewer looks like garbo"
     inspect: "beep boop"
     pick_up: "You pick up the *LOG VIEWER*."

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']"

Adventure Game/adventure_game/main.py

@@ -1,61 +0,0 @@
-import npyscreen, sys
-from npyscreen import NotEnoughSpaceForWidget
-from os import system
-
-from yaml_parser import parse_datafile as parse
-from GameNavigator import GameNavigator
-
-
-class MainMenu(npyscreen.Form):
-    def afterEditing(self):
-        # TODO: the game needs to happen after this inital main menu
-        self.parentApp.setNextForm('GAME')
-
-    def create(self):
-        self.add(npyscreen.FixedText, value='You cannot select a file yet! Just hit OK', editable=False)
-        self.playerSaveLocation = self.add(npyscreen.TitleFilenameCombo, name="Your save file:")
-        self.add(npyscreen.MultiLineEdit, value=self.parentApp.gamelib['menu']['graphics']['logo'], editable=False)
-
-
-class AlphaWarning(npyscreen.Popup):
-    def afterEditing(self):
-        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)
-
-
-class AdventureGame(npyscreen.NPSAppManaged):
-    # Do on creation
-    def onStart(self):
-        # Setup some important 'global' values we'll need later
-        self.gamelib = parse(
-            'gamedata/gamelib.yaml')  # parse this data first (since it includes graphics for the main menu
-        self.playerSaveLocation = None  # We'll load the save location after the player gets to the save select screen
-
-        # Set screen size before drawing windows
-        dimensions = self.gamelib['menu']['graphics']['dimensions']
-        system('mode con: cols={0} lines={1}'.format(
-            dimensions['inventory_width']+dimensions['art_width'],
-            30)) # TODO: Finish setting this up.
-
-        # Draw game windows
-        self.addForm('GAME', GameNavigator, name='Unnamed Adventure Game')  # This window should draw the actual game
-        self.addForm('MENU', MainMenu, name='Welcome to the main menu')  # This window should draw the main menu
-        self.addForm('MAIN', AlphaWarning, name='Welcome to the alpha!')  # This window is only needed for the ALPHA
-
-        # TODO: Create a 'splash screen' or, traditional "main menu"
-
-
-if __name__ == '__main__':
-    # Make a new adventure game if not imported
-    adventure_game = AdventureGame()
-
-    # Run the game!
-    try:
-        adventure_game.run()
-    except NotEnoughSpaceForWidget:
-        # This exception should catch if a player tries to play in a screen that is too small.
-        print('Your screen is too small!\nOr, Joe has not fixed https://kitsunehosting.net/gitea/Kenwood/SNHU-IT-140/issues/7')

Adventure Game/adventure_game/playerdata/defaults/default_player.yaml

@@ -0,0 +1,4 @@
+player:
+  name: 'Default'
+  location: 'office'
+  inventory: ['test', 'test2']