shuffler added as explicit dependency

This commit is contained in:
Jakub Senderák
2020-04-25 18:31:33 +02:00
parent 618e632ce4
commit 889f787f29
+7 -5
View File
@@ -83,15 +83,16 @@ cards = [Card(color, value) for value in Card_values for color in Card_colors]
class Bridzik():
def __init__(self):
self.series = [Series(0, 0)]
def __init__(self, shuffler = shuffle):
self.shuffler = shuffler
self.series = [Series(0, 0, shuffler=self.shuffler)]
def play_card(self, player: int, card: Card):
if self.is_completed():
raise BridzikException('Hra je ukoncena.')
self.series[-1].play_card(player, card)
if self.series[-1].is_completed() and not self.is_completed():
self.series.append(Series(len(self.series)))
self.series.append(Series(len(self.series), shuffler=self.shuffler))
def add_player_guess(self, player: int, guess):
if self.is_completed():
@@ -133,10 +134,11 @@ class Bridzik():
class Series():
def __init__(self, series_number: int, first_player: int = None):
def __init__(self, series_number: int, first_player: int = None, shuffler = shuffle):
self.series_number = series_number
self.first_player = first_player if first_player else series_number
self.rounds = []
self.shuffler = shuffler
self.start_new_round()
def add_player_guess(self, player: int, guess: int):
@@ -179,7 +181,7 @@ class Series():
if round_number != 0 and not self.get_last_round().is_completed():
raise BridzikException('Predchadzajuce kolo nie je ukoncene')
self.rounds.append(
Round(round_number, (self.first_player + round_number) % 4)
Round(round_number, (self.first_player + round_number) % 4, shuffler=self.shuffler)
)