Kenwood
/
SNHU-IT-140
1
1
Fork 0
Code Issues 3 Pull Requests 2 Releases 2 Wiki Activity

adventure-game #3

Open
Kenwood wants to merge 80 commits from adventure-game into master
pull from: adventure-game
merge into: Kenwood:master
Conversation 1 Commits 80 Files Changed 19 +11 -10
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bcb2ee060d - Show all commits

15
Adventure Game/adventure_game/Handler.py
View File

@ -46,8 +46,7 @@ class Handler(npyscreen.ButtonPress):
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']]
room = parse(self.parent.parentApp.mainPath / 'gamedata/world' / roomlocation)['room']
# If the file could not be found
except FileNotFoundError:
@ -102,14 +101,16 @@ class Handler(npyscreen.ButtonPress):
self.parent.update_log("You must specify something to pick up.")
elif command == 'OPEN':
try:
#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))
except KeyError:
self.parent.update_log("You cant open that.")
except IndexError:
self.parent.update_log("you must specify something to open")
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))