From ffdd522c7b5b123af0746eb4e02bc5e9dfd4b2ca Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <jonas@zeunert.org>
Date: Thu, 1 Sep 2022 00:07:16 +0200
Subject: [PATCH] fufu

---
 GameState.py           | 6 ++++--
 Target.py              | 4 ++++
 events/EndBallEvent.py | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/GameState.py b/GameState.py
index dee34a1..3d00c7e 100644
--- a/GameState.py
+++ b/GameState.py
@@ -48,9 +48,11 @@ class GameState:
         self.isPlaying = False
         self.isStarted = False
         logging.info("Game ended")
+        self.startIdleLoop()
 
     def startIdleLoop(self):
         logging.info("Starting Idle Loop")
+        PLAYER_LAMPS.deactivate()
         self.isIdle = True
         self.idleThread = threading.Thread(target=self.idleLoop)
         self.idleThread.start()
@@ -76,6 +78,8 @@ class GameState:
             for _ in range(20):
                 random_group = random.choice(all_cabinet_lamps)
                 random_group.toggleRandom(0.2)
+            if not self.isIdle:
+                return
             for lamps in all_cabinet_lamps:
                 for lamp in lamps.lamps:
                     lamp.activate()
@@ -83,8 +87,6 @@ class GameState:
                         return
                     time.sleep(0.1)
             self.deactivate_all()
-            if not self.isIdle:
-                return
 
     def createPlayers(self, playerCount):
         players = []
diff --git a/Target.py b/Target.py
index 2e880b0..9b772c7 100644
--- a/Target.py
+++ b/Target.py
@@ -2,8 +2,12 @@ from observable import Observable
 from collections import defaultdict
 
 import logging
+import time
 
 class Target(Observable):
+
+    lastActivation = 0
+
     def __init__(self, points, name):
         logging.info("Target " + name + " created")
         self._events = defaultdict(list)
diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py
index fbd550f..3dd54f8 100644
--- a/events/EndBallEvent.py
+++ b/events/EndBallEvent.py
@@ -20,6 +20,7 @@ class EndBallEvent(Event):
 
     def trigger(self, target):
         super().trigger(target)
+
         TopFlipper().deactivate()
         MainFlipper().deactivate()