Random dunno

factories/EventFactory.py

@@ -44,9 +44,9 @@ BONUS_EVENT_TARGETS = [
 ]
 
 class EventFactory:
-    def __init__(self, targets, currentPlayer):
+    def __init__(self, targets, gameState):
         self.targets = targets
-        self.currentPlayer = currentPlayer
+        self.gameState = gameState
 
     def allEvents(self):
         methods = inspect.getmembers(self, predicate=inspect.ismethod)
@@ -58,13 +58,13 @@ class EventFactory:
         return result
 
     def createPointEvent(self):
-        event = PointEvent(self.currentPlayer)
+        event = PointEvent(self.gameState)
         for target in self.targets.values():
             self.__registerEventToTarget(event, target)
         return event
 
     def createEndOfBallEvent(self):
-        event = EndBallEvent(self.currentPlayer)
+        event = EndBallEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets['Outhole'])
         return event
 
@@ -84,27 +84,27 @@ class EventFactory:
         return event
 
     def createEnterUpperPlayfieldEvent(self):
-        event = EnterUpperPlayfieldEvent(self.currentPlayer)
+        event = EnterUpperPlayfieldEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets['Rising ball'])
         return event
 
     def createStartGameEvent(self):
-        event = StartGameEvent(self.currentPlayer)
+        event = StartGameEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets['Credit'])
         return event
 
     def createBottomLeftBankEvent(self):
-        event = BottomLeftBankEvent(self.currentPlayer)
+        event = BottomLeftBankEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets["Left Bank"])
         return event
 
     def createBottomRightBankEvent(self):
-        event = BottomRightBankEvent(self.currentPlayer)
+        event = BottomRightBankEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets["Right Bank"])
         return event
 
     def createTopCentralBankEvent(self):
-        event = TopCentralBankEvent(self.currentPlayer)
+        event = TopCentralBankEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets["Top Bank"])
         return event
 
@@ -119,27 +119,27 @@ class EventFactory:
         return event
 
     def createTunnelEvent(self):
-        event = TunnelEvent(self.currentPlayer)
+        event = TunnelEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets["Canal Button Bottom"])
         return event
 
     def createRedSpecialEvent(self):
-        event = RedSpecialEvent(self.currentPlayer)
+        event = RedSpecialEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets["Special Red"])
         return event
 
     def createOrangeSpecialEvent(self):
-        event = OrangeSpecialEvent(self.currentPlayer)
+        event = OrangeSpecialEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets["Special Orange"])
         return event
 
     def createSpinnerEvent(self):
-        event = SpinnerEvent(self.currentPlayer)
+        event = SpinnerEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets["Spinner"])
         return event
 
     def createFixedTargetEvent(self):
-        event = FixedTargetEvent(self.currentPlayer)
+        event = FixedTargetEvent(self.gameState)
         self.__registerEventToTarget(event, self.targets["Fixed Target 1"])
         self.__registerEventToTarget(event, self.targets["Fixed Target 2"])
         self.__registerEventToTarget(event, self.targets["Fixed Target 3"])
@@ -148,7 +148,7 @@ class EventFactory:
         return event
 
     def createBonusEvent(self):
-        event = BonusEvent(self.currentPlayer)
+        event = BonusEvent(self.gameState)
         self.__registerEventToTargets(event, BONUS_EVENT_TARGETS)
 
     def createTiltEvent(self):

factories/GameFactory.py

@@ -19,7 +19,7 @@ class GameFactory:
 
         self.playerCount = len(displayNames) - 1
 
-        self.playerStateFactory = PlayerStateFactory(specialDisplay)
+        self.gameStateFactory = PlayerStateFactory(specialDisplay)
 
 
     def createGame(self):
@@ -31,7 +31,7 @@ class GameFactory:
 
         gameState = GameState(players, self.getHighScore(), players[0].id)
 
-        eventFactory = EventFactory(targets, gameState.currentPlayer.fset)
+        eventFactory = EventFactory(targets, gameState)
         events = eventFactory.allEvents()
 
         return Game(inputHandler, gameState, events)
@@ -40,7 +40,7 @@ class GameFactory:
         players = []
         for id in range(1, self.playerCount):
             display = self.displayFactory.createPlayerDisplay(id)
-            player = self.playerStateFactory.createPlayerState(display, id, banks)
+            player = self.gameStateFactory.createPlayerState(display, id, banks)
             players.append(player)
         return players