event logging

Event.py

@@ -5,4 +5,4 @@ class Event:
     self.name = name
 
   def trigger(self):
-    logging.info('Event ' + self.name + ' occured!')
+    logging.info('Event ' + self.name + ' triggered!')

events/BonusTimeEvent.py

@@ -1,8 +1,10 @@
 from Event import Event
 
+
 class BonusTimeEvent(Event):
     def __init__(self, playerState):
         self.playerState = playerState
 
     def trigger(self):
-        self.playerState().addBonusTimeSecond()
+        super().trigger()
+        self.playerState().addBonusTimeSecond()

events/EndGameEvent.py

@@ -1,8 +1,10 @@
 from Event import Event
 
+
 class EndGameEvent(Event):
     def __init__(self, flipper):
         self.flipper = flipper
 
     def trigger(self):
+        super().trigger()
         self.flipper.deactivate()

events/EndOfBallEvent.py

@@ -1,8 +1,10 @@
 from Event import Event
 
+
 class EndOfBallEvent(Event):
     def __init__(self, playerState):
         self.playerState = playerState
 
     def trigger(self):
+        super().trigger()
         self.playerState().removeBall()

events/EnterUpperPlayfieldEvent.py

@@ -1,5 +1,4 @@
 from Event import Event
-
 from solenoids.TopFlipper import TopFlipper
 
 
@@ -9,5 +8,6 @@ class EnterUpperPlayfieldEvent(Event):
         self.flipper = TopFlipper()
 
     def trigger(self):
+        super().trigger()
         self.flipper.activate()
         self.playerState().startUpperPlayfieldTimer()

events/FlapEvent.py

@@ -1,8 +1,10 @@
 from Event import Event
 
+
 class FlapEvent(Event):
     def __init__(self, flapSolenoid):
         self.flapSolenoid = flapSolenoid
 
     def trigger(self):
+        super().trigger()
         self.flapSolenoid.trigger()

events/LeaveUpperPlayfieldEvent.py

@@ -1,10 +1,12 @@
 from Event import Event
 
+
 class LeaveUpperPlayfieldEvent(Event):
     def __init__(self, playerState, flipper):
         self.playerState = playerState
         self.flipper = flipper
 
     def trigger(self):
+        super().trigger()
         self.flipper.deactivate()
         self.playerState().stopUpperPlayfieldTimer()

events/LeftFlapEvent.py

@@ -1,5 +1,3 @@
-from Event import Event
-
 from events.FlapEvent import FlapEvent
 from solenoids.LeftFlapSolenoid import LeftFlapSolenoid
 

events/PointEvent.py

@@ -1,8 +1,10 @@
 from Event import Event
 
+
 class PointEvent(Event):
     def __init__(self, playerState):
         self.playerState = playerState
 
     def trigger(self, target):
+        super().trigger()
         self.playerState().addPoints(target.points)

events/RightFlapEvent.py

@@ -1,5 +1,3 @@
-from Event import Event
-
 from events.FlapEvent import FlapEvent
 from solenoids.RightFlapSolenoid import RightFlapSolenoid
 

events/RightKickerEvent.py

@@ -1,5 +1,4 @@
 from Event import Event
-
 from solenoids.RightKickerSolenoid import RightKickerSolenoid
 
 
@@ -8,4 +7,5 @@ class RightKickerEvent(Event):
         self.rightKickerSolenoid = RightKickerSolenoid()
 
     def trigger(self):
+        super().trigger()
         self.rightKickerSolenoid.trigger()

events/StartGameEvent.py

@@ -1,5 +1,4 @@
 from Event import Event
-
 from solenoids.OutHoleSolenoid import OutHoleSolenoid
 from solenoids.MainFlipper import MainFlipper
 
@@ -10,5 +9,6 @@ class StartGameEvent(Event):
         self.outHoleSolenoid = OutHoleSolenoid()
 
     def trigger(self):
+        super().trigger()
         self.flipper.activate()
         self.outHoleSolenoid.trigger()

events/UpperPlayfieldTimeEvent.py

@@ -1,8 +1,10 @@
 from Event import Event
 
+
 class UpperPlayfieldTimeEvent(Event):
     def __init__(self, playerState):
         self.playerState = playerState
 
     def trigger(self):
+        super().trigger()
         self.playerState().addUpperPlayfieldTime(1)