refactor(pixel): Remove last of hardcoded pixel values
This commit is contained in:
@@ -13,6 +13,7 @@ import keyboard
|
|||||||
from logger import Logger
|
from logger import Logger
|
||||||
import time
|
import time
|
||||||
from typing import Dict, Tuple
|
from typing import Dict, Tuple
|
||||||
|
from config import Config
|
||||||
|
|
||||||
|
|
||||||
def abstract(f):
|
def abstract(f):
|
||||||
@@ -27,6 +28,7 @@ class IChar:
|
|||||||
self._template_finder = template_finder
|
self._template_finder = template_finder
|
||||||
self._ui_manager = ui_manager
|
self._ui_manager = ui_manager
|
||||||
self._screen = screen
|
self._screen = screen
|
||||||
|
self._config = Config()
|
||||||
|
|
||||||
def select_by_template(self, template_type: str) -> bool:
|
def select_by_template(self, template_type: str) -> bool:
|
||||||
Logger.debug(f"Select {template_type}")
|
Logger.debug(f"Select {template_type}")
|
||||||
@@ -67,8 +69,7 @@ class IChar:
|
|||||||
mouse.click(button="right")
|
mouse.click(button="right")
|
||||||
custom_mouse.move(1400 + random.randrange(0, 60), 300 + random.randrange(0, 60), duration=0.1)
|
custom_mouse.move(1400 + random.randrange(0, 60), 300 + random.randrange(0, 60), duration=0.1)
|
||||||
time.sleep(1.4) # takes quite a while for tp to be visible
|
time.sleep(1.4) # takes quite a while for tp to be visible
|
||||||
# TODO: 1920x1080 specific params
|
roi = self._config.ui_roi["tp_search"]
|
||||||
roi=[530, 180, 820, 600]
|
|
||||||
start = time.time()
|
start = time.time()
|
||||||
while (time.time() - start) < 7:
|
while (time.time() - start) < 7:
|
||||||
img = self._screen.grab()
|
img = self._screen.grab()
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ class Pather:
|
|||||||
self._config = Config()
|
self._config = Config()
|
||||||
self._screen = screen
|
self._screen = screen
|
||||||
self._template_finder = template_finder
|
self._template_finder = template_finder
|
||||||
# TODO: params based on 1920x1080 (in rel coordinates to ref point)
|
|
||||||
self._range_x = [-self._config.ui_pos["center_x"] + 10, self._config.ui_pos["center_x"] - 10]
|
self._range_x = [-self._config.ui_pos["center_x"] + 10, self._config.ui_pos["center_x"] - 10]
|
||||||
self._range_y = [-self._config.ui_pos["center_y"] + 10, self._config.ui_pos["center_y"] - self._config.ui_pos["skill_bar_height"] - 10]
|
self._range_y = [-self._config.ui_pos["center_y"] + 10, self._config.ui_pos["center_y"] - self._config.ui_pos["skill_bar_height"] - 10]
|
||||||
self._nodes = {
|
self._nodes = {
|
||||||
|
|||||||
@@ -132,8 +132,7 @@ class TemplateFinder:
|
|||||||
start = time.time()
|
start = time.time()
|
||||||
while 1:
|
while 1:
|
||||||
img = self._screen.grab()
|
img = self._screen.grab()
|
||||||
# TODO: 1920x1080 specific params
|
is_loading_black_roi = np.average(img[:, 0:self._config.ui_roi["loading_left_black"][2]]) < 1.0
|
||||||
is_loading_black_roi = np.average(img[:, 0:500]) < 1.0
|
|
||||||
success, pos = self.search(ref, img, roi=roi, threshold=threshold)
|
success, pos = self.search(ref, img, roi=roi, threshold=threshold)
|
||||||
if not is_loading_black_roi and success:
|
if not is_loading_black_roi and success:
|
||||||
return True, pos
|
return True, pos
|
||||||
|
|||||||
Reference in New Issue
Block a user