asdf

events/BankEvent.py

@@ -9,4 +9,8 @@ class BankEvent(Event):
 
     def trigger(self, target):
         super().trigger(target)
-        self.bankSolenoid.trigger()
+        self.bankSolenoid.trigger()
+        self.advanceBonus()
+
+    def advanceBonus(self):
+        self.playerState().advanceBonus()

events/BottomLeftBankEvent.py

@@ -10,5 +10,4 @@ class BottomLeftBankEvent(BankEvent):
     super().trigger(target)
     playerState = self.playerState()
     playerState.advanceLeftOrangeSpecial()
-    if playerState.upperPlayfieldTime < 30:
-      playerState.addUpperPlayfieldTime(5)
+    playerState.advanceUpperPlayfieldTime()

events/FixedTargetEvent.py

@@ -0,0 +1,11 @@
+from Event import Event
+
+
+class FixedTargetEvent(Event):
+    def __init__(self, playerState):
+        super().__init__("Fixed Target Event")
+        self.playerState = playerState
+
+    def trigger(self, target):
+        super().trigger(target)
+        self.playerState().advanceTunnel()

events/LeaveUpperPlayfieldEvent.py

@@ -1,13 +1,13 @@
 from Event import Event
+from solenoids.TopFlipper import TopFlipper
 
 
 class LeaveUpperPlayfieldEvent(Event):
     def __init__(self, playerState, flipper):
         self.playerState = playerState
-        self.flipper = flipper
+        self.flipper = TopFlipper()
         super().__init__("Leave Upper Playfield Event")
 
     def trigger(self, target):
         super().trigger(target)
-        self.flipper.deactivate()
-        self.playerState().stopUpperPlayfieldTimer()
+        self.flipper.deactivate()