Update: Start game event logic

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

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()