From 32011d815bd3547f10cf2875406a21aff1fa45b2 Mon Sep 17 00:00:00 2001 From: aeon0 Date: Sat, 1 Jan 2022 20:24:36 +0100 Subject: [PATCH] Allow bo and bc for weapon switch (#373) --- assets/templates/bc.png | Bin 2745 -> 3016 bytes assets/templates/bo.png | Bin 0 -> 3193 bytes src/char/i_char.py | 2 +- src/ui/ui_manager.py | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 assets/templates/bo.png diff --git a/assets/templates/bc.png b/assets/templates/bc.png index a8cb01ebc30bd9c426e83e1b9cffd06a94969033..75d578b2acfc08e68208f80e3bb5785a50e890f3 100644 GIT binary patch literal 3016 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 KMNUMnLSTY)pVgND literal 2745 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 diff --git a/assets/templates/bo.png b/assets/templates/bo.png new file mode 100644 index 0000000000000000000000000000000000000000..c31013665fcc1b3fdd9ed1d5a3e21119f0921842 GIT binary patch literal 3193 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 literal 0 HcmV?d00001 diff --git a/src/char/i_char.py b/src/char/i_char.py index 6914afa..c7550b6 100644 --- a/src/char/i_char.py +++ b/src/char/i_char.py @@ -164,7 +164,7 @@ class IChar: wait(0.3, 0.35) keyboard.send(self._char_config["battle_command"]) wait(0.1, 0.19) - if self._ui_manager.is_right_skill_selected(["BC"]): + if self._ui_manager.is_right_skill_selected(["BC", "BO"]): switch_sucess = True break diff --git a/src/ui/ui_manager.py b/src/ui/ui_manager.py index 345a21b..2fc63b4 100644 --- a/src/ui/ui_manager.py +++ b/src/ui/ui_manager.py @@ -73,7 +73,7 @@ class UiManager(): :return: Bool if skill is currently the selected skill on the right skill slot. """ for template in template_list: - if self._template_finder.search(template, self._screen.grab(), threshold=0.87, roi=self._config.ui_roi["skill_right"]).valid: + if self._template_finder.search(template, self._screen.grab(), threshold=0.84, roi=self._config.ui_roi["skill_right"]).valid: return True return False @@ -82,7 +82,7 @@ class UiManager(): :return: Bool if skill is currently the selected skill on the left skill slot. """ for template in template_list: - if self._template_finder.search(template, self._screen.grab(), threshold=0.87, roi=self._config.ui_roi["skill_left"]).valid: + if self._template_finder.search(template, self._screen.grab(), threshold=0.84, roi=self._config.ui_roi["skill_left"]).valid: return True return False