diff --git a/main.py b/main.py index ebb63fc..16ba150 100644 --- a/main.py +++ b/main.py @@ -7,7 +7,7 @@ import jsonpickle from src.Circus import Circus from src.TreasureCard import TreasureCard from src.Player import Player, ConcessionCard -from src.MamaOConnel import MamaOConnel +from src.MamaOConnell import MamaOConnell class Game: @@ -27,9 +27,9 @@ class Game: # General data to generate self.circus = Circus(playersNb) self.treasure = TreasureCard() - self.mamaoc = MamaOConnel() + self.mamaoc = MamaOConnell() while not self.mamaoc.solver(): - self.mamaoc = MamaOConnel() + self.mamaoc = MamaOConnell() # Players self.players = [] @@ -53,7 +53,7 @@ class Game: def disableConcession(self): self.concession = False - # if number = 0 print Mama O'Connel's location, else print hint #number + # if number = 0 print Mama O'Connell's location, else print hint #number def printMamaHint(self, number): if number not in range(0, 4): return False @@ -62,13 +62,13 @@ class Game: print("") match number: case 0: - print("Mama O'Connel is at: " + self.mamaoc.location.name) + print("Mama O'Connell is at: " + self.mamaoc.location.name) case 1: - print("Mama O'Connel is " + str(self.mamaoc.hint1[1]) + " cities from " + self.mamaoc.hint1[0].name) + print("Mama O'Connell is " + str(self.mamaoc.hint1[1]) + " cities from " + self.mamaoc.hint1[0].name) case 2: - print("Mama O'Connel is " + str(self.mamaoc.hint2[1]) + " cities from " + self.mamaoc.hint2[0].name) + print("Mama O'Connell is " + str(self.mamaoc.hint2[1]) + " cities from " + self.mamaoc.hint2[0].name) case 3: - print("Mama O'Connel is " + str(self.mamaoc.hint3[1]) + " cities from " + self.mamaoc.hint3[0].name) + print("Mama O'Connell is " + str(self.mamaoc.hint3[1]) + " cities from " + self.mamaoc.hint3[0].name) print("") input("When you are done, press Enter.") os.system('clear') @@ -156,7 +156,7 @@ while True: print(" Circus: 'enable circus', 'take circus'") print(" Treasure: 'enable treasure', 'take treasure'") print(" Concessions: 'enable concession', 'take concession', 'disable concession'") - print(" Mama O'Connel tracking: 'mama hint 1', 'mama hint 2', 'mama hint 3', 'mama location'") + print(" Mama O'Connell tracking: 'mama hint 1', 'mama hint 2', 'mama hint 3', 'mama location'") command = input("==> ") print("") match command: diff --git a/src/MamaOConnel.py b/src/MamaOConnell.py similarity index 99% rename from src/MamaOConnel.py rename to src/MamaOConnell.py index 8494cef..5ca2761 100644 --- a/src/MamaOConnel.py +++ b/src/MamaOConnell.py @@ -208,7 +208,7 @@ class Board: i = i + 1 return result -class MamaOConnel: +class MamaOConnell: def __init__(self): board = Board() # TODO Board should be a "static" or "constant" class, see what we can do