diff --git a/src/run.py b/src/run.py index 5b0d3f2..e0fe748 100644 --- a/src/run.py +++ b/src/run.py @@ -7,7 +7,7 @@ from config import Config from utils.color_checker import run_color_checker from version import __version__ from utils.auto_settings import adjust_settings -from utils.misc import kill_thread, send_discord, close_down_d2 +from utils.misc import kill_thread, send_discord import threading from beautifultable import BeautifulTable import time @@ -38,7 +38,7 @@ def run_bot(config: Config): Logger.error(f"{config.general['name']} could not recover from a max game length violation. Shutting down everything.") if config.general["custom_discord_hook"]: send_discord(f"{config.general['name']} got stuck and can not resume", config.general["custom_discord_hook"]) - close_down_d2() + os._exit(1) if __name__ == "__main__": diff --git a/src/ui_manager.py b/src/ui_manager.py index 4b44463..8882ca2 100644 --- a/src/ui_manager.py +++ b/src/ui_manager.py @@ -10,7 +10,7 @@ import itertools import os import numpy as np from logger import Logger -from utils.misc import wait, cut_roi, color_filter, close_down_d2 +from utils.misc import wait, cut_roi, color_filter, send_discord from config import Config class UiManager(): @@ -340,7 +340,8 @@ class UiManager(): self._curr_stash += 1 if self._curr_stash > 3: Logger.error("All stash is full, quitting") - close_down_d2() + if config.general["custom_discord_hook"]: + send_discord(f"{config.general['name']} all stash is full, quitting", config.general["custom_discord_hook"]) os._exit(1) else: # move to next stash diff --git a/src/utils/misc.py b/src/utils/misc.py index bc0fad6..3dceeef 100644 --- a/src/utils/misc.py +++ b/src/utils/misc.py @@ -43,7 +43,3 @@ def color_filter(img, color_range): color_mask = cv2.inRange(hsv_img, color_range[0], color_range[1]) filtered_img = cv2.bitwise_and(img, img, mask=color_mask) return color_mask, filtered_img - -def close_down_d2(): - subprocess.call(["taskkill","/F","/IM","D2R.exe"]) - subprocess.call(["taskkill","/F","/IM","Battle.net.exe"])