From 961e225bb1d2210f8b84e079157e0ffc290f7ea2 Mon Sep 17 00:00:00 2001 From: Hengyu Date: Sun, 20 Aug 2023 22:43:07 +0800 Subject: [PATCH] Upd: remove 'the' in RoguePath keywords --- tasks/rogue/blessing.py | 4 +++- tasks/rogue/keywords/classes.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tasks/rogue/blessing.py b/tasks/rogue/blessing.py index abaab6372..c35678374 100644 --- a/tasks/rogue/blessing.py +++ b/tasks/rogue/blessing.py @@ -22,6 +22,8 @@ BLESSING_FILTER_ATTR = tuple() PATH_ATTR_NAME = 'path_name' path_regex = get_regex_from_keyword_name(RoguePath, PATH_ATTR_NAME) pattern += path_regex +# remove 'the' in path 'the hunt' +pattern = pattern.lower().replace('the', '') BLESSING_FILTER_ATTR += (PATH_ATTR_NAME,) # rarity @@ -111,7 +113,7 @@ class RogueBlessingSelector(RogueSelector): return keyword != KEYWORDS_ROGUE_ENHANCEMENT.Already_Enhanced self.ocr_results = [] - # self._wait_until_blessing_loaded() + self._wait_until_blessing_loaded() ocr = RogueBuffOcr(OCR_ROGUE_BUFF) results = ocr.matched_ocr(self.main.device.image, [RogueBlessing, RogueResonance, RogueEnhancement]) diff --git a/tasks/rogue/keywords/classes.py b/tasks/rogue/keywords/classes.py index 279f14f17..4a740792e 100644 --- a/tasks/rogue/keywords/classes.py +++ b/tasks/rogue/keywords/classes.py @@ -29,7 +29,7 @@ class RoguePath(Keyword): @property def path_name(self): - return [self.__getattribute__(f"{server}_parsed") + return [self.__getattribute__(f"{server}_parsed").replace("the", '') for server in UI_LANGUAGES if hasattr(self, f"{server}_parsed")]