From 0b69679a453635c41fc088eafc602d0c999acd97 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Tue, 19 Dec 2023 00:53:33 +0800 Subject: [PATCH] Fix: Blessing type --- tasks/rogue/{bleesing => blessing}/blessing.py | 6 +++--- tasks/rogue/{bleesing => blessing}/bonus.py | 6 +++--- tasks/rogue/{bleesing => blessing}/curio.py | 6 +++--- tasks/rogue/{bleesing => blessing}/preset.py | 0 tasks/rogue/{bleesing => blessing}/selector.py | 2 +- tasks/rogue/{bleesing => blessing}/ui.py | 0 tasks/rogue/{bleesing => blessing}/utils.py | 0 tasks/rogue/entry/path.py | 2 +- tasks/rogue/entry/weekly.py | 2 +- tasks/rogue/event/event.py | 2 +- tasks/rogue/event/reward.py | 2 +- tasks/rogue/route/base.py | 6 +++--- tasks/rogue/route/loader.py | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) rename tasks/rogue/{bleesing => blessing}/blessing.py (98%) rename tasks/rogue/{bleesing => blessing}/bonus.py (95%) rename tasks/rogue/{bleesing => blessing}/curio.py (97%) rename tasks/rogue/{bleesing => blessing}/preset.py (100%) rename tasks/rogue/{bleesing => blessing}/selector.py (98%) rename tasks/rogue/{bleesing => blessing}/ui.py (100%) rename tasks/rogue/{bleesing => blessing}/utils.py (100%) diff --git a/tasks/rogue/bleesing/blessing.py b/tasks/rogue/blessing/blessing.py similarity index 98% rename from tasks/rogue/bleesing/blessing.py rename to tasks/rogue/blessing/blessing.py index b57cc7489..cb39daef5 100644 --- a/tasks/rogue/bleesing/blessing.py +++ b/tasks/rogue/blessing/blessing.py @@ -10,9 +10,9 @@ from module.ocr.ocr import Digit, DigitCounter, Ocr, OcrResultButton from module.ocr.utils import split_and_pair_buttons from tasks.rogue.assets.assets_rogue_blessing import * from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM -from tasks.rogue.bleesing.preset import * -from tasks.rogue.bleesing.selector import RogueSelector -from tasks.rogue.bleesing.utils import get_regex_from_keyword_name, is_card_selected, parse_name +from tasks.rogue.blessing.preset import * +from tasks.rogue.blessing.selector import RogueSelector +from tasks.rogue.blessing.utils import get_regex_from_keyword_name, is_card_selected, parse_name from tasks.rogue.keywords import * # normal blessing filter diff --git a/tasks/rogue/bleesing/bonus.py b/tasks/rogue/blessing/bonus.py similarity index 95% rename from tasks/rogue/bleesing/bonus.py rename to tasks/rogue/blessing/bonus.py index f8bc0f6e2..94a33304b 100644 --- a/tasks/rogue/bleesing/bonus.py +++ b/tasks/rogue/blessing/bonus.py @@ -5,9 +5,9 @@ from module.logger import logger from module.ocr.ocr import OcrResultButton from tasks.rogue.assets.assets_rogue_blessing import OCR_ROGUE_BUFF from tasks.rogue.assets.assets_rogue_bonus import BONUS_BOTTOM_WHITE_BAR, BONUS_CONFIRM -from tasks.rogue.bleesing.selector import RogueSelector -from tasks.rogue.bleesing.ui import RogueBonusOcr -from tasks.rogue.bleesing.utils import is_card_selected +from tasks.rogue.blessing.selector import RogueSelector +from tasks.rogue.blessing.ui import RogueBonusOcr +from tasks.rogue.blessing.utils import is_card_selected from tasks.rogue.keywords import RogueBonus diff --git a/tasks/rogue/bleesing/curio.py b/tasks/rogue/blessing/curio.py similarity index 97% rename from tasks/rogue/bleesing/curio.py rename to tasks/rogue/blessing/curio.py index 022ad7d8f..f388269fe 100644 --- a/tasks/rogue/bleesing/curio.py +++ b/tasks/rogue/blessing/curio.py @@ -9,9 +9,9 @@ from module.logger import logger from module.ocr.ocr import Ocr, OcrResultButton from tasks.rogue.assets.assets_rogue_curio import CURIO_ENFORCE, OCR_ROGUE_CURIO from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM, BLESSING_ENHANCED, BLESSING_LOST, BLESSING_OBTAINED -from tasks.rogue.bleesing.preset import CURIO_PRESET_1 -from tasks.rogue.bleesing.selector import RogueSelector -from tasks.rogue.bleesing.utils import get_regex_from_keyword_name, parse_name +from tasks.rogue.blessing.preset import CURIO_PRESET_1 +from tasks.rogue.blessing.selector import RogueSelector +from tasks.rogue.blessing.utils import get_regex_from_keyword_name, parse_name from tasks.rogue.keywords import RogueCurio CURIO_FILTER_ATTR = tuple() diff --git a/tasks/rogue/bleesing/preset.py b/tasks/rogue/blessing/preset.py similarity index 100% rename from tasks/rogue/bleesing/preset.py rename to tasks/rogue/blessing/preset.py diff --git a/tasks/rogue/bleesing/selector.py b/tasks/rogue/blessing/selector.py similarity index 98% rename from tasks/rogue/bleesing/selector.py rename to tasks/rogue/blessing/selector.py index fcbf8004e..fa7bcc0da 100644 --- a/tasks/rogue/bleesing/selector.py +++ b/tasks/rogue/blessing/selector.py @@ -3,7 +3,7 @@ import numpy as np from module.logger import logger from module.ocr.keyword import Keyword from module.ocr.ocr import OcrResultButton -from tasks.rogue.bleesing.ui import RogueUI +from tasks.rogue.blessing.ui import RogueUI class RogueSelector: diff --git a/tasks/rogue/bleesing/ui.py b/tasks/rogue/blessing/ui.py similarity index 100% rename from tasks/rogue/bleesing/ui.py rename to tasks/rogue/blessing/ui.py diff --git a/tasks/rogue/bleesing/utils.py b/tasks/rogue/blessing/utils.py similarity index 100% rename from tasks/rogue/bleesing/utils.py rename to tasks/rogue/blessing/utils.py diff --git a/tasks/rogue/entry/path.py b/tasks/rogue/entry/path.py index 1b305ff74..41ce12e2f 100644 --- a/tasks/rogue/entry/path.py +++ b/tasks/rogue/entry/path.py @@ -3,7 +3,7 @@ from module.base.timer import Timer from module.logger import logger from tasks.rogue.assets.assets_rogue_path import * from tasks.rogue.assets.assets_rogue_ui import ROGUE_LAUNCH -from tasks.rogue.bleesing.ui import RogueUI +from tasks.rogue.blessing.ui import RogueUI from tasks.rogue.exception import RogueTeamNotPrepared from tasks.rogue.keywords import KEYWORDS_ROGUE_PATH, RoguePath diff --git a/tasks/rogue/entry/weekly.py b/tasks/rogue/entry/weekly.py index c0fbedc68..edcce3d07 100644 --- a/tasks/rogue/entry/weekly.py +++ b/tasks/rogue/entry/weekly.py @@ -1,7 +1,7 @@ from module.base.timer import Timer from module.logger import logger from tasks.rogue.assets.assets_rogue_weekly import CLAIM_ALL, REWARD_CHECK, REWARD_CLOSE, REWARD_ENTER, REWARD_RED_DOT -from tasks.rogue.bleesing.ui import RogueUI +from tasks.rogue.blessing.ui import RogueUI class RogueRewardHandler(RogueUI): diff --git a/tasks/rogue/event/event.py b/tasks/rogue/event/event.py index 98ac6dc1b..c2f44e709 100644 --- a/tasks/rogue/event/event.py +++ b/tasks/rogue/event/event.py @@ -14,7 +14,7 @@ from module.ocr.ocr import Ocr, OcrResultButton from module.ui.scroll import Scroll from tasks.rogue.assets.assets_rogue_event import * from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM, PAGE_EVENT -from tasks.rogue.bleesing.ui import RogueUI +from tasks.rogue.blessing.ui import RogueUI from tasks.rogue.event.preset import STRATEGIES, STRATEGY_COMMON from tasks.rogue.keywords import (KEYWORDS_ROGUE_EVENT_OPTION, KEYWORDS_ROGUE_EVENT_TITLE, RogueEventOption, diff --git a/tasks/rogue/event/reward.py b/tasks/rogue/event/reward.py index 96a26c6c3..38301744c 100644 --- a/tasks/rogue/event/reward.py +++ b/tasks/rogue/event/reward.py @@ -6,7 +6,7 @@ from tasks.base.assets.assets_base_popup import GET_REWARD from tasks.combat.interact import CombatInteract from tasks.dungeon.state import DungeonState from tasks.rogue.assets.assets_rogue_reward import REWARD_CLOSE, USE_IMMERSIFIER, USE_STAMINA -from tasks.rogue.bleesing.ui import RogueUI +from tasks.rogue.blessing.ui import RogueUI class RogueReward(RogueUI, CombatInteract, DungeonState): diff --git a/tasks/rogue/route/base.py b/tasks/rogue/route/base.py index 14e648a57..b68a4f793 100644 --- a/tasks/rogue/route/base.py +++ b/tasks/rogue/route/base.py @@ -7,9 +7,9 @@ from tasks.map.control.waypoint import Waypoint, ensure_waypoints from tasks.map.route.base import RouteBase as RouteBase_ from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM from tasks.rogue.assets.assets_rogue_weekly import ROGUE_REPORT -from tasks.rogue.bleesing.blessing import RogueBlessingSelector -from tasks.rogue.bleesing.bonus import RogueBonusSelector -from tasks.rogue.bleesing.curio import RogueCurioSelector +from tasks.rogue.blessing.blessing import RogueBlessingSelector +from tasks.rogue.blessing.bonus import RogueBonusSelector +from tasks.rogue.blessing.curio import RogueCurioSelector from tasks.rogue.event.event import RogueEvent from tasks.rogue.event.reward import RogueReward from tasks.rogue.route.exit import RogueExit diff --git a/tasks/rogue/route/loader.py b/tasks/rogue/route/loader.py index 7c11b9496..588a9a447 100644 --- a/tasks/rogue/route/loader.py +++ b/tasks/rogue/route/loader.py @@ -17,7 +17,7 @@ from tasks.map.keywords.plane import ( from tasks.map.minimap.minimap import Minimap from tasks.map.resource.resource import SPECIAL_PLANES from tasks.map.route.loader import RouteLoader as RouteLoader_ -from tasks.rogue.bleesing.ui import RogueUI +from tasks.rogue.blessing.ui import RogueUI from tasks.rogue.route.base import RouteBase from tasks.rogue.route.model import RogueRouteListModel, RogueRouteModel