rhetenor/flippr-game
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dunno

Browse Source
This commit is contained in:
Jonas Zeunert
2022-08-30 19:14:21 +02:00
parent d980934216
commit 762cb03912
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
GameState.py
View File

@@ -10,6 +10,7 @@ class GameState:
players = None players = None
credits = config.BALLS_PER_GAME credits = config.BALLS_PER_GAME
isPlaying = False isPlaying = False
isStarted = False
def __init__(self, playerStateFactory, highscore, specialDisplay, currentPlayerID = 0): def __init__(self, playerStateFactory, highscore, specialDisplay, currentPlayerID = 0):
CREDIT.activate() CREDIT.activate()
@@ -26,7 +27,7 @@ class GameState:
self.currentPlayer = next(self.players) self.currentPlayer = next(self.players)
def startGame(self, playerCount): def startGame(self, playerCount):
self.isPlaying = True self.isStarted = True
self.createPlayers(playerCount) self.createPlayers(playerCount)
self.nextPlayer() self.nextPlayer()

7
events/StartBallEvent.py
View File

@@ -4,11 +4,16 @@ from solenoids.MainFlipper import MainFlipper
class StartBallEvent(Event): class StartBallEvent(Event):
def __init__(self): def __init__(self, gameState = None):
self.gameState = gameState
self.flipper = MainFlipper() self.flipper = MainFlipper()
super().__init__("Start Ball Event") super().__init__("Start Ball Event")
def trigger(self, target): def trigger(self, target):
if self.gameState is not None:
if self.gameState.isPlaying or not self.gameState.isStarted:
return
super().trigger(target) super().trigger(target)
self.flipper.activate() self.flipper.activate()
OutHoleSolenoid().trigger() OutHoleSolenoid().trigger()

2
events/StartGameEvent.py
View File

@@ -27,7 +27,7 @@ class StartGameEvent(Event):
self.timer.start() self.timer.start()
def trigger(self, target): def trigger(self, target):
if self.gameState.isPlaying: if self.gameState.isStarted:
return return
super().trigger(target) super().trigger(target)

5
factories/EventFactory.py
View File

@@ -8,6 +8,7 @@ from events.RightKickerEvent import RightKickerEvent
from events.EnterUpperPlayfieldEvent import EnterUpperPlayfieldEvent from events.EnterUpperPlayfieldEvent import EnterUpperPlayfieldEvent
from events.StartGameEvent import StartGameEvent from events.StartGameEvent import StartGameEvent
from events.EndGameEvent import EndGameEvent from events.EndGameEvent import EndGameEvent
from events.StartBallEvent import StartBallEvent
from events.BottomRightBankEvent import BottomRightBankEvent from events.BottomRightBankEvent import BottomRightBankEvent
from events.BottomLeftBankEvent import BottomLeftBankEvent from events.BottomLeftBankEvent import BottomLeftBankEvent
from events.TopCentralBankEvent import TopCentralBankEvent from events.TopCentralBankEvent import TopCentralBankEvent
@@ -93,6 +94,10 @@ class EventFactory:
self.__registerEventToTarget(event, self.targets['Credit']) self.__registerEventToTarget(event, self.targets['Credit'])
return event return event
def createStartBallEvent(self):
event = StartBallEvent(self.gameState)
self.__registerEventToTarget(event, self.targets['Credit'])
return event
def createBottomLeftBankEvent(self): def createBottomLeftBankEvent(self):
event = BottomLeftBankEvent(self.gameState) event = BottomLeftBankEvent(self.gameState)
self.__registerEventToTarget(event, self.targets["Left Bank"]) self.__registerEventToTarget(event, self.targets["Left Bank"])