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

tunnel

Browse Source
This commit is contained in:
Jonas Zeunert
2022-06-07 01:52:56 +02:00
parent 3fa64a2c8a
commit 269e072010
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PlayerState.py
View File

@@ -235,17 +235,23 @@ class PlayerState:
def advanceTunnelScore(self): def advanceTunnelScore(self):
if not self.isActive: if not self.isActive:
return return
try: try:
self.tunnelScore = next(self.tunnelScoreIter) self.tunnelScore = next(self.tunnelScoreIter)
TUNNEL_SCORE_LAMPS.deactivateCurrent() TUNNEL_SCORE_LAMPS.deactivateCurrent()
TUNNEL_SCORE_LAMPS.currentLamp += 1 # dirty TUNNEL_SCORE_LAMPS.currentLamp += 1 # dirty
TUNNEL_SCORE_LAMPS.activateNext() TUNNEL_SCORE_LAMPS.activateNext()
except StopIteration: except StopIteration:
pass self.advanceBonusMultiplier()
self.tunnelScore = iter(TUNNEL_SCORES)
self.tunnelScore = next(self.tunnelScoreIter)
TUNNEL_SCORE_LAMPS.deactivate()
TUNNEL_SCORE_LAMPS.activateNext()
def advanceTunnel(self): def advanceTunnel(self):
if not self.isActive: if not self.isActive:
return return
if self.tunnelLit == 5: if self.tunnelLit == 5:
self.advanceTunnelScore() self.advanceTunnelScore()
TUNNEL_LAMPS.deactivate() TUNNEL_LAMPS.deactivate()

4
events/TunnelEvent.py
View File

@@ -7,12 +7,8 @@ class TunnelEvent(Event):
def trigger(self, target): def trigger(self, target):
super().trigger(target) super().trigger(target)
self.advanceBonusMultiplier()
self.scoreBonusTunnelPoints() self.scoreBonusTunnelPoints()
def advanceBonusMultiplier(self):
self.gameState.currentPlayer.advanceBonusMultiplier()
def scoreBonusTunnelPoints(self): def scoreBonusTunnelPoints(self):
playerState = self.gameState.currentPlayer playerState = self.gameState.currentPlayer
if playerState.tunnelLit == 2: if playerState.tunnelLit == 2: