From 8e70921c8ef518f5ec9828194e4df609f77e2a76 Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Sun, 3 May 2020 20:03:56 +0200 Subject: [PATCH] common event --- Event.py | 8 ++++++++ events/BonusTimeEvent.py | 4 +++- events/EndGameEvent.py | 4 +++- events/EndOfBallEvent.py | 4 +++- events/EnterUpperPlayfieldEvent.py | 4 +++- events/FlapEvent.py | 4 +++- events/LeaveUpperPlayfieldEvent.py | 4 +++- events/LeftFlapEvent.py | 2 ++ events/PointEvent.py | 4 +++- events/RightFlapEvent.py | 2 ++ events/RightKickerEvent.py | 4 +++- events/StartGameEvent.py | 4 +++- events/UpperPlayfieldTimeEvent.py | 4 +++- 13 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 Event.py diff --git a/Event.py b/Event.py new file mode 100644 index 0000000..78a907a --- /dev/null +++ b/Event.py @@ -0,0 +1,8 @@ +import logging + +class Event: + def __init__(self, name): + self.name = name + + def trigger(self): + logging.info('Event ' + self.name + ' occured!') diff --git a/events/BonusTimeEvent.py b/events/BonusTimeEvent.py index 67196ec..8dddc49 100644 --- a/events/BonusTimeEvent.py +++ b/events/BonusTimeEvent.py @@ -1,4 +1,6 @@ -class BonusTimeEvent: +from Event import Event + +class BonusTimeEvent(Event): def __init__(self, playerState): self.playerState = playerState diff --git a/events/EndGameEvent.py b/events/EndGameEvent.py index 1a175b8..c70724a 100644 --- a/events/EndGameEvent.py +++ b/events/EndGameEvent.py @@ -1,4 +1,6 @@ -class EndGameEvent: +from Event import Event + +class EndGameEvent(Event): def __init__(self, flipper): self.flipper = flipper diff --git a/events/EndOfBallEvent.py b/events/EndOfBallEvent.py index dd46dc9..149106f 100644 --- a/events/EndOfBallEvent.py +++ b/events/EndOfBallEvent.py @@ -1,4 +1,6 @@ -class EndOfBallEvent: +from Event import Event + +class EndOfBallEvent(Event): def __init__(self, playerState): self.playerState = playerState diff --git a/events/EnterUpperPlayfieldEvent.py b/events/EnterUpperPlayfieldEvent.py index 64763eb..bcc80e2 100644 --- a/events/EnterUpperPlayfieldEvent.py +++ b/events/EnterUpperPlayfieldEvent.py @@ -1,7 +1,9 @@ +from Event import Event + from solenoids.TopFlipper import TopFlipper -class EnterUpperPlayfieldEvent: +class EnterUpperPlayfieldEvent(Event): def __init__(self, playerState): self.playerState = playerState self.flipper = TopFlipper() diff --git a/events/FlapEvent.py b/events/FlapEvent.py index d66e0ff..88a0212 100644 --- a/events/FlapEvent.py +++ b/events/FlapEvent.py @@ -1,4 +1,6 @@ -class FlapEvent: +from Event import Event + +class FlapEvent(Event): def __init__(self, flapSolenoid): self.flapSolenoid = flapSolenoid diff --git a/events/LeaveUpperPlayfieldEvent.py b/events/LeaveUpperPlayfieldEvent.py index d4f8f7c..65cd70c 100644 --- a/events/LeaveUpperPlayfieldEvent.py +++ b/events/LeaveUpperPlayfieldEvent.py @@ -1,4 +1,6 @@ -class LeaveUpperPlayfieldEvent: +from Event import Event + +class LeaveUpperPlayfieldEvent(Event): def __init__(self, playerState, flipper): self.playerState = playerState self.flipper = flipper diff --git a/events/LeftFlapEvent.py b/events/LeftFlapEvent.py index 35e08b0..2c740c6 100644 --- a/events/LeftFlapEvent.py +++ b/events/LeftFlapEvent.py @@ -1,3 +1,5 @@ +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 3db584c..6823f8b 100644 --- a/events/PointEvent.py +++ b/events/PointEvent.py @@ -1,4 +1,6 @@ -class PointEvent: +from Event import Event + +class PointEvent(Event): def __init__(self, playerState): self.playerState = playerState diff --git a/events/RightFlapEvent.py b/events/RightFlapEvent.py index 2009e9f..4d2233f 100644 --- a/events/RightFlapEvent.py +++ b/events/RightFlapEvent.py @@ -1,3 +1,5 @@ +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 8adaf08..a71770c 100644 --- a/events/RightKickerEvent.py +++ b/events/RightKickerEvent.py @@ -1,7 +1,9 @@ +from Event import Event + from solenoids.RightKickerSolenoid import RightKickerSolenoid -class RightKickerEvent: +class RightKickerEvent(Event): def __init__(self): self.rightKickerSolenoid = RightKickerSolenoid() diff --git a/events/StartGameEvent.py b/events/StartGameEvent.py index ece6b21..62f2428 100644 --- a/events/StartGameEvent.py +++ b/events/StartGameEvent.py @@ -1,8 +1,10 @@ +from Event import Event + from solenoids.OutHoleSolenoid import OutHoleSolenoid from solenoids.MainFlipper import MainFlipper -class StartGameEvent: +class StartGameEvent(Event): def __init__(self): self.flipper = MainFlipper() self.outHoleSolenoid = OutHoleSolenoid() diff --git a/events/UpperPlayfieldTimeEvent.py b/events/UpperPlayfieldTimeEvent.py index 58e5c03..74fdf7a 100644 --- a/events/UpperPlayfieldTimeEvent.py +++ b/events/UpperPlayfieldTimeEvent.py @@ -1,4 +1,6 @@ -class UpperPlayfieldTimeEvent: +from Event import Event + +class UpperPlayfieldTimeEvent(Event): def __init__(self, playerState): self.playerState = playerState