From 5db0d3f03d560e1985914f4da06bb6120417447e Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Mon, 6 Jun 2022 21:59:07 +0200 Subject: [PATCH] Reset logic --- PlayerState.py | 3 +-- events/StartGameEvent.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/PlayerState.py b/PlayerState.py index 25199f0..d254f01 100644 --- a/PlayerState.py +++ b/PlayerState.py @@ -79,8 +79,8 @@ class PlayerState: self.specialDisplay.printScore() def activate(self): - self.isActive = True self.resetBall() + self.isActive = True def deactivate(self): self.isActive = False @@ -141,7 +141,6 @@ class PlayerState: self.replayBall = False self.hasBallScored = False - def resetBall(self): self.printSpecial() self.upperPlayfieldTimer = None diff --git a/events/StartGameEvent.py b/events/StartGameEvent.py index d842d17..44f8064 100644 --- a/events/StartGameEvent.py +++ b/events/StartGameEvent.py @@ -13,7 +13,7 @@ class StartGameEvent(Event): def trigger(self, target): super().trigger(target) self.flipper.activate() - + self.gameState.nextPlayer() self.outHoleSolenoid.trigger()