From ae93fd81f2a92a4bef4195f8e6c3cf99cb00df01 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 5 May 2022 23:02:34 +0200 Subject: [PATCH] tideli --- events/EndBallEvent.py | 2 +- events/StartBallEvent.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py index 2864f6f..93b3d0b 100644 --- a/events/EndBallEvent.py +++ b/events/EndBallEvent.py @@ -11,7 +11,7 @@ class EndBallEvent(Event): def trigger(self, target): super().trigger(target) - if self.playerState.replayBall or not self.playerState.hasBallScored: + if self.playerState().replayBall or not self.playerState.hasBallScored: StartBallEvent().trigger(None) return diff --git a/events/StartBallEvent.py b/events/StartBallEvent.py index 14886d8..7c310f9 100644 --- a/events/StartBallEvent.py +++ b/events/StartBallEvent.py @@ -1,15 +1,20 @@ from Event import Event from solenoids.OutHoleSolenoid import OutHoleSolenoid +from solenoids.BottomLeftBankSolenoid import BottomLeftBankSolenoid +from solenoids.BottomRightBankSolenoid import BottomRightBankSolenoid +from solenoids.TopCentralBankSolenoid import TopCentralBankSolenoid from solenoids.MainFlipper import MainFlipper class StartBallEvent(Event): def __init__(self): self.flipper = MainFlipper() - self.outHoleSolenoid = OutHoleSolenoid() super().__init__("Start Ball Event") def trigger(self, target): super().trigger(target) self.flipper.activate() - self.outHoleSolenoid.trigger() \ No newline at end of file + BottomRightBankSolenoid().trigger() + BottomLeftBankSolenoid().trigger() + TopCentralBankSolenoid().trigger() + OutHoleSolenoid().trigger()