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

bugfixes

Browse Source
This commit is contained in:
Jonas Zeunert
2022-06-02 21:28:44 +02:00
parent 3d2008dc4d
commit cfdcbcb5bd
17 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
events/BonusEvent.py
View File

@@ -8,4 +8,4 @@ class BonusEvent(Event):
def trigger(self, target):
super().trigger(target)
self.gameState.advanceBonus()
self.gameState.currentPlayer.advanceBonus()

2
events/BonusTimeEvent.py
View File

@@ -8,4 +8,4 @@ class BonusTimeEvent(Event):
def trigger(self, target):
super().trigger(target)
self.gameState.playerState.addBonusTimeSecond()
self.gameState.currentPlayer.addBonusTimeSecond()

2
events/BottomLeftBankEvent.py
View File

@@ -8,6 +8,6 @@ class BottomLeftBankEvent(BankEvent):
def trigger(self, target):
super().trigger(target)
playerState = self.gameState.playerState
playerState = self.gameState.currentPlayer
playerState.advanceLeftOrangeSpecial()
playerState.advanceUpperPlayfieldTime()

2
events/BottomRightBankEvent.py
View File

@@ -8,7 +8,7 @@ class BottomRightBankEvent(BankEvent):
def trigger(self, target):
super().trigger(target)
playerState = self.gameState.playerState
playerState = self.gameState.currentPlayer
playerState.advanceRightOrangeSpecial()
if playerState.upperPlayfieldTime < 30:
playerState.advanceUpperPlayfieldTime()

12
events/EndBallEvent.py
View File

@@ -11,18 +11,18 @@ class EndBallEvent(Event):
def trigger(self, target):
super().trigger(target)
if self.gameState.replayBall or not self.gameState.hasBallScored:
if self.gameState.currentPlayer.replayBall or not self.gameState.currentPlayer.hasBallScored:
StartBallEvent().trigger(None)
return
self.gameState.playerState.removeBall()
self.gameState.currentPlayer.removeBall()
self.scorePoints()
self.gameState.playerState.reset()
self.gameState.currentPlayer.reset()
if self.gameState.playerState.ballsLeft == 0:
if self.gameState.currentPlayer.ballsLeft == 0:
EndGameEvent().trigger(None)
def scorePoints(self):
bonus = self.gameState.playerState.bonus * self.gameState.playerState.bonusMultiplier * 1000
self.gameState.playerState.addPoints(bonus)
bonus = self.gameState.currentPlayer.bonus * self.gameState.currentPlayer.bonusMultiplier * 1000
self.gameState.currentPlayer.addPoints(bonus)

2
events/EnterUpperPlayfieldEvent.py
View File

@@ -11,4 +11,4 @@ class EnterUpperPlayfieldEvent(Event):
def trigger(self, target):
super().trigger(target)
self.flipper.activate()
self.gameState.playerState.startUpperPlayfieldTimer()
self.gameState.currentPlayer.startUpperPlayfieldTimer()

2
events/FixedTargetEvent.py
View File

@@ -8,4 +8,4 @@ class FixedTargetEvent(Event):
def trigger(self, target):
super().trigger(target)
self.gameState.playerState.advanceTunnel()
self.gameState.currentPlayer.advanceTunnel()

4
events/OrangeSpecialEvent.py
View File

@@ -10,7 +10,7 @@ class OrangeSpecialEvent(SpecialEvent):
def trigger(self, target):
super().trigger(target)
if self.gameState.playerState.orangeSpecialLit:
if self.gameState.currentPlayer.orangeSpecialLit:
config.ORANGE_SPECIAL(self)
self.gameState.playerState.resetOrangeSpecial()
self.gameState.currentPlayer.resetOrangeSpecial()

6
events/PointEvent.py
View File

@@ -2,10 +2,10 @@ from Event import Event
class PointEvent(Event):
def __init__(self, playerState):
self.gameState = playerState
def __init__(self, gameState):
self.gameState = gameState
super().__init__("Point Event")
def trigger(self, target):
super().trigger(target)
self.gameState.addPoints(target.points)
self.gameState.currentPlayer.addPoints(target.points)

4
events/RedSpecialEvent.py
View File

@@ -8,8 +8,8 @@ class RedSpecialEvent(SpecialEvent):
def trigger(self, target):
super().trigger(target)
if self.gameState.redSpecialLit:
if self.gameState.currentPlayer.redSpecialLit:
config.RED_SPECIAL(self)
self.gameState.resetRedSpecial()
self.gameState.currentPlayer.resetRedSpecial()

6
events/SpecialEvent.py
View File

@@ -7,13 +7,13 @@ class SpecialEvent(Event):
self.gameState = playerState
def replay(self):
self.gameState.setReplayBall()
self.gameState.currentPlayer.setReplayBall()
def extra_ball(self):
self.gameState.addBall()
self.gameState.currentPlayer.addBall()
def points(self):
self.gameState.addPoints(self.points)
self.gameState.currentPlayer.addPoints(self.points)
def super_bonus(self):
pass

2
events/SpinnerEvent.py
View File

@@ -17,7 +17,7 @@ class SpinnerEvent(Event):
self.scorePoints()
def scorePoints(self):
playerState = self.gameState.playerState
playerState = self.gameState.currentPlayer
timePassed = time() - self.activationTime
if 1 <= timePassed < 1.5:
playerState.addPoints(100000)

2
events/StartGameEvent.py
View File

@@ -13,5 +13,5 @@ class StartGameEvent(Event):
def trigger(self, target):
super().trigger(target)
self.flipper.activate()
self.gameState.activate()
self.gameState.currentPlayer.activate()
self.outHoleSolenoid.trigger()

2
events/TopCentralBankEvent.py
View File

@@ -8,6 +8,6 @@ class TopCentralBankEvent(BankEvent):
def trigger(self, target):
self.gameState.advanceRedSpecial()
self.gameState.currentPlayer.advanceRedSpecial()

2
events/TunnelEvent.py
View File

@@ -11,7 +11,7 @@ class TunnelEvent(Event):
self.scoreBonusTunnelPoints()
def advanceBonusMultiplier(self):
self.gameState.advanceBonusMultiplier()
self.gameState.currentPlayer.advanceBonusMultiplier()
def scoreBonusTunnelPoints(self):
playerState = self.gameState

2
events/UpperPlayfieldTimeEvent.py
View File

@@ -8,4 +8,4 @@ class UpperPlayfieldTimeEvent(Event):
def trigger(self, target):
super().trigger(target)
self.gameState.addUpperPlayfieldTime(1)
self.gameState.currentPlayer.addUpperPlayfieldTime(1)