From a82e923b64d73e685d766d0a4f8b81ca4f25fd11 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Mon, 6 Jun 2022 21:56:16 +0200 Subject: [PATCH] Update: Start game event logic --- GameState.py | 7 ++++++- events/StartGameEvent.py | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/GameState.py b/GameState.py index 7920080..8a6c5de 100644 --- a/GameState.py +++ b/GameState.py @@ -11,10 +11,15 @@ class GameState: self.credits = 3 self.specialDisplay = specialDisplay self.specialDisplay.printCredits(self.credits) + self.isPlaying = False PLAYER_LAMPS.activateNext() def nextPlayer(self): - nextPlayer = self.players[1].id + if not self.isPlaying: + self.isPlaying = True + nextPlayer = self.players[0].id + else: + nextPlayer = self.players[1].id self.currentPlayer = nextPlayer @property diff --git a/events/StartGameEvent.py b/events/StartGameEvent.py index b6245ea..a1adfd9 100644 --- a/events/StartGameEvent.py +++ b/events/StartGameEvent.py @@ -4,8 +4,8 @@ from solenoids.MainFlipper import MainFlipper class StartGameEvent(Event): - def __init__(self, playerState): - self.gameState = playerState + def __init__(self, gameState): + self.gameState = gameState self.flipper = MainFlipper() self.outHoleSolenoid = OutHoleSolenoid() super().__init__("Start Game Event") @@ -13,5 +13,5 @@ class StartGameEvent(Event): def trigger(self, target): super().trigger(target) self.flipper.activate() - self.gameState.currentPlayer.activate() + self.gameState.nextPlayer() self.outHoleSolenoid.trigger()