Very much done

factories/EventFactory.py

@@ -1,7 +1,7 @@
 import inspect
 
 from events.PointEvent import PointEvent
-from events.EndOfBallEvent import EndOfBallEvent
+from events.EndBallEvent import EndBallEvent
 from events.RightFlapEvent import RightFlapEvent
 from events.LeftFlapEvent import LeftFlapEvent
 from events.RightKickerEvent import RightKickerEvent
@@ -13,7 +13,10 @@ from events.BottomLeftBankEvent import BottomLeftBankEvent
 from events.TopCentralBankEvent import TopCentralBankEvent
 from events.BottomRightPopEvent import BottomRightPopEvent
 from events.TopLeftPopEvent import TopLeftPopEvent
-
+from events.TunnelEvent import TunnelEvent
+from events.RedSpecialEvent import RedSpecialEvent
+from events.OrangeSpecialEvent import OrangeSpecialEvent
+from events.SpinnerEvent import SpinnerEvent
 
 class EventFactory:
     def __init__(self, targets, currentPlayer):
@@ -36,7 +39,7 @@ class EventFactory:
         return event
 
     def createEndOfBallEvent(self):
-        event = EndOfBallEvent(self.currentPlayer)
+        event = EndBallEvent(self.currentPlayer)
         self.__registerEventToTarget(event, self.targets['Outhole'])
         return event
 
@@ -66,24 +69,49 @@ class EventFactory:
         return event
 
     def createBottomLeftBankEvent(self):
-        event = BottomLeftBankEvent()
+        event = BottomLeftBankEvent(self.currentPlayer)
         self.__registerEventToTarget(event, self.targets["Left Bank"])
+        return event
 
     def createBottomRightBankEvent(self):
-        event = BottomRightBankEvent()
+        event = BottomRightBankEvent(self.currentPlayer)
         self.__registerEventToTarget(event, self.targets["Right Bank"])
+        return event
 
     def createTopCentralBankEvent(self):
-        event = TopCentralBankEvent()
+        event = TopCentralBankEvent(self.currentPlayer)
         self.__registerEventToTarget(event, self.targets["Top Bank"])
+        return event
 
     def createTopLeftPopEvent(self):
         event = TopLeftPopEvent()
         self.__registerEventToTarget(event, self.targets["Left Pop"])
+        return event
 
     def createBottomRightPopEvent(self):
         event = BottomRightPopEvent()
         self.__registerEventToTarget(event, self.targets["Right Pop"])
-      
+        return event
+
+    def createTunnelEvent(self):
+        event = TunnelEvent(self.currentPlayer)
+        self.__registerEventToTarget(event, self.targets["Canal Button Bottom"])
+        return event
+
+    def createRedSpecialEvent(self):
+        event = RedSpecialEvent(self.currentPlayer)
+        self.__registerEventToTarget(event, self.targets["Special Red"])
+        return event
+
+    def createOrangeSpecialEvent(self):
+        event = OrangeSpecialEvent(self.currentPlayer)
+        self.__registerEventToTarget(event, self.targets["Special Orange"])
+        return event
+
+    def createSpinnerEvent(self):
+        event = SpinnerEvent(self.currentPlayer)
+        self.__registerEventToTarget(event, self.targets["Spinner"])
+        return event
+
     def __registerEventToTarget(self, event, target):
         target.on(target.hit_key, event.trigger)