From c8e7c4d60c6ac0685fdff6b52e2bde7fd1a77f10 Mon Sep 17 00:00:00 2001 From: Thaloria Date: Mon, 17 Oct 2022 17:25:20 +0200 Subject: [PATCH] refactoring to game base class --- equipment.py | 4 ++++ magic.py | 3 +++ mine.py | 3 +++ 3 files changed, 10 insertions(+) diff --git a/equipment.py b/equipment.py index 97e5b95..1f57fb4 100644 --- a/equipment.py +++ b/equipment.py @@ -6,6 +6,7 @@ from hsvfilter import HsvFilter import pydirectinput from utils import dig_point from game_base_class import GameBase +from window_capture import WindowCapture EMITTER_MAIN = "main" EMITTER_MUSH = "mushroom" @@ -30,6 +31,9 @@ class Equipment(GameBase): self.masks = [] self.emitters = [] + # initialize the StunWindowCapture class + self.capture_window = WindowCapture(None, "equip", self.config) + self.EMITTER_TO_USE = str(overlay.emitter_use.get()) self.SPAWN_COUNT = int(overlay.spawn_use.get()) self.ENERGY_TO_USE = int(overlay.energy_use.get()) diff --git a/magic.py b/magic.py index 0d7904e..e7d15e3 100644 --- a/magic.py +++ b/magic.py @@ -3,6 +3,7 @@ import cv2 as cv from hsvfilter import HsvFilter import pydirectinput from game_base_class import GameBase +from window_capture import WindowCapture class Magic(GameBase): @@ -12,6 +13,8 @@ class Magic(GameBase): self.SPAWN_COUNT = int(overlay.spawn_use.get()) + self.capture_window = WindowCapture(None, "magic", self.config) + hsv_filter_orange = HsvFilter(10, 156, 0, 17, 255, 255, 0, 0, 0, 0) hsv_filter_p = HsvFilter(130, 156, 0, 179, 255, 255, 0, 0, 0, 0) hsv_filter_b = HsvFilter(88, 156, 0, 128, 255, 255, 0, 0, 0, 0) diff --git a/mine.py b/mine.py index 1cac795..ee28ba6 100644 --- a/mine.py +++ b/mine.py @@ -1,6 +1,7 @@ import cv2 as cv from utils import dig_point, check_for_ok_button from game_base_class import GameBase +from window_capture import WindowCapture class Mine(GameBase): @@ -8,6 +9,8 @@ class Mine(GameBase): def __init__(self, overlay): super().__init__(overlay) + self.capture_window = WindowCapture(None, "screen_conf", self.config) + self.level = 1 self.width = 32