diff --git a/Event.py b/Event.py index 94a1b07..7d5f37d 100644 --- a/Event.py +++ b/Event.py @@ -3,6 +3,7 @@ import logging class Event: def __init__(self, name): self.name = name + logging.info("Created " + self.name) def trigger(self): logging.info('Event ' + self.name + ' triggered!') diff --git a/events/BonusTimeEvent.py b/events/BonusTimeEvent.py index 65335b5..0d06f90 100644 --- a/events/BonusTimeEvent.py +++ b/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() diff --git a/events/EndGameEvent.py b/events/EndGameEvent.py index b573922..c6ea9da 100644 --- a/events/EndGameEvent.py +++ b/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() diff --git a/events/EndOfBallEvent.py b/events/EndOfBallEvent.py index cdfdc66..a0aba57 100644 --- a/events/EndOfBallEvent.py +++ b/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() diff --git a/events/EnterUpperPlayfieldEvent.py b/events/EnterUpperPlayfieldEvent.py index af030b4..aa1b501 100644 --- a/events/EnterUpperPlayfieldEvent.py +++ b/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() diff --git a/events/FlapEvent.py b/events/FlapEvent.py index 26d8d14..b012c37 100644 --- a/events/FlapEvent.py +++ b/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() diff --git a/events/LeaveUpperPlayfieldEvent.py b/events/LeaveUpperPlayfieldEvent.py index 21d6bbf..347b2ba 100644 --- a/events/LeaveUpperPlayfieldEvent.py +++ b/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() diff --git a/events/LeftFlapEvent.py b/events/LeftFlapEvent.py index 35e08b0..5f0f311 100644 --- a/events/LeftFlapEvent.py +++ b/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") diff --git a/events/PointEvent.py b/events/PointEvent.py index 7f5798e..87f991f 100644 --- a/events/PointEvent.py +++ b/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() diff --git a/events/RightFlapEvent.py b/events/RightFlapEvent.py index 2009e9f..78d6fb0 100644 --- a/events/RightFlapEvent.py +++ b/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") diff --git a/events/RightKickerEvent.py b/events/RightKickerEvent.py index cd31d70..c29074d 100644 --- a/events/RightKickerEvent.py +++ b/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() diff --git a/events/StartGameEvent.py b/events/StartGameEvent.py index 5776d77..03b5ceb 100644 --- a/events/StartGameEvent.py +++ b/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() diff --git a/events/UpperPlayfieldTimeEvent.py b/events/UpperPlayfieldTimeEvent.py index 3208836..8d1ce63 100644 --- a/events/UpperPlayfieldTimeEvent.py +++ b/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()