From 81b7fe2871367287d1ddd12d953d064725d18ee1 Mon Sep 17 00:00:00 2001 From: Thaloria Date: Wed, 19 Oct 2022 08:58:58 +0200 Subject: [PATCH] new ui elements for timing --- equipment.py | 2 +- game_base_class.py | 5 ++--- mine.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/equipment.py b/equipment.py index f5dbd80..a2aae32 100644 --- a/equipment.py +++ b/equipment.py @@ -95,7 +95,7 @@ class Equipment(GameBase): breaks = self.init_breaks() for emitter in self.emitters: while True: - self.check_breaks() + self.check_breaks(start_time, breaks) if self.overlay.run_mode == 'paused': cv.waitKey(1) continue diff --git a/game_base_class.py b/game_base_class.py index b91324b..730435b 100644 --- a/game_base_class.py +++ b/game_base_class.py @@ -64,9 +64,8 @@ class GameBase: def execute_main_loop(self): start_time = time() breaks = self.init_breaks() - while True: - self.check_breaks(start_time) + self.check_breaks(start_time, breaks) if self.overlay.run_mode == 'paused': cv.waitKey(1) continue @@ -85,7 +84,7 @@ class GameBase: breaks.append(random.randint(i * avr_in_sec * 0.60, i * avr_in_sec)) return breaks - def check_breaks(self, start_time): + def check_breaks(self, start_time, breaks): if (time() - start_time) > float(self.stop_time) * 60 * 60: self.overlay.run_mode = 'stopped' for break_ in breaks: diff --git a/mine.py b/mine.py index 7768625..2c91d64 100644 --- a/mine.py +++ b/mine.py @@ -41,7 +41,7 @@ class Mine(GameBase): start_time = time() breaks = self.init_breaks() while True: - self.check_breaks(start_time) + self.check_breaks(start_time, breaks) if self.overlay.run_mode == 'paused': cv.waitKey(10) self.overlay.show_mining_overlay()