tunnel

PlayerState.py

@@ -235,17 +235,23 @@ class PlayerState:
     def advanceTunnelScore(self):
         if not self.isActive:
             return
+
         try:
             self.tunnelScore = next(self.tunnelScoreIter)
             TUNNEL_SCORE_LAMPS.deactivateCurrent()
             TUNNEL_SCORE_LAMPS.currentLamp += 1 # dirty
             TUNNEL_SCORE_LAMPS.activateNext()
         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):
         if not self.isActive:
             return
+
         if self.tunnelLit == 5:
             self.advanceTunnelScore()
             TUNNEL_LAMPS.deactivate()

events/TunnelEvent.py

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