Update: Start game event logic

This commit is contained in:
Jonas Zeunert
2022-06-06 21:56:16 +02:00
parent e9faf5b4a3
commit a82e923b64
2 changed files with 9 additions and 4 deletions

View File

@@ -11,9 +11,14 @@ class GameState:
self.credits = 3 self.credits = 3
self.specialDisplay = specialDisplay self.specialDisplay = specialDisplay
self.specialDisplay.printCredits(self.credits) self.specialDisplay.printCredits(self.credits)
self.isPlaying = False
PLAYER_LAMPS.activateNext() PLAYER_LAMPS.activateNext()
def nextPlayer(self): def nextPlayer(self):
if not self.isPlaying:
self.isPlaying = True
nextPlayer = self.players[0].id
else:
nextPlayer = self.players[1].id nextPlayer = self.players[1].id
self.currentPlayer = nextPlayer self.currentPlayer = nextPlayer

View File

@@ -4,8 +4,8 @@ from solenoids.MainFlipper import MainFlipper
class StartGameEvent(Event): class StartGameEvent(Event):
def __init__(self, playerState): def __init__(self, gameState):
self.gameState = playerState self.gameState = gameState
self.flipper = MainFlipper() self.flipper = MainFlipper()
self.outHoleSolenoid = OutHoleSolenoid() self.outHoleSolenoid = OutHoleSolenoid()
super().__init__("Start Game Event") super().__init__("Start Game Event")
@@ -13,5 +13,5 @@ class StartGameEvent(Event):
def trigger(self, target): def trigger(self, target):
super().trigger(target) super().trigger(target)
self.flipper.activate() self.flipper.activate()
self.gameState.currentPlayer.activate() self.gameState.nextPlayer()
self.outHoleSolenoid.trigger() self.outHoleSolenoid.trigger()