giving events a name

events/BonusTimeEvent.py

@@ -4,6 +4,7 @@ from Event import Event
 class BonusTimeEvent(Event):
     def __init__(self, playerState):
         self.playerState = playerState
+        super().__init__("Bonus Time Event")
 
     def trigger(self):
         super().trigger()

events/EndGameEvent.py

@@ -4,6 +4,7 @@ from Event import Event
 class EndGameEvent(Event):
     def __init__(self, flipper):
         self.flipper = flipper
+        super().__init__("End Game Event")
 
     def trigger(self):
         super().trigger()

events/EndOfBallEvent.py

@@ -4,6 +4,7 @@ from Event import Event
 class EndOfBallEvent(Event):
     def __init__(self, playerState):
         self.playerState = playerState
+        super().__init__("End Of Ball Event")
 
     def trigger(self):
         super().trigger()

events/EnterUpperPlayfieldEvent.py

@@ -6,6 +6,7 @@ class EnterUpperPlayfieldEvent(Event):
     def __init__(self, playerState):
         self.playerState = playerState
         self.flipper = TopFlipper()
+        super().__init__("Enter Upper Playfield Event")
 
     def trigger(self):
         super().trigger()

events/FlapEvent.py

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

events/LeaveUpperPlayfieldEvent.py

@@ -5,6 +5,7 @@ class LeaveUpperPlayfieldEvent(Event):
     def __init__(self, playerState, flipper):
         self.playerState = playerState
         self.flipper = flipper
+        super().__init__("Leave Upper Playfield Event")
 
     def trigger(self):
         super().trigger()

events/LeftFlapEvent.py

@@ -4,4 +4,4 @@ from solenoids.LeftFlapSolenoid import LeftFlapSolenoid
 
 class LeftFlapEvent(FlapEvent):
     def __init__(self):
-        super(LeftFlapSolenoid())
+        super().__init__(LeftFlapSolenoid(), "Left Flap Event")

events/PointEvent.py

@@ -4,6 +4,7 @@ from Event import Event
 class PointEvent(Event):
     def __init__(self, playerState):
         self.playerState = playerState
+        super().__init__("Point Event Event")
 
     def trigger(self, target):
         super().trigger()

events/RightFlapEvent.py

@@ -4,4 +4,4 @@ from solenoids.RightFlapSolenoid import RightFlapSolenoid
 
 class RightFlapEvent(FlapEvent):
     def __init__(self):
-        super(RightFlapSolenoid())
+        super().__init__(RightFlapSolenoid(), "Right Flap Event")

events/RightKickerEvent.py

@@ -5,6 +5,7 @@ from solenoids.RightKickerSolenoid import RightKickerSolenoid
 class RightKickerEvent(Event):
     def __init__(self):
         self.rightKickerSolenoid = RightKickerSolenoid()
+        super().__init__("Right Kicker Event")
 
     def trigger(self):
         super().trigger()

events/StartGameEvent.py

@@ -7,6 +7,7 @@ class StartGameEvent(Event):
     def __init__(self):
         self.flipper = MainFlipper()
         self.outHoleSolenoid = OutHoleSolenoid()
+        super().__init__("Start Game Event")
 
     def trigger(self):
         super().trigger()

events/UpperPlayfieldTimeEvent.py

@@ -4,6 +4,7 @@ from Event import Event
 class UpperPlayfieldTimeEvent(Event):
     def __init__(self, playerState):
         self.playerState = playerState
+        super().__init__("Upper Playfield Time Event")
 
     def trigger(self):
         super().trigger()