7 Commits

Author SHA1 Message Date
Joe S
6d9c78c801 Complete the 2-3 Assignment 2021-01-20 00:20:26 -05:00
Joe S
e08e312789 Fix grade calculation 2021-01-20 00:06:27 -05:00
Joe S
a79e01ee28 Create creating_passwords.py 2021-01-16 23:22:49 -05:00
Joe S
2f215aa45b Create count_characters.py 2021-01-16 23:07:56 -05:00
Joe S
970aa86bcb Refactor name_format 2021-01-16 22:57:33 -05:00
Joe S
9b128a8a96 Create name_format.py 2021-01-16 22:56:07 -05:00
Joe S
e494261948 Create grade_calculation.py 2021-01-16 22:56:04 -05:00
29 changed files with 129 additions and 322 deletions

2
.gitignore vendored
View File

@@ -1,4 +1,2 @@
*.pyc *.pyc
.idea
Adventure Game/adventure_game/logs/AdventureGame.log

3
2/2-3/.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,3 @@
# Default ignored files
/shelf/
/workspace.xml

11
2/2-3/.idea/2-3.iml generated Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="pytest" />
</component>
</module>

View File

@@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</settings>
</component>

4
2/2-3/.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
</project>

8
2/2-3/.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/2-3.iml" filepath="$PROJECT_DIR$/.idea/2-3.iml" />
</modules>
</component>
</project>

6
2/2-3/.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

Binary file not shown.

Binary file not shown.

20
2/2-3/main.py Normal file
View File

@@ -0,0 +1,20 @@
import datetime
def prompt_user():
name = input('What is your name? ')
try:
age = int(input('How old are you? '))
except ValueError:
return 'Age must be a number.'
return 'Hello {0}! You were born in {1}.'.format(name, get_year() - age)
def get_year():
now = datetime.datetime.now()
return now.year
if __name__ == '__main__':
print(prompt_user())

View File

@@ -0,0 +1,20 @@
def output_format_one(first, middle, last):
_format = "{0}, {1}.".format(last, first[0])
return _format
def output_format_two(first, middle, last):
_format = "{0}, {1}.{2}.".format(last, first[0], middle[0])
return _format
if __name__ == '__main__':
name = input("Input your name: ")
name = name.split(' ')
if len(name) == 2:
name = output_format_one(name[0], None, name[1])
elif len(name) == 3:
name = output_format_two(name[0], name[1], name[2])
print(name)

View File

@@ -0,0 +1,15 @@
if __name__ == '__main__':
_input = input()
character, phrase = [_input.split(' ', 1)[i] for i in range(2)]
frequency = phrase.count(character)
frequency_nocase = phrase.upper().count(character.upper())
if frequency != 0:
print(frequency)
#elif frequency_nocase > 0: # Lol im stupid~
# print("{0} is diferent than {1}.".format(character, character.upper()))
if frequency == 0 & frequency_nocase == 0:
print(frequency)

View File

@@ -0,0 +1,16 @@
if __name__ == '__main__':
favorite_color = input('Enter favorite color:\n')
pets_name = input('Enter pet\'s name:\n')
favorite_number = input('Enter a number:\n')
print('You entered: {0} {1} {2}\n'.format(favorite_color, pets_name, favorite_number))
first_password = '{0}_{1}'.format(favorite_color, pets_name)
second_password = '{0}{1}{0}'.format(favorite_number, favorite_color)
print('First password: {0}'.format(first_password))
print('Second password: {0}\n'.format(second_password))
print('Number of characters in {0}: {1}'.format(first_password, len(first_password)))
print('Number of characters in {0}: {1}'.format(second_password, len(second_password)))

View File

@@ -0,0 +1,20 @@
def collect_grades():
grades = []
print('Enter a score on an exam. If the weight is different than x/100 specify using (grade)/(weight).')
while True:
_input = input('''Enter a score on an exam. ( 93 OR 93/100)\n(Press enter to stop):\n''')
if len(_input) == 0:
break
grades.append(_input)
return grades
if __name__ == '__main__':
print(collect_grades())
exam1_grade = float(input('Enter score on Exam 1 (out of 100):\n'))
exam2_grade = float(input('Enter score on Exam 2 (out of 100):\n'))
exam3_grade = float(input('Enter score on Exam 3 (out of 100):\n'))
overall_grade = (exam1_grade + exam2_grade + exam3_grade) / 3
print('Your overall grade is:', overall_grade)

View File

View File

@@ -1,2 +0,0 @@
venv
inspectionProfiles

View File

@@ -1,7 +0,0 @@
init:
pip install -r requirements.txt
test:
py.test tests
.PHONY: init test

View File

@@ -1,97 +0,0 @@
import npyscreen
import sys
from Handler import Handler
class QuitButton(npyscreen.ButtonPress):
def whenPressed(self):
sys.exit(0)
class GameNavigator(npyscreen.FormBaseNew):
"""
This class handles all the drawing and 'graphics' of our game.
only basic logic like initial loading should happen here. re-drawing
and game logic should be done in Handler.py
TODO: Find a fix for initial room startup
TODO: Find a way to reset the cursor after a user hits sendButton
"""
def update_log(self, newline):
self.logList.append(newline) # Append the newline
self.logList = self.logList[-7:] # Truncate to only the last 5 lines
res = '' # Convert the list to a string
for element in self.logList:
res = res + str(element) + '\n'
res = res.upper() # Log is always uppercase
self.logBox.value = res # Set the logbox to that value
def create(self):
top_division_height = 20
inventory_width = 20
art_width = 100
self.logList = []
self.artBox = self.add(npyscreen.BoxBasic,
name='ArtBox',
max_width=art_width,
max_height=top_division_height,
rely=2,
relx=inventory_width + 1,
editable=False)
self.artContent = self.add(npyscreen.MultiLineEdit,
rely=3,
relx=inventory_width + 2,
max_width=art_width - 2,
max_height=top_division_height - 2,
value=self.parentApp.gamelib['menu']['graphics']['not_found'],
editable=False)
self.artBox.footer = 'Unknown Location'
self.artBox = self.add(npyscreen.BoxBasic,
name='Inventory',
max_width=inventory_width,
max_height=top_division_height,
relx=1,
rely=2,
editable=False)
self.logBoxOutline = self.add(npyscreen.BoxBasic,
max_width=inventory_width + art_width,
max_height=9,
relx=1,
rely=top_division_height + 2,
editable=False)
self.logBox = self.add(npyscreen.MultiLineEdit,
max_width=inventory_width + art_width - 7,
max_height=7,
relx=2,
rely=top_division_height + 3,
editable=False)
self.dialogueBoxOutline = self.add(npyscreen.BoxBasic,
max_width=inventory_width + art_width,
max_height=3,
relx=1,
rely=top_division_height + 2 + 9,
editable=False)
self.dialogueBox = self.add(npyscreen.Textfield,
name='Type Here',
max_width=inventory_width + art_width - 14,
max_height=1,
relx=2,
rely=top_division_height + 3 + 9)
self.sendButton = self.add(Handler,
name="Send",
relx=inventory_width + art_width - 7,
rely=top_division_height + 3 + 9)
self.quitButton = self.add(QuitButton,
name="Quit",
relx=1,
rely=1)

View File

@@ -1,31 +0,0 @@
import npyscreen
class Handler(npyscreen.ButtonPress):
"""
Very important, called when the player hits send, there are several things we need to do here:
1: handle the player's input, and run logic, this is done in handler.py
2: prepare new items to display on the screen
3: re-render the screen
"""
def whenPressed(self):
self.parent.parentApp.log.debug('Send button pressed!')
# This is the raw command from the user
raw_command = self.parent.dialogueBox.value
self.parent.dialogueBox.value = '' # Clear the dialogue box, TODO: This may become unneeded if issue #8 is fixed
# This is the raw command from the user
parsed_command = raw_command.split()
try:
command = parsed_command.pop(0)
except IndexError:
self.parent.parentApp.log.warn('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.parentApp.log.info('Parsed command "{0}" with arguments "{1}"'.format(command, arguments))
self.parent.update_log('command: ' + command)
self.parent.update_log('args: {0}'.format(arguments))
self.parent.artContent.display()
self.parent.parentApp.switchForm('GAME')

View File

@@ -1,21 +0,0 @@
import npyscreen
from Player import Player
class MainMenu(npyscreen.Form):
"""
This is the main menu, code here should only be for
initializing the player data and any settings they want to change
"""
def afterEditing(self):
# TODO: the game needs to happen after this inital main menu
self.parentApp.setNextForm('GAME')
def create(self):
self.add(npyscreen.FixedText, value='You cannot select a file yet! Just hit OK', editable=False)
self.playerSaveLocation = self.add(npyscreen.TitleFilenameCombo, name="Your save file:")
self.parentApp.player = Player(self.parentApp.mainPath / 'playerdata/defaults/default_player.yaml')
self.add(npyscreen.MultiLineEdit, value=self.parentApp.gamelib['menu']['graphics']['logo'], editable=False)

View File

@@ -1,11 +0,0 @@
from yaml_parser import parse_datafile as parse
class Player:
"""
This class intended to abstract out the actual yaml data into a player.(item) that is more
friendly to handle in code.
"""
def __init__(self, save_location):
self.save_location = save_location
self.playerData = parse(save_location)

View File

@@ -1,79 +0,0 @@
import pathlib
import npyscreen
import logging
from npyscreen import NotEnoughSpaceForWidget
from os import system
from yaml_parser import parse_datafile as parse
from GameNavigator import GameNavigator
from MainMenu import MainMenu
class AlphaWarning(npyscreen.Popup):
def afterEditing(self):
self.parentApp.setNextForm('MENU')
def create(self):
self.add(npyscreen.Pager, values=['Welcome to Unnamed Adventure game!',
'Please enjoy your stay and report any bugs at',
'kitsunehosting.net'], editable=False)
class AdventureGame(npyscreen.NPSAppManaged):
"""
This is the 'root' of the entire game!
"""
# Do on creation
def onStart(self):
# Setup some important 'global' values we'll need later
# Set the path all other files will follow
self.mainPath = pathlib.Path(__file__).parent
# Setup logging
self.log = logging
self.log.basicConfig(filename=self.mainPath / 'logs/AdventureGame.log',
filemode='w',
level=logging.DEBUG)
self.log.info('Logging started!')
# parse this data first (since it includes graphics for the main menu
self.gamelib = parse(
self.mainPath / 'gamedata/gamelib.yaml')
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.
self.player = None
# Set screen size before drawing windows
dimensions = self.gamelib['menu']['graphics']['dimensions']
#system('mode con: cols={0} lines={1}'.format(
# dimensions['inventory_width']+dimensions['art_width'],
# 30)) # TODO: Finish setting this up.
# Set theme
#TODO: modify custom theme?
npyscreen.setTheme(npyscreen.Themes.ElegantTheme)
# Draw game windows
self.addForm('GAME', GameNavigator, name='Unnamed Adventure Game') # This window should draw the actual game
self.addForm('MENU', MainMenu, name='Welcome to the main menu') # This window should draw the main menu
self.addForm('MAIN', AlphaWarning, name='Welcome to the alpha!') # This window is only needed for the ALPHA
# TODO: Create a 'splash screen' or, traditional "main menu"
if __name__ == '__main__':
# Set the screen size bigger
system('mode con: cols={0} lines={1}'.format(124, 36))
# Make a new adventure game if not imported
adventure_game = AdventureGame()
# Run the game!
try:
adventure_game.run()
except NotEnoughSpaceForWidget:
# This exception should catch if a player tries to play in a screen that is too small.
print('Your screen is too small!\nOr, Joe has not fixed https://kitsunehosting.net/gitea/Kenwood/SNHU-IT-140/issues/7')

View File

@@ -1,42 +0,0 @@
menu:
graphics:
logo: |
. __ __ __ ___ __ __
/ / / /___ ____ ____ _____ ___ ___ ____/ / / | ____/ / _____ ____ / /___ __________
/ / / / __ \/ __ \/ __ `/ __ `__ \/ _ \/ __ / / /| |/ __ / | / / _ \/ __ \/ __/ / / / ___/ _ \
/ /_/ / / / / / / / /_/ / / / / / / __/ /_/ / / ___ / /_/ /| |/ / __/ / / / /_/ /_/ / / / __/
\____/_/ /_/_/ /_/\__,_/_/ /_/ /_/\___/\__,_/ /_/ |_\__,_/ |___/\___/_/ /_/\__/\__,_/_/ \___/
_________ __ _________
/ ____/ | / |/ / ____/
/ / __/ /| | / /|_/ / __/
/ /_/ / ___ |/ / / / /___
\____/_/ |_/_/ /_/_____/
not_found: |
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
-----------------------------------------------/ \-----------------------------------------------
----------------------------------------------/ !! \----------------------------------------------
---------------------------------------------/ \---------------------------------------------
--------------------------------------No Art for this location------------------------------------
----------------------------------Consider making a pull request?---------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------
dimensions:
inventory_width: 23
inventory_height: 20
art_width: 101
art_height: 20
dialogue_width: 122
dialogue_height: 20
entry_box_width: 122
entry_box_height: 3

View File

@@ -1,12 +0,0 @@
office:
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*."

View File

@@ -1,4 +0,0 @@
player:
name: 'Default'
location: 'office'
inventory: ['test', 'test2']

View File

@@ -1,12 +0,0 @@
import yaml
def parse_datafile(file):
# With the file open
with open(file, 'r') as stream:
# Try to read it and return it
try:
content = yaml.safe_load(stream)
return content
except yaml.YAMLError as exc:
return exc

View File

@@ -1,2 +0,0 @@
npyscreen~=4.10.5
PyYAML~=5.1.2