From 269e072010f145ec8f6fa90b55d40d79913b5441 Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <jonas@zeunert.org>
Date: Tue, 7 Jun 2022 01:52:56 +0200
Subject: [PATCH]  tunnel

---
 PlayerState.py        | 8 +++++++-
 events/TunnelEvent.py | 4 ----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/PlayerState.py b/PlayerState.py
index 405493e..1813001 100644
--- a/PlayerState.py
+++ b/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()
diff --git a/events/TunnelEvent.py b/events/TunnelEvent.py
index 3290f70..1f87ca4 100644
--- a/events/TunnelEvent.py
+++ b/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: