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 +35 -27
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 301d3d75db - Show all commits

62
Adventure Game/adventure_game/Handler.py
View File

@ -63,35 +63,43 @@ class Handler(npyscreen.ButtonPress):
# TODO: Should upgrade these to use fuzzy words library! and not direct comparisons! # TODO: Should upgrade these to use fuzzy words library! and not direct comparisons!
if command == 'LOOK': if command == 'LOOK':
if arguments[0] == 'AROUND': try:
try: if arguments[0] == 'AROUND':
self.parent.update_log(room['look_around']) try:
except KeyError: self.parent.update_log(room['look_around'])
self.parent.update_log('There is nothing to look at?.. This might be a bug.') except KeyError:
if arguments[0] == 'AT': self.parent.update_log('There is nothing to look at?.. This might be a bug.')
try: if arguments[0] == 'AT':
# Argument[1] is the "thing" you want to look at, yaml is lowercase so we lowercase it. try:
self.parent.update_log(room[arguments[1].lower()]['look_at']) # Argument[1] is the "thing" you want to look at, yaml is lowercase so we lowercase it.
except KeyError: self.parent.update_log(room[arguments[1].lower()]['look_at'])
self.parent.update_log("Not sure what you're trying to 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': elif command == 'PICK':
if arguments[0] == 'UP': try:
if len( if arguments[0] == 'UP':
arguments) <= 2: # If there are only 2 args ex:up, item then we dont need to merge that last arg if len(
try: arguments) <= 2: # If there are only 2 args ex:up, item then we dont need to merge that last arg
# Argument[1] is the "thing" you want to pick up, yaml is lowercase so we lowercase it. try:
self.parent.parentApp.log.info('Player tried to pick up {0}'.format(arguments[1])) # Argument[1] is the "thing" you want to pick up, yaml is lowercase so we lowercase it.
self.parent.update_log(room[arguments[1].lower()]['pick_up']) self.parent.parentApp.log.info('Player tried to pick up {0}'.format(arguments[1]))
except KeyError: self.parent.update_log(room[arguments[1].lower()]['pick_up'])
self.parent.update_log("You cant pick that up.") except KeyError:
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 self.parent.update_log("You cant pick that up.")
try: 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
long_arg = '_'.join(arguments[1:]) # Joins whatever comes after 1 in our args with '_' between try:
self.parent.parentApp.log.info('Player tried to pick up long object {0}'.format(long_arg)) long_arg = '_'.join(arguments[1:]) # Joins whatever comes after 1 in our args with '_' between
self.parent.update_log(room[long_arg.lower()]['pick_up']) self.parent.parentApp.log.info('Player tried to pick up long object {0}'.format(long_arg))
except KeyError: self.parent.update_log(room[long_arg.lower()]['pick_up'])
self.parent.update_log("You cant pick that 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': elif command == 'OPEN':
try: try: