Very much done

PlayerState.py

@@ -1,5 +1,6 @@
 from threading import Timer
 import time
+import config
 
 class PlayerState:
     def __init__(self, display, specialDisplay, id, ballsToPlay, upperPlayfieldTime = 5, bonusTime = 0):
@@ -8,10 +9,68 @@ class PlayerState:
         self.id = id
         self.points = 0
         self.ballsLeft = ballsToPlay
-        self.upperPlayfieldTime = upperPlayfieldTime
-        self.bonusTime = bonusTime
+
+        self.bonusTime = config.BEGINNING_BONUS_TIME
+
+        self.reset()
+
+    def reset(self):
+        self.bonus = 0
+        self.bonusMultiplier = 1
         self.timer = None
         self.timerStartTime = None
+        self.replayBall = False
+        self.upperPlayfieldTime = config.BEGINNING_UPPER_PLAYFIELD_TIME
+
+        self.resetTargets()
+
+    def resetTargets(self):
+        self.resetRedSpecial()
+        self.resetOrangeSpecial()
+        self.tunnelLit = 0
+
+    def resetRedSpecial(self):
+        self.redSpecial = 0
+        self.redSpecialLit = False
+
+    def resetOrangeSpecial(self):
+        self.orangeSpecialLeft = False
+        self.orangeSpecialRight = False
+        self.orangeSpecialLit = False
+
+    def advanceRightOrangeSpecial(self):
+        self.orangeSpecialRight = True
+        self.setOrangeSpecialLit()
+
+    def advanceLeftOrangeSpecial(self):
+        self.orangeSpecialLeft = True
+        self.setOrangeSpecialLit()
+
+    def setOrangeSpecialLit(self):
+        if config.ORANGE_SPECIAL_BANK_OPTIONS == config.ORANGE_SPECIAL_BANK_OPTIONS.ONE:
+            self.orangeSpecialLit = self.orangeSpecialRight or self.orangeSpecialLeft
+        elif config.ORANGE_SPECIAL_BANK == config.ORANGE_SPECIAL_BANK_OPTIONS.BOTH:
+            self.orangeSpecialLit = self.orangeSpecialRight and self.orangeSpecialLeft
+
+
+    def advanceRedSpecial(self):
+        self.redSpecial += 1
+
+        if(self.redSpecial == config.RED_SPECIAL_TIMES):
+            self.redSpecialLit = True
+
+    def advanceBonusMultiplier(self):
+        if self.bonusMultiplier >= 15:
+            return
+
+        if self.bonusMultiplier == 1:
+            self.bonusMultiplier = 5
+            return
+
+        self.bonusMultiplier *= 2
+
+    def setReplayBall(self):
+        self.replayBall = True
 
     def addPoints(self, points):
         self.points += points