From 0ef881bb9138a295dbf1aa9754ec1f61f4ed0c3a Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Wed, 31 Aug 2022 15:07:44 +0200 Subject: [PATCH] bubb --- PlayerState.py | 4 ++-- events/EndBallEvent.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PlayerState.py b/PlayerState.py index 59623d1..dd0775a 100644 --- a/PlayerState.py +++ b/PlayerState.py @@ -82,8 +82,7 @@ class PlayerState: self.enableTiming() - self.specialDisplay.printBallsToPlay(self.ballsLeft) - self.specialDisplay.printGameTimeBonus(self.bonusTime) + self.printSpecial() def activate(self): self.resetBall() @@ -303,6 +302,7 @@ class PlayerState: return self.replayBallTimer = Timer(interval=1, function=self.updateReplayBall) + def stopReplayBall(self): if not self.isActive: return diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py index e40ed11..03b596a 100644 --- a/events/EndBallEvent.py +++ b/events/EndBallEvent.py @@ -6,6 +6,8 @@ from events.StartBallEvent import StartBallEvent from solenoids.MainFlipper import MainFlipper from solenoids.TopFlipper import TopFlipper +from solenoids.OutHoleSolenoid import OutHoleSolenoid + from time import sleep from config import BONUS_SLEEP_TIME @@ -22,7 +24,7 @@ class EndBallEvent(Event): MainFlipper().deactivate() if self.gameState.currentPlayer.replayBall or not self.gameState.currentPlayer.hasBallScored: - StartBallEvent().trigger(None) + OutHoleSolenoid().trigger() return self.gameState.isPlaying = False