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

change playerstate to be function

Browse Source
This commit is contained in:
Jonas Zeunert
2022-05-05 23:08:02 +02:00
parent ae93fd81f2
commit ff5d9d4dfa
7 changed files with 22 additions and 22 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.playerState.advanceBonus()
self.playerState().advanceBonus()

4
events/BottomLeftBankEvent.py
View File

@@ -9,5 +9,5 @@ class BottomLeftBankEvent(BankEvent):
def trigger(self, target):
super().trigger(target)
playerState = self.playerState()
playerState.advanceLeftOrangeSpecial()
playerState.advanceUpperPlayfieldTime()
playerState().advanceLeftOrangeSpecial()
playerState().advanceUpperPlayfieldTime()

6
events/BottomRightBankEvent.py
View File

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

2
events/EndBallEvent.py
View File

@@ -11,7 +11,7 @@ class EndBallEvent(Event):
def trigger(self, target):
super().trigger(target)
if self.playerState().replayBall or not self.playerState.hasBallScored:
if self.playerState().replayBall or not self.playerState().hasBallScored:
StartBallEvent().trigger(None)
return

6
events/SpecialEvent.py
View File

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

8
events/SpinnerEvent.py
View File

@@ -20,10 +20,10 @@ class SpinnerEvent(Event):
playerState = self.playerState()
timePassed = time() - self.activationTime
if 1 <= timePassed < 1.5:
playerState.addPoints(100000)
playerState().addPoints(100000)
elif 1.5 <= timePassed < 2:
playerState.addPoints(150000)
playerState().addPoints(150000)
elif 2 <= timePassed < 5:
playerState.addPoints(200000)
playerState().addPoints(200000)
elif timePassed >= 5:
playerState.addPoints(500000)
playerState().addPoints(500000)

16
events/TunnelEvent.py
View File

@@ -15,11 +15,11 @@ class TunnelEvent(Event):
def scoreBonusTunnelPoints(self):
playerState = self.playerState()
if playerState.tunnelLit == 2:
playerState.addPoints(10000)
elif playerState.tunnelLit == 3:
playerState.addPoints(20000)
elif playerState.tunnelLit == 4:
playerState.addPoints(40000)
elif playerState.tunnelLit == 5:
playerState.addPoints(190000)
if playerState().tunnelLit == 2:
playerState().addPoints(10000)
elif playerState().tunnelLit == 3:
playerState().addPoints(20000)
elif playerState().tunnelLit == 4:
playerState().addPoints(40000)
elif playerState().tunnelLit == 5:
playerState().addPoints(190000)