Some lamps

PlayerState.py

@@ -8,6 +8,7 @@ import config
 from lamps.Lamp import Lamp
 from lamps.LampGroup import CHAMP_LAMPS
 from lamps.LampGroup import UPPER_PLAYFIELD_TIME_LAMPS
+from lamps.LampGroup import TUNNEL_NUMBER_LAMPS
 from lamps.LampGroup import TUNNEL_LAMPS
 from lamps.LampGroup import TUNNEL_SCORE_LAMPS
 from lamps.LampGroup import BONUS_MULTIPLIER_LAMPS
@@ -30,6 +31,7 @@ class PlayerState:
     bonusMultiplier = 1
     tunnelScoreIter = iter(TUNNEL_SCORES)
     tunnelScore = 0
+    tunnelLit = 0
     ballsLeft = 0
     replayBall = False
     hasBallScored = False
@@ -176,7 +178,7 @@ class PlayerState:
         self.redSpecial += 1
         CHAMP_LAMPS.activateNext()
 
-        if(self.redSpecial == config.RED_SPECIAL_TIMES):
+        if self.redSpecial == config.RED_SPECIAL_TIMES:
             self.redSpecialLit = True
             Lamp("Special Red").activate()
 
@@ -190,11 +192,15 @@ class PlayerState:
             pass
 
     def advanceTunnel(self):
-        if self.tunnelLit >= 5:
+        if self.tunnelLit == 5:
+            self.advanceTunnelScore()
+            TUNNEL_LAMPS.deactivate()
+            TUNNEL_NUMBER_LAMPS.deactivate()
             return
 
         self.tunnelLit += 1
         TUNNEL_LAMPS.activateNext()
+        TUNNEL_NUMBER_LAMPS.activateNext()
 
     def advanceBonus(self):
         if self.bonus >= 20:

lamps/LampGroup.py

@@ -48,6 +48,13 @@ UPPER_PLAYFIELD_TIME_LAMPS = LampGroup([
     Lamp("Lamp 30 Sec")
 ])
 
+TUNNEL_NUMBER_LAMPS = LampGroup([
+    Lamp("Lamp 1"),
+    Lamp("Lamp 2"),
+    Lamp("Lamp 3"),
+    Lamp("Lamp 4"),
+    Lamp("Lamp 5"),
+])
 TUNNEL_LAMPS = LampGroup([
     Lamp("1st Button"),
     Lamp("2nd Button"),