playerstate to prop

PlayerState.py

@@ -61,7 +61,8 @@ class PlayerState:
     upperPlayfieldTimeIter = iter(UPPER_PLAYFIELD_TIME)
     upperPlayfieldTime = 0
 
-    def __init__(self, display, specialDisplay, id, ballsToPlay):
+    def __init__(self, display, specialDisplay, id, ballsToPlay, banks):
+        self.banks = banks
         self.display = display
         self.specialDisplay = specialDisplay
         self.id = id
@@ -72,9 +73,11 @@ class PlayerState:
 
         self.bonusTime = config.BEGINNING_BONUS_TIME
 
-        self.reset()
         self.specialDisplay.printScore()
 
+    def activate(self):
+        self.reset()
+
     def enableTiming(self):
         if config.BONUS_TIME_ALGORITHM == config.BONUS_TIME_ALGORITHM_OPTIONS.RANDOM:
             self.disableAdvanceTimeLeft()
@@ -143,6 +146,7 @@ class PlayerState:
         BONUS_MULTIPLIER_LAMPS.deactivate()
 
     def resetTargets(self):
+        self.resetBanks()
         self.resetRedSpecial()
         self.resetOrangeSpecial()
         self.resetTunnel()
@@ -167,6 +171,10 @@ class PlayerState:
         TUNNEL_SCORE_LAMPS.activateNext()
         TUNNEL_LAMPS.deactivate()
 
+    def resetBanks(self):
+        for bank in self.banks:
+            bank.reset()
+
     def advanceRightOrangeSpecial(self):
         self.orangeSpecialRight = True
         self.setOrangeSpecialLit()