Clean up handler
This commit is contained in:
parent
1eb7f0b07b
commit
f400a4c7c3
|
@ -59,7 +59,7 @@ class Handler(npyscreen.ButtonPress):
|
|||
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) # We dont need to log this, its too verbose!
|
||||
# self.parent.parentApp.log.debug(room) # We dont need to log this, its too verbose!
|
||||
|
||||
# TODO: Should upgrade these to use fuzzy words library! and not direct comparisons!
|
||||
if command == 'LOOK':
|
||||
|
@ -77,16 +77,17 @@ class Handler(npyscreen.ButtonPress):
|
|||
|
||||
elif 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
|
||||
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
|
||||
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
|
||||
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:
|
||||
|
|
Loading…
Reference in New Issue