tideli

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
 

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()
+        BottomRightBankSolenoid().trigger()
+        BottomLeftBankSolenoid().trigger()
+        TopCentralBankSolenoid().trigger()
+        OutHoleSolenoid().trigger()