From cfdcbcb5bdba74984057171832efeee485d917fd Mon Sep 17 00:00:00 2001 From: Jonas Zeunert Date: Thu, 2 Jun 2022 21:28:44 +0200 Subject: [PATCH] bugfixes --- GameState.py | 2 +- events/BonusEvent.py | 2 +- events/BonusTimeEvent.py | 2 +- events/BottomLeftBankEvent.py | 2 +- events/BottomRightBankEvent.py | 2 +- events/EndBallEvent.py | 12 ++++++------ events/EnterUpperPlayfieldEvent.py | 2 +- events/FixedTargetEvent.py | 2 +- events/OrangeSpecialEvent.py | 4 ++-- events/PointEvent.py | 6 +++--- events/RedSpecialEvent.py | 4 ++-- events/SpecialEvent.py | 6 +++--- events/SpinnerEvent.py | 2 +- events/StartGameEvent.py | 2 +- events/TopCentralBankEvent.py | 2 +- events/TunnelEvent.py | 2 +- events/UpperPlayfieldTimeEvent.py | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/GameState.py b/GameState.py index 6dc5c41..27306df 100644 --- a/GameState.py +++ b/GameState.py @@ -22,4 +22,4 @@ class GameState: self.players.remove(savedPlayer) self.players.append(savedPlayer) - self.gameState.activate() + self.gameState.currentPlayer.activate() diff --git a/events/BonusEvent.py b/events/BonusEvent.py index 4bd0a73..087734f 100644 --- a/events/BonusEvent.py +++ b/events/BonusEvent.py @@ -8,4 +8,4 @@ class BonusEvent(Event): def trigger(self, target): super().trigger(target) - self.gameState.advanceBonus() + self.gameState.currentPlayer.advanceBonus() diff --git a/events/BonusTimeEvent.py b/events/BonusTimeEvent.py index 780b21a..2ea9071 100644 --- a/events/BonusTimeEvent.py +++ b/events/BonusTimeEvent.py @@ -8,4 +8,4 @@ class BonusTimeEvent(Event): def trigger(self, target): super().trigger(target) - self.gameState.playerState.addBonusTimeSecond() + self.gameState.currentPlayer.addBonusTimeSecond() diff --git a/events/BottomLeftBankEvent.py b/events/BottomLeftBankEvent.py index 5585abd..24b3b7e 100644 --- a/events/BottomLeftBankEvent.py +++ b/events/BottomLeftBankEvent.py @@ -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() diff --git a/events/BottomRightBankEvent.py b/events/BottomRightBankEvent.py index 17013fd..d465bf8 100644 --- a/events/BottomRightBankEvent.py +++ b/events/BottomRightBankEvent.py @@ -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() diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py index aade3f5..055d51c 100644 --- a/events/EndBallEvent.py +++ b/events/EndBallEvent.py @@ -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) diff --git a/events/EnterUpperPlayfieldEvent.py b/events/EnterUpperPlayfieldEvent.py index f14e0bf..55f98ee 100644 --- a/events/EnterUpperPlayfieldEvent.py +++ b/events/EnterUpperPlayfieldEvent.py @@ -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() diff --git a/events/FixedTargetEvent.py b/events/FixedTargetEvent.py index 4ce5446..cdcca2f 100644 --- a/events/FixedTargetEvent.py +++ b/events/FixedTargetEvent.py @@ -8,4 +8,4 @@ class FixedTargetEvent(Event): def trigger(self, target): super().trigger(target) - self.gameState.playerState.advanceTunnel() + self.gameState.currentPlayer.advanceTunnel() diff --git a/events/OrangeSpecialEvent.py b/events/OrangeSpecialEvent.py index 084746b..bc73299 100644 --- a/events/OrangeSpecialEvent.py +++ b/events/OrangeSpecialEvent.py @@ -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() diff --git a/events/PointEvent.py b/events/PointEvent.py index 0ebc163..307bac7 100644 --- a/events/PointEvent.py +++ b/events/PointEvent.py @@ -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) \ No newline at end of file + self.gameState.currentPlayer.addPoints(target.points) \ No newline at end of file diff --git a/events/RedSpecialEvent.py b/events/RedSpecialEvent.py index 7e62ff9..051be29 100644 --- a/events/RedSpecialEvent.py +++ b/events/RedSpecialEvent.py @@ -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() diff --git a/events/SpecialEvent.py b/events/SpecialEvent.py index d6178d9..7bb1477 100644 --- a/events/SpecialEvent.py +++ b/events/SpecialEvent.py @@ -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 diff --git a/events/SpinnerEvent.py b/events/SpinnerEvent.py index 6b20801..915e5ba 100644 --- a/events/SpinnerEvent.py +++ b/events/SpinnerEvent.py @@ -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) diff --git a/events/StartGameEvent.py b/events/StartGameEvent.py index d237798..b6245ea 100644 --- a/events/StartGameEvent.py +++ b/events/StartGameEvent.py @@ -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() diff --git a/events/TopCentralBankEvent.py b/events/TopCentralBankEvent.py index 9668ca4..e983e6d 100644 --- a/events/TopCentralBankEvent.py +++ b/events/TopCentralBankEvent.py @@ -8,6 +8,6 @@ class TopCentralBankEvent(BankEvent): def trigger(self, target): - self.gameState.advanceRedSpecial() + self.gameState.currentPlayer.advanceRedSpecial() diff --git a/events/TunnelEvent.py b/events/TunnelEvent.py index 22a01cb..46991e1 100644 --- a/events/TunnelEvent.py +++ b/events/TunnelEvent.py @@ -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 diff --git a/events/UpperPlayfieldTimeEvent.py b/events/UpperPlayfieldTimeEvent.py index 086a3f6..55a29fc 100644 --- a/events/UpperPlayfieldTimeEvent.py +++ b/events/UpperPlayfieldTimeEvent.py @@ -8,4 +8,4 @@ class UpperPlayfieldTimeEvent(Event): def trigger(self, target): super().trigger(target) - self.gameState.addUpperPlayfieldTime(1) \ No newline at end of file + self.gameState.currentPlayer.addUpperPlayfieldTime(1) \ No newline at end of file