diff --git a/Event.py b/Event.py index 78a907a..94a1b07 100644 --- a/Event.py +++ b/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!') diff --git a/events/BonusTimeEvent.py b/events/BonusTimeEvent.py index 8dddc49..65335b5 100644 --- a/events/BonusTimeEvent.py +++ b/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() \ No newline at end of file + super().trigger() + self.playerState().addBonusTimeSecond() diff --git a/events/EndGameEvent.py b/events/EndGameEvent.py index c70724a..b573922 100644 --- a/events/EndGameEvent.py +++ b/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() \ No newline at end of file diff --git a/events/EndOfBallEvent.py b/events/EndOfBallEvent.py index 149106f..cdfdc66 100644 --- a/events/EndOfBallEvent.py +++ b/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() diff --git a/events/EnterUpperPlayfieldEvent.py b/events/EnterUpperPlayfieldEvent.py index bcc80e2..af030b4 100644 --- a/events/EnterUpperPlayfieldEvent.py +++ b/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() \ No newline at end of file diff --git a/events/FlapEvent.py b/events/FlapEvent.py index 88a0212..26d8d14 100644 --- a/events/FlapEvent.py +++ b/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() \ No newline at end of file diff --git a/events/LeaveUpperPlayfieldEvent.py b/events/LeaveUpperPlayfieldEvent.py index 65cd70c..21d6bbf 100644 --- a/events/LeaveUpperPlayfieldEvent.py +++ b/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() \ No newline at end of file diff --git a/events/LeftFlapEvent.py b/events/LeftFlapEvent.py index 2c740c6..35e08b0 100644 --- a/events/LeftFlapEvent.py +++ b/events/LeftFlapEvent.py @@ -1,5 +1,3 @@ -from Event import Event - from events.FlapEvent import FlapEvent from solenoids.LeftFlapSolenoid import LeftFlapSolenoid diff --git a/events/PointEvent.py b/events/PointEvent.py index 6823f8b..7f5798e 100644 --- a/events/PointEvent.py +++ b/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) \ No newline at end of file diff --git a/events/RightFlapEvent.py b/events/RightFlapEvent.py index 4d2233f..2009e9f 100644 --- a/events/RightFlapEvent.py +++ b/events/RightFlapEvent.py @@ -1,5 +1,3 @@ -from Event import Event - from events.FlapEvent import FlapEvent from solenoids.RightFlapSolenoid import RightFlapSolenoid diff --git a/events/RightKickerEvent.py b/events/RightKickerEvent.py index a71770c..cd31d70 100644 --- a/events/RightKickerEvent.py +++ b/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() \ No newline at end of file diff --git a/events/StartGameEvent.py b/events/StartGameEvent.py index 62f2428..5776d77 100644 --- a/events/StartGameEvent.py +++ b/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() \ No newline at end of file diff --git a/events/UpperPlayfieldTimeEvent.py b/events/UpperPlayfieldTimeEvent.py index 74fdf7a..3208836 100644 --- a/events/UpperPlayfieldTimeEvent.py +++ b/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) \ No newline at end of file