From 4523c515f38c159cec582d4b408654b7393caeb6 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Mon, 6 Jun 2022 23:58:59 +0200 Subject: [PATCH] Deactivate flippr on ball end --- events/EndBallEvent.py | 5 +++++ events/StartBallEvent.py | 1 + 2 files changed, 6 insertions(+) diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py index fcef5d9..6d48154 100644 --- a/events/EndBallEvent.py +++ b/events/EndBallEvent.py @@ -3,6 +3,8 @@ from Event import Event from events.EndGameEvent import EndGameEvent from events.StartBallEvent import StartBallEvent +from solenoids.MainFlipper import MainFlipper +from solenoids.TopFlipper import TopFlipper class EndBallEvent(Event): def __init__(self, gameState): @@ -11,6 +13,9 @@ class EndBallEvent(Event): def trigger(self, target): super().trigger(target) + TopFlipper().deactivate() + MainFlipper().deactivate() + if self.gameState.currentPlayer.replayBall or not self.gameState.currentPlayer.hasBallScored: StartBallEvent().trigger(None) return diff --git a/events/StartBallEvent.py b/events/StartBallEvent.py index e0d7517..0b1b8f4 100644 --- a/events/StartBallEvent.py +++ b/events/StartBallEvent.py @@ -10,4 +10,5 @@ class StartBallEvent(Event): def trigger(self, target): super().trigger(target) + self.flipper.activate() OutHoleSolenoid().trigger()