Use message template to support other hooks (#265)

This commit is contained in:
nekolr
2021-12-12 08:22:36 +01:00
committed by GitHub
parent 4c52045f08
commit c2a017c517
9 changed files with 99 additions and 60 deletions
+8 -5
View File
@@ -7,7 +7,7 @@ import os
import numpy as np
from utils.custom_mouse import mouse
from utils.misc import wait, cut_roi, color_filter, send_discord
from utils.misc import wait, cut_roi, color_filter
from logger import Logger
from config import Config
@@ -15,6 +15,8 @@ from screen import Screen
from item import ItemFinder
from template_finder import TemplateFinder
from messenger import Messenger
class UiManager():
"""Everything that is clicking on some static 2D UI or is checking anything in regard to it should be placed here."""
@@ -22,6 +24,7 @@ class UiManager():
def __init__(self, screen: Screen, template_finder: TemplateFinder):
self._config = Config()
self._template_finder = template_finder
self._messenger = Messenger()
self._screen = screen
self._curr_stash = {"items": 0, "gold": 0} #0: personal, 1: shared1, 2: shared2, 3: shared3
@@ -325,8 +328,8 @@ class UiManager():
if inventory_full_gold.valid:
msg = "All stash tabs and character are full of gold, turn of gold pickup"
Logger.info(msg)
if self._config.general["custom_discord_hook"]:
send_discord(f"{self._config.general['name']}: {msg}", self._config.general["custom_discord_hook"])
if self._config.general["custom_message_hook"]:
self._messenger.send(msg=f"{self._config.general['name']}: {msg}")
self._config.items["misc_gold"] = 0
item_finder.update_items_to_pick(self._config)
else:
@@ -392,8 +395,8 @@ class UiManager():
self._curr_stash["items"] += 1
if self._curr_stash["items"] > 3:
Logger.error("All stash is full, quitting")
if self._config.general["custom_discord_hook"]:
send_discord(f"{self._config.general['name']} all stash is full, quitting", self._config.general["custom_discord_hook"])
if self._config.general["custom_message_hook"]:
self._messenger.send(msg=f"{self._config.general['name']}: all stash is full, quitting")
os._exit(1)
else:
# move to next stash