Compare commits
16 Commits
e58af07b5e
...
AdvetureGa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3928084098 | ||
|
|
6f10d6420b | ||
|
|
45b3252838 | ||
|
|
695fcca522 | ||
|
|
234d03db60 | ||
|
|
4d85b25dab | ||
|
|
705a00fe9c | ||
|
|
773d48b732 | ||
|
|
56f3fb2fee | ||
|
|
6c162e42b4 | ||
|
|
5184bd9121 | ||
|
|
f0f7c40617 | ||
|
|
aaf4842b0b | ||
|
|
cc0f6f9f9e | ||
|
|
0c1770ef0a | ||
|
|
87fdc6b91e |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
|
|
||||||
*.pyc
|
*.pyc
|
||||||
.idea
|
.idea
|
||||||
|
Adventure Game/adventure_game/logs/AdventureGame.log
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ class GameNavigator(npyscreen.FormBaseNew):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
def update_log(self, newline):
|
def update_log(self, newline):
|
||||||
self.logList.append(newline) # Append the newline
|
self.logList.append('> ' + newline) # Append the newline
|
||||||
self.logList = self.logList[-7:] # Truncate to only the last 5 lines
|
self.logList = self.logList[-7:] # Truncate to only the last 5 lines
|
||||||
|
|
||||||
res = '' # Convert the list to a string
|
res = '' # Convert the list to a string
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import npyscreen
|
import npyscreen
|
||||||
|
|
||||||
|
from yaml_parser import parse_datafile as parse
|
||||||
|
|
||||||
|
|
||||||
class Handler(npyscreen.ButtonPress):
|
class Handler(npyscreen.ButtonPress):
|
||||||
"""
|
"""
|
||||||
@@ -8,9 +10,14 @@ class Handler(npyscreen.ButtonPress):
|
|||||||
2: prepare new items to display on the screen
|
2: prepare new items to display on the screen
|
||||||
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.upper()
|
||||||
|
|
||||||
|
# Clear the dialogue box, TODO: This may become unneeded if issue #8 is fixed
|
||||||
|
self.parent.dialogueBox.value = ''
|
||||||
|
|
||||||
# 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()
|
||||||
@@ -18,11 +25,83 @@ class Handler(npyscreen.ButtonPress):
|
|||||||
try:
|
try:
|
||||||
command = parsed_command.pop(0)
|
command = parsed_command.pop(0)
|
||||||
except IndexError:
|
except IndexError:
|
||||||
pass
|
self.parent.parentApp.log.warn(
|
||||||
arguments = parsed_command
|
'Command "{0}" could not be split, was it malformed or incomplete?'.format(raw_command))
|
||||||
|
command = ''
|
||||||
|
arguments = parsed_command # Whatever is left in the list, are arguments.
|
||||||
|
|
||||||
self.parent.update_log('command: ' + command)
|
# Handle an empty command
|
||||||
self.parent.update_log('args: {0}'.format(arguments))
|
if len(command) <= 2:
|
||||||
self.parent.dialogueBox.value = ''
|
self.parent.update_log('Command was too short, try something like "MOVE", "LOOK AROUND" or "USE".')
|
||||||
|
|
||||||
|
else:
|
||||||
|
# Concatenate everything back together (just to show the user the program understood them correctly
|
||||||
|
self.parent.update_log(command + ' ' + ' '.join(str(s) for s in arguments))
|
||||||
|
|
||||||
|
"""
|
||||||
|
This is where real logic can happen!
|
||||||
|
"""
|
||||||
|
|
||||||
|
# Localize the player
|
||||||
|
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']]
|
||||||
|
|
||||||
|
# If the file could not be found
|
||||||
|
except FileNotFoundError:
|
||||||
|
# Log a critical error!
|
||||||
|
self.parent.parentApp.log.critical(
|
||||||
|
'Handler could not load the current room! Is the player file corrupt or was there a typo? Path was {0}'.format(
|
||||||
|
self.parent.parentApp.mainPath / 'gamedata/world' / roomlocation))
|
||||||
|
# Put the player in a blank room i forgot to finish
|
||||||
|
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)
|
||||||
|
|
||||||
|
# TODO: Should upgrade these to use fuzzy words library! and not direct comparisons!
|
||||||
|
if command == 'LOOK':
|
||||||
|
if arguments[0] == 'AROUND':
|
||||||
|
try:
|
||||||
|
self.parent.update_log(room['look_around'])
|
||||||
|
except KeyError:
|
||||||
|
self.parent.update_log('There is nothing to look at?.. This might be a bug.')
|
||||||
|
if arguments[0] == 'AT':
|
||||||
|
try:
|
||||||
|
# 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'])
|
||||||
|
except KeyError:
|
||||||
|
self.parent.update_log("Not sure what you're trying to look at.")
|
||||||
|
|
||||||
|
if 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
|
||||||
|
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
|
||||||
|
try:
|
||||||
|
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:
|
||||||
|
self.parent.update_log("You cant pick that up.")
|
||||||
|
|
||||||
|
if command == 'WHERE':
|
||||||
|
# TODO: this should take the human readable room name, not the code-name
|
||||||
|
self.parent.update_log('You are in {0}.'.format(room))
|
||||||
|
|
||||||
|
# Log the command that we parsed
|
||||||
|
self.parent.parentApp.log.info('Parsed command "{0}" with arguments "{1}"'.format(command, arguments))
|
||||||
|
|
||||||
|
# Make sure to re-draw the art box when we're all done (in case we updated it in logic above)
|
||||||
self.parent.artContent.display()
|
self.parent.artContent.display()
|
||||||
|
|
||||||
|
# Switch back to the game menu.
|
||||||
|
# TODO: possibly deprecate this statement?
|
||||||
self.parent.parentApp.switchForm('GAME')
|
self.parent.parentApp.switchForm('GAME')
|
||||||
|
|||||||
@@ -14,9 +14,14 @@ class AlphaWarning(npyscreen.Popup):
|
|||||||
self.parentApp.setNextForm('MENU')
|
self.parentApp.setNextForm('MENU')
|
||||||
|
|
||||||
def create(self):
|
def create(self):
|
||||||
self.add(npyscreen.Pager, values=['Welcome to Unnamed Adventure game!',
|
self.add(npyscreen.MultiLineEdit, value="""Welcome to Unnamed Adventure game!
|
||||||
'Please enjoy your stay and report any bugs at',
|
This game is still in ALPHA! And a TON
|
||||||
'kitsunehosting.net'], editable=False)
|
of features are not implemented.
|
||||||
|
Please check out the git project for
|
||||||
|
details and updates! and please report
|
||||||
|
any bugs! Thank you and enjoy!
|
||||||
|
https://kitsunehosting.net/gitea/Kenwood/SNHU-IT-140/issues""",
|
||||||
|
editable=False)
|
||||||
|
|
||||||
|
|
||||||
class AdventureGame(npyscreen.NPSAppManaged):
|
class AdventureGame(npyscreen.NPSAppManaged):
|
||||||
@@ -31,11 +36,14 @@ class AdventureGame(npyscreen.NPSAppManaged):
|
|||||||
|
|
||||||
# Setup logging
|
# Setup logging
|
||||||
self.log = logging
|
self.log = logging
|
||||||
self.log.basicConfig(filename=self.mainPath / 'logs/AdventureGame.log', filemode='w', level=logging.DEBUG)
|
self.log.basicConfig(filename=self.mainPath / 'logs/AdventureGame.log',
|
||||||
|
filemode='w',
|
||||||
|
level=logging.DEBUG)
|
||||||
|
self.log.info('Logging started!')
|
||||||
|
|
||||||
# Parse world
|
# parse this data first (since it includes graphics for the main menu
|
||||||
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
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
blank_room:
|
||||||
|
grid: [-1, -1]
|
||||||
|
upon_enter: "You're in a blank room. It looks unfinished, like joe forgot to put something here"
|
||||||
|
look_around: "There is nothing to look at, you should tell joe you're here."
|
||||||
@@ -7,6 +7,6 @@ office:
|
|||||||
look_at: "You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|"
|
look_at: "You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|"
|
||||||
inspect: "Desk, ornate, stuff"
|
inspect: "Desk, ornate, stuff"
|
||||||
log_viewer:
|
log_viewer:
|
||||||
look_at: "logviewer looks like garbo"
|
look_at: "log viewer looks like garbo"
|
||||||
inspect: "beep boop"
|
inspect: "beep boop"
|
||||||
pick_up: "You pick up the *LOG VIEWER*."
|
pick_up: "You pick up the *LOG VIEWER*."
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
INFO:root:Logging started!
|
||||||
|
DEBUG:root:Gamelib at adventure_game\gamedata\gamelib.yaml
|
||||||
|
DEBUG:root:Send button pressed!
|
||||||
|
DEBUG:root:{'grid': [0, 0], '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|', 'pick_up_logviewer': 'You pick the *LOG VIEWER* up.', 'desk': {'look_at': 'You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'inspect': 'Desk, ornate, stuff'}, 'log_viewer': {'look_at': 'logviewer looks like garbo', 'inspect': 'beep boop', 'pick_up': 'You pick up the *LOG VIEWER*.'}}
|
||||||
|
INFO:root:Parsed command "LOOK" with arguments "['AROUND']"
|
||||||
|
DEBUG:root:Send button pressed!
|
||||||
|
DEBUG:root:{'grid': [0, 0], '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|', 'pick_up_logviewer': 'You pick the *LOG VIEWER* up.', 'desk': {'look_at': 'You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'inspect': 'Desk, ornate, stuff'}, 'log_viewer': {'look_at': 'logviewer looks like garbo', 'inspect': 'beep boop', 'pick_up': 'You pick up the *LOG VIEWER*.'}}
|
||||||
|
INFO:root:Parsed command "LOOK" with arguments "['AT', 'DESK']"
|
||||||
|
DEBUG:root:Send button pressed!
|
||||||
|
DEBUG:root:{'grid': [0, 0], '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|', 'pick_up_logviewer': 'You pick the *LOG VIEWER* up.', 'desk': {'look_at': 'You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'inspect': 'Desk, ornate, stuff'}, 'log_viewer': {'look_at': 'logviewer looks like garbo', 'inspect': 'beep boop', 'pick_up': 'You pick up the *LOG VIEWER*.'}}
|
||||||
|
INFO:root:Parsed command "LOOK" with arguments "['AT', 'DOOR']"
|
||||||
|
DEBUG:root:Send button pressed!
|
||||||
|
DEBUG:root:{'grid': [0, 0], '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|', 'pick_up_logviewer': 'You pick the *LOG VIEWER* up.', 'desk': {'look_at': 'You move to stand behind your desk. You see a |NAMEPLATE|, a |TAPE RECORDER| and your trusty |LOG VIEWER|', 'inspect': 'Desk, ornate, stuff'}, 'log_viewer': {'look_at': 'logviewer looks like garbo', 'inspect': 'beep boop', 'pick_up': 'You pick up the *LOG VIEWER*.'}}
|
||||||
|
INFO:root:Parsed command "LOOK" with arguments "['AT', 'BOOKSHELF']"
|
||||||
|
|||||||
Reference in New Issue
Block a user