Compare commits

..

No commits in common. "cc0f6f9f9eff2a858cbb1596461811534be11ed7" and "e58af07b5e28da46c26c872383a8eda711eb3c2a" have entirely different histories.

3 changed files with 7 additions and 15 deletions

1
.gitignore vendored
View File

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

View File

@ -9,10 +9,8 @@ class Handler(npyscreen.ButtonPress):
3: re-render the screen 3: re-render the screen
""" """
def whenPressed(self): def whenPressed(self):
self.parent.parentApp.log.debug('Send button pressed!')
# This is the raw command from the user # This is the raw command from the user
raw_command = self.parent.dialogueBox.value raw_command = self.parent.dialogueBox.value
self.parent.dialogueBox.value = '' # Clear the dialogue box, TODO: This may become unneeded if issue #8 is fixed
# This is the raw command from the user # This is the raw command from the user
parsed_command = raw_command.split() parsed_command = raw_command.split()
@ -20,12 +18,11 @@ class Handler(npyscreen.ButtonPress):
try: try:
command = parsed_command.pop(0) command = parsed_command.pop(0)
except IndexError: except IndexError:
self.parent.parentApp.log.warn('Command "{0}" could not be split, was it malformed or incomplete?'.format(raw_command)) pass
command = '' arguments = parsed_command
arguments = parsed_command # Whatever is left in the list, are arguments.
self.parent.parentApp.log.info('Parsed command "{0}" with arguments "{1}"'.format(command, arguments))
self.parent.update_log('command: ' + command) self.parent.update_log('command: ' + command)
self.parent.update_log('args: {0}'.format(arguments)) self.parent.update_log('args: {0}'.format(arguments))
self.parent.dialogueBox.value = ''
self.parent.artContent.display() self.parent.artContent.display()
self.parent.parentApp.switchForm('GAME') self.parent.parentApp.switchForm('GAME')

View File

@ -31,15 +31,11 @@ class AdventureGame(npyscreen.NPSAppManaged):
# Setup logging # Setup logging
self.log = logging self.log = logging
self.log.basicConfig(filename=self.mainPath / 'logs/AdventureGame.log', self.log.basicConfig(filename=self.mainPath / 'logs/AdventureGame.log', filemode='w', level=logging.DEBUG)
filemode='w',
level=logging.DEBUG)
self.log.info('Logging started!')
# parse this data first (since it includes graphics for the main menu # Parse world
self.gamelib = parse( self.gamelib = parse(
self.mainPath / 'gamedata/gamelib.yaml') self.mainPath / 'gamedata/gamelib.yaml') # parse this data first (since it includes graphics for the main menu
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. # Intalize the player as none, the player will be created in the main menu.
self.player = None self.player = None