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

Adventure Game/adventure_game/Handler.py

@@ -1,7 +1,5 @@
 import npyscreen
 
-from yaml_parser import parse_datafile as parse
-
 
 class Handler(npyscreen.ButtonPress):
     """
@@ -10,14 +8,11 @@ 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.upper()
+        raw_command = self.parent.dialogueBox.value
-
+        self.parent.dialogueBox.value = '' # Clear the dialogue box, TODO: This may become unneeded if issue #8 is fixed
-        # 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()
@@ -25,60 +20,12 @@ class Handler(npyscreen.ButtonPress):
         try:
             command = parsed_command.pop(0)
         except IndexError:
-            self.parent.parentApp.log.warn(
+            self.parent.parentApp.log.warn('Command "{0}" could not be split, was it malformed or incomplete?'.format(raw_command))
-                '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 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)
-        # Make sure to re-draw the art box when we're all done (in case we updated it in logic above)
+        self.parent.update_log('args: {0}'.format(arguments))
         self.parent.artContent.display()
-
-        # Switch back to the game menu.
-        # TODO: possibly deprecate this statement?
         self.parent.parentApp.switchForm('GAME')

Adventure Game/adventure_game/__main__.py

@@ -14,14 +14,9 @@ class AlphaWarning(npyscreen.Popup):
         self.parentApp.setNextForm('MENU')
 
     def create(self):
-        self.add(npyscreen.MultiLineEdit, value="""Welcome to Unnamed Adventure game!
+        self.add(npyscreen.Pager, values=['Welcome to Unnamed Adventure game!',
-This game is still in ALPHA! And a TON
+                                          'Please enjoy your stay and report any bugs at',
-of features are not implemented.
+                                          'kitsunehosting.net'], editable=False)
-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):
@@ -42,7 +37,8 @@ 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/world/blank_room.yaml

@@ -1,4 +0,0 @@
-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/logs/AdventureGame.log

@@ -1,5 +0,0 @@
-INFO:root:Logging started!
-DEBUG:root:Gamelib at adventure_game\gamedata\gamelib.yaml
-DEBUG:root:Send button pressed!
-WARNING:root:Command "" could not be split, was it malformed or incomplete?
-INFO:root:Parsed command "" with arguments "[]"