Jamie/Kanjin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update functions.py

Browse Source 
Removed moot "view_Equip" functions and corrected the change equipment function (still has a small error displaying 'None' after changing a weapon.
This commit is contained in:
KansaiGaijin
2022-12-20 22:55:03 +13:00
committed by GitHub
parent b8064e3e6f
commit 02ea2e4512
1 changed files with 203 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
functions.py
View File

@@ -1,4 +1,6 @@
import time import time
import player
from job_list import Barbarian, Cleric, Wizard from job_list import Barbarian, Cleric, Wizard
from player import * from player import *
from race_list import Elf, Dwarf, Human from race_list import Elf, Dwarf, Human
@@ -10,6 +12,23 @@ def wait():
def startGame(): def startGame():
print("Welcome, stranger.") print("Welcome, stranger.")
start = input("Would you like to create your own character or use pre-generated stats?"
"\n 1) Create a new character\n 2) Pre-generated\n >> ").title()
while True:
if start in ("2", "Pregen"):
print("Please be prepared to enter a name, gender, age, race, and class, from those available in the game."
"\nIf you are unsure what the options are, please go back and create a new character.")
create = input("Do you wish to continue? Y/N\n >> ").lower()
if create in ("y", "yes"):
name = input("Name: ").title()
gender = input("Gender: ").title()
age = int(input("Age: "))
race = input("Race: ").title()
job = input("Job: ").title()
return name, gender, age, race, job
elif create in ("n", "no"):
start = "1"
elif start in ("1", "create"):
while True: # Global check to see if Name, Age, and Gender are correct while True: # Global check to see if Name, Age, and Gender are correct
# Initialise age # Initialise age
age = None age = None
@@ -36,14 +55,14 @@ def startGame():
while True: while True:
# Age # Age
try: try:
age = input(f'How old are you?\n >> ') age = int(input(f'How old are you?\n >> '))
age = int(age)
break break
except ValueError: except ValueError:
print("Sorry I didn't recognise that age. Please type in a whole number.") print("Sorry I didn't recognise that age. Please type in a whole number.")
continue continue
# Double check responses # Double check responses
correct = input(f"Hello, {name}. You are a {age} year old {gender}.\nIs this correct? Y/N\n >> ").lower() correct = input(f"Hello, {name}. You are a {age} year old {gender}."
f"\nIs this correct? Y/N\n >> ").lower()
if correct in ['y', 'yes']: if correct in ['y', 'yes']:
pass pass
elif correct in ['n', 'no']: elif correct in ['n', 'no']:
@@ -83,12 +102,14 @@ def startGame():
continue continue
# Job # Job
while True: while True:
job = input("Please select a job to learn more about it: Barbarian, Cleric, or Wizard.\n >> ").title() job = input("Please select a job to learn more about it: Barbarian, Cleric, or Wizard."
"\n >> ").title()
if job not in ("Barbarian", "Cleric", "Wizard", None): if job not in ("Barbarian", "Cleric", "Wizard", None):
job = input("Sorry I didn't recognise that job. " job = input("Sorry I didn't recognise that job. "
"Please select 'Barbarian', 'Cleric', or 'Wizard'.\n >> ").title() "Please select 'Barbarian', 'Cleric', or 'Wizard'.\n >> ").title()
elif job is None: elif job is None:
job = input("Please select a job to learn more about it: Barbarian, Cleric, or Wizard.\n >> ").title() job = input("Please select a job to learn more about it: Barbarian, Cleric, or Wizard."
"\n >> ").title()
continue continue
else: else:
if job == "Barbarian": if job == "Barbarian":
@@ -117,10 +138,6 @@ def startGame():
return name, gender, age, race, job return name, gender, age, race, job
def startGame_PreGen():
"""Use this for when the player is familiar with class races and jobs."""
def query_equip(): def query_equip():
while True: while True:
print("Do you want to:\n" print("Do you want to:\n"
@@ -137,6 +154,7 @@ def query_equip():
def change_equip(): def change_equip():
canAddAttunement()
while True: while True:
response = input("Which equipment slot would you like to change?\n" response = input("Which equipment slot would you like to change?\n"
"1) Weapon\n" "1) Weapon\n"
@@ -149,7 +167,6 @@ def change_equip():
change_equip() change_equip()
elif response in ("1", "Weapon"): # Weapon elif response in ("1", "Weapon"): # Weapon
itemlist = ["Return"] # create blank list for items itemlist = ["Return"] # create blank list for items
view_equippedweapon()
for item_key, item_value in Inventory.items(): # item, attribute for item_key, item_value in Inventory.items(): # item, attribute
for key, value in item_value.items(): # attribute, stat for key, value in item_value.items(): # attribute, stat
if key == "object" and value == Weapon: # if item = class `Weapon` if key == "object" and value == Weapon: # if item = class `Weapon`
@@ -161,32 +178,45 @@ def change_equip():
else: else:
print("What would you like to equip?\n") print("What would you like to equip?\n")
for i, name in enumerate(itemlist, start=1): for i, name in enumerate(itemlist, start=1):
option = f'{i}) {name}' option = f'{i}) {name}\n'
print(option) print(option)
selection = int(input(">> ")) selection = int(input(">> "))
for i, name in enumerate(itemlist, start=1): for i, name in enumerate(itemlist, start=1):
if selection == i: if selection == i:
if name == "Return": if name == "Return":
break break
elif name.itemType == Weapon: elif name.itemType == ItemType.Weapon:
try: if name.attunement: # if item has attunement
if name.attunement: if not canAddAttunement(): # check if can add another attuned item
print("Not coded attunement yet") # if item has attunement - check availability if Equipment["Main Hand"].attunement: # if attune is max, check if swapped weapon is attuned
except AttributeError: # if no attunement if name.versatile:
if name.slot == Slots.MainHand: Equipment["Main Hand"] = name
equip = {"Main Hand": name} Equipment["Off Hand"] = name
Equipment.update(equip) elif name.slot == "Main Hand":
elif not name.versatile: Equipment["Main Hand"] = name
equip = {"Off Hand": name} Equipment["Off Hand"] = None
Equipment.update(equip) elif name.slot == "Two Handed":
Equipment["Main Hand"] = None
Equipment["Off Hand"] = None
Equipment["Two Handed"] = name
else: else:
equip = {"Main Hand": None, "Off Hand": None, "Two Handed": name} print("\n Cannot equip items: Too many attuned items equipped") # if not attuned, it refuses the equip.
Equipment.update(equip) break
print(f"You now have equipped: \n" else: # If canAddAttunement = True
f"{view_equippedweapon()}") if name.versatile:
Equipment["Main Hand"] = name
Equipment["Off Hand"] = name
elif name.slot == "Main Hand":
Equipment["Main Hand"] = name
Equipment["Off Hand"] = None
elif name.slot == "Two Handed":
Equipment["Main Hand"] = None
Equipment["Off Hand"] = None
Equipment["Two Handed"] = name
print(f"{current_equipment()}")
elif response in ("2", "Armor"): # Armor elif response in ("2", "Armor"): # Armor
itemlist = ["Return"] # create blank list for items itemlist = ["Return"] # create blank list for items
view_equippedarmor()
for item_key, item_value in Inventory.items(): # item, attribute for item_key, item_value in Inventory.items(): # item, attribute
for key, value in item_value.items(): # attribute, stat for key, value in item_value.items(): # attribute, stat
if key == "object" and value == Armor: # if item = class `Weapon` if key == "object" and value == Armor: # if item = class `Weapon`
@@ -224,10 +254,9 @@ def change_equip():
equip = {"Feet": name} equip = {"Feet": name}
Equipment.update(equip) Equipment.update(equip)
print(f"You now have equipped: \n" print(f"You now have equipped: \n"
f"{view_equippedarmor()}") f"{current_equipment()}")
elif response in ("3", "Other"): # Other elif response in ("3", "Other"): # Other
itemlist = ["Return"] # create blank list for items itemlist = ["Return"] # create blank list for items
view_equippedother()
for item_key, item_value in Inventory.items(): # item, attribute for item_key, item_value in Inventory.items(): # item, attribute
for key, value in item_value.items(): # attribute, stat for key, value in item_value.items(): # attribute, stat
if key == "object" and value == Armor: # if item = class `Weapon` if key == "object" and value == Armor: # if item = class `Weapon`
@@ -265,43 +294,13 @@ def change_equip():
equip = {"Right Ring": name} equip = {"Right Ring": name}
Equipment.update(equip) Equipment.update(equip)
print(f"You now have equipped: \n" print(f"You now have equipped: \n"
f"{view_equippedother()}") f"{current_equipment()}")
elif response in ("4", "Return"): elif response in ("4", "Return"):
break break
else: else:
print("That wasn't an option.") print("That wasn't an option.")
def view_equippedweapon():
equipped = ""
for slot, equipment in Equipment.items():
if slot in ("Main Hand", "Off Hand", "Two Handed") and equipment is not None:
equipped = equipped + f'{slot}: {equipment} \n'
return "You currently have equipped: \n" + equipped
else:
return "You have nothing equipped!"
def view_equippedarmor():
equipped = ""
for slot, equipment in Equipment.items():
if slot in ("Helm", "Chest", "Wrists", "Feet") and equipment is not None:
equipped = equipped + f'{slot}: {equipment} \n'
return "You currently have equipped: \n" + equipped
else:
return "You have nothing equipped!"
def view_equippedother():
equipped = ""
for slot, equipment in Equipment.items():
if slot in ("Neck", "Cloak", "Left Ring", "Right Ring") and equipment is not None:
equipped = equipped + f'{slot}: {equipment} \n'
return "You currently have equipped: \n" + equipped
else:
return "You have nothing equipped!"
def get_instructions(): def get_instructions():
descrip1 = ("There are certain commands that will be available almost anytime you are able to type,\n" descrip1 = ("There are certain commands that will be available almost anytime you are able to type,\n"
"such as viewing your inventory, checking your equipped items, and also changing them.\n" "such as viewing your inventory, checking your equipped items, and also changing them.\n"
@@ -314,6 +313,19 @@ def get_instructions():
print(descrip2) print(descrip2)
def canAddAttunement():
attune = 0
for slot, equipment in Equipment.items():
if isinstance(equipment, Weapon):
if equipment.attunement:
attune += 1
Equipment["Attunement"] = attune
if attune > 3:
return False
else:
return True
def error_message(): def error_message():
print("That command was not recognised. Please try again.") print("That command was not recognised. Please try again.")
@@ -322,8 +334,6 @@ def parse(input_text):
command = input_text.lower() command = input_text.lower()
object1 = None object1 = None
remaining_words_index = None remaining_words_index = None
# the .split() function splits the input_text string into a list of individual words
words = input_text.split() words = input_text.split()
if len(words) > 0: if len(words) > 0:
@@ -415,17 +425,17 @@ def parse(input_text):
return command, object1 return command, object1
def skill_check(skill): # def skill_check(skill):
"""Roll a d20 and add modifier # """Roll a d20 and add modifier
Return value to compare vs a hardcoded DC""" # Return value to compare vs a hardcoded DC"""
#
#
def roll_dice(num_dice): # def roll_dice(num_dice):
roll_results = [] # roll_results = []
for _ in range(num_dice): # for _ in range(num_dice):
roll = randint(*user.hitDie) # roll = randint(*user.hitDie)
roll_results.append(roll) # roll_results.append(roll)
return roll_results # return roll_results
def current_inventory(): def current_inventory():
@@ -443,17 +453,27 @@ def current_inventory():
def current_equipment(): def current_equipment():
"""Prints a list of items that you have equipped in your slots.""" """Prints a list of items that you have equipped in your slots."""
print(f'You are currently wearing:') print(f'You are currently wearing:')
for item_key, item_value in Equipment.items(): # string, dictionary for slot, equipment in Equipment.items(): # string, dictionary
if item_value is not None: if equipment is not None:
if item_value.itemType == ItemType.Weapon: if slot == "Attunement":
print(f'{item_key}: {item_value.name} - {item_value.damage1H}\n' continue
f' {item_value.description}\n') elif equipment.itemType == ItemType.Weapon:
elif item_value.itemType == ItemType.Armor: if equipment.versatile:
print(f'{item_key}: {item_value.name} - AC {item_value.ac}\n' print(f'{slot}: {equipment.name} - {equipment.versatiledmg}\n'
f' {item_value.description}\n') f' {equipment.description}\n')
elif item_value.itemType == ItemType.Item: continue
print(f'{item_key}: {item_value.name}\n' elif equipment.damage1H is not None:
f' {item_value.description}\n') print(f'{slot}: {equipment.name} - {equipment.damage1H}\n'
f' {equipment.description}\n')
elif equipment.damage2H is not None:
print(f'{slot}: {equipment.name} - {equipment.damage2H}\n'
f' {equipment.description}\n')
elif equipment.itemType == ItemType.Armor:
print(f'{slot}: {equipment.name} - AC {equipment.ac}\n'
f' {equipment.description}\n')
elif equipment.itemType == ItemType.Item:
print(f'{slot}: {equipment.name}\n'
f' {equipment.description}\n')
def calc_weight(): def calc_weight():