From d1887349c693ab474f4f8f688ee8d83d5cf1ce1d Mon Sep 17 00:00:00 2001 From: legonzaur Date: Fri, 3 May 2024 16:02:05 +0200 Subject: [PATCH] Automatically play cards at start of turn --- src/model/game.py | 8 +++----- src/model/player.py | 5 +++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/model/game.py b/src/model/game.py index 7d46584..699dedd 100644 --- a/src/model/game.py +++ b/src/model/game.py @@ -142,14 +142,12 @@ class Game(Serializable): self.current_turn = random.choice(self.teams) await self.notify_controller("update", self.serialize_guest()) - draws = [] for p in [p for p in self.players if p.team == self.current_turn]: - draws.append(p.draw(3)) + await p.draw(3) + await p.start_turn() for p in [p for p in self.players if p.team != self.current_turn]: - draws.append(p.draw(5)) - - await asyncio.gather(*draws) + await p.draw(5) await self.notify_controller("update", self.serialize_guest()) diff --git a/src/model/player.py b/src/model/player.py index 16b2171..0d06bb6 100644 --- a/src/model/player.py +++ b/src/model/player.py @@ -71,8 +71,9 @@ class Player(Serializable): random.shuffle(self.stack_pile) async def start_turn(self): - for c in self.hand: - await self.play_card(c.uuid) + temp_hand = [*self.hand] + for c in temp_hand: + await self.play_card(str(c.uuid)) await self.turn.start_turn() async def end_turn(self):