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

Compare commits

base: Kenwood:2f8dd761ba929b7c41b66ff5f938857a1653c6bd
Branches Tags
Kenwood:master
Kenwood:adventure-game-rooms
Kenwood:adventure-game
Kenwood:npyscreen-adventure-game
Kenwood:AdventureGame--0.2
Kenwood:AdvetureGame
..
compare: Kenwood:377bb43e42cef2cad9b3d30d4fb141939d51e30d
Branches Tags
Kenwood:master
Kenwood:adventure-game-rooms
Kenwood:adventure-game
Kenwood:npyscreen-adventure-game
Kenwood:AdventureGame--0.2
Kenwood:AdvetureGame

No commits in common. "2f8dd761ba929b7c41b66ff5f938857a1653c6bd" and "377bb43e42cef2cad9b3d30d4fb141939d51e30d" have entirely different histories.
2f8dd761ba ... 377bb43e42

4 changed files with 40 additions and 55 deletions
Show Stats Expand all files Collapse all files

83
Adventure Game/adventure_game/Handler.py
View File

@ -46,7 +46,8 @@ class Handler(npyscreen.ButtonPress):
player = self.parent.parentApp.player player = self.parent.parentApp.player
roomlocation = player.playerData['player']['location'] + '.yaml' roomlocation = player.playerData['player']['location'] + '.yaml'
try: try:
room = parse(self.parent.parentApp.mainPath / 'gamedata/world' / roomlocation)['room'] room = parse(self.parent.parentApp.mainPath / 'gamedata/world' / roomlocation)[
player.playerData['player']['location']]
# If the file could not be found # If the file could not be found
except FileNotFoundError: except FileNotFoundError:
@ -62,55 +63,45 @@ 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':
try: if arguments[0] == 'AROUND':
if arguments[0] == 'AROUND': try:
try: self.parent.update_log(room['look_around'])
self.parent.update_log(room['look_around']) except KeyError:
except KeyError: self.parent.update_log('There is nothing to look at?.. This might be a bug.')
self.parent.update_log('There is nothing to look at?.. This might be a bug.') if arguments[0] == 'AT':
if arguments[0] == 'AT': try:
try: # Argument[1] is the "thing" you want to look at, yaml is lowercase so we lowercase it.
# Argument[1] is the "thing" you want to look at, yaml is lowercase so we lowercase it. self.parent.update_log(room[arguments[1].lower()]['look_at'])
self.parent.update_log(room[arguments[1].lower()]['look_at']) except KeyError:
except KeyError: self.parent.update_log("Not sure what you're trying to look at.")
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':
try: if arguments[0] == 'UP':
if arguments[0] == 'UP': if len(
if len( arguments) <= 2: # If there are only 2 args ex:up, item then we dont need to merge that last arg
arguments) <= 2: # If there are only 2 args ex:up, item then we dont need to merge that last arg try:
try: # Argument[1] is the "thing" you want to pick up, yaml is lowercase so we lowercase it.
# 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.parentApp.log.info('Player tried to pick up {0}'.format(arguments[1])) self.parent.update_log(room[arguments[1].lower()]['pick_up'])
self.parent.update_log(room[arguments[1].lower()]['pick_up']) except KeyError:
except KeyError: self.parent.update_log("You cant pick that up.")
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:
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.parentApp.log.info('Player tried to pick up long object {0}'.format(long_arg)) self.parent.update_log(room[long_arg.lower()]['pick_up'])
self.parent.update_log(room[long_arg.lower()]['pick_up']) except KeyError:
except KeyError: self.parent.update_log("You cant pick that up.")
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:
self.parent.parentApp.log.info('Player tried to open door: {0}'.format(arguments[0])) self.parent.parentApp.log.info('Player tried to open door: {0}'.format(arguments[0]))
new_room = room[arguments[0].lower()]['leads_to'] new_room = room[arguments[0].lower()]['leads_to']
self.parent.parentApp.log.debug('New room is: {0}'.format(new_room)) self.parent.parentApp.log.debug('New room is: {0}'.format(new_room))
upon_enter = player.change_room(new_room) # Change the player to that new room. except KeyError:
self.parent.update_log(upon_enter) # Print the new room upon enter text. self.parent.update_log("You cant open that.")
#except KeyError: except IndexError:
# self.parent.update_log("You cant open that.") self.parent.update_log("you must specify something to open")
#except IndexError:
# self.parent.update_log("you must specify something to open")
else: else:
self.parent.parentApp.log.info('Player\'s command was not understood: {0}'.format(command)) self.parent.parentApp.log.info('Player\'s command was not understood: {0}'.format(command))

8
Adventure Game/adventure_game/Player.py
View File

@ -1,12 +1,10 @@
from yaml_parser import parse_datafile as parse from yaml_parser import parse_datafile as parse
class Player: class Player:
""" """
This class intended to abstract out the actual yaml data into a player.(item) that is more This class intended to abstract out the actual yaml data into a player.(item) that is more
friendly to handle in code. friendly to handle in code.
""" """
def __init__(self, save_location): def __init__(self, save_location):
self.save_location = save_location self.save_location = save_location
@ -17,8 +15,4 @@ class Player:
Should move the player to a new room Should move the player to a new room
TODO: Put a check here that checks if the room we're moving to exists! TODO: Put a check here that checks if the room we're moving to exists!
""" """
self.playerData['player']['location'] = new_room self.playerData['player']['location'] = new_room
room = self.playerData['player']['location']
return parse('adventure_game/gamedata/world/' + room)['room']['upon_enter']

2
Adventure Game/adventure_game/gamedata/world/hallway.yaml
View File

@ -1,4 +1,4 @@
room: office:
grid: [0, 1] grid: [0, 1]
upon_enter: "You are standing just outside your office door." upon_enter: "You are standing just outside your office door."
look_around: "You look up, and down the hallway, you see the receptionists |desk|. And a |closet| at the other end of the hall." look_around: "You look up, and down the hallway, you see the receptionists |desk|. And a |closet| at the other end of the hall."

2
Adventure Game/adventure_game/gamedata/world/office.yaml
View File

@ -1,4 +1,4 @@
room: office:
grid: [0, 0] grid: [0, 0]
upon_enter: "You are standing behind your desk, you see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|" upon_enter: "You are standing behind your desk, you see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|"
look_around: "You look around the room, you see a |DESK|, a |BOOKSHELF| and the |DOOR|" look_around: "You look around the room, you see a |DESK|, a |BOOKSHELF| and the |DOOR|"