diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index 4044321..ecb3e42 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -50,22 +50,6 @@ class BaseCombatTask(BaseWWTask, FindFeature, OCR, CombatCheck): self.char_texts = ['char_1_text', 'char_2_text', 'char_3_text'] - self.bosses_pos = { - 'Bell-Borne Geochelone': [0, 0, False], - 'Dreamless': [0, 2, True], - 'Jue': [0, 3, True], - 'Tempest Mephis': [0, 4, False], - 'Inferno Rider': [0, 5, False], - 'Impermanence Heron': [0, 6, False], - 'Lampylumen Myriad': [1, 0, False], - 'Feilian Beringal': [1, 1, False], - 'Mourning Aix': [1, 2, False], - 'Crownless': [1, 3, False], - 'Mech Abomination': [1, 4, False], - 'Thundering Mephis': [1, 5, False], - 'Fallacy of No Return': [1, 6, False], - } - def send_key_and_wait_animation(self, key, check_function, total_wait=10, animation_wait=5): start = time.time() animation_start = 0 diff --git a/src/task/BaseWWTask.py b/src/task/BaseWWTask.py index f35425a..1920040 100644 --- a/src/task/BaseWWTask.py +++ b/src/task/BaseWWTask.py @@ -36,6 +36,21 @@ class BaseWWTask(BaseTask, FindFeature, OCR): self.multiplayer_check_interval = 3 self._in_multiplayer = False self._multiplayer_last_check = 0 + self.bosses_pos = { + 'Bell-Borne Geochelone': [0, 0, False], + 'Dreamless': [0, 2, True], + 'Jue': [0, 3, True], + 'Tempest Mephis': [0, 4, False], + 'Inferno Rider': [0, 5, False], + 'Impermanence Heron': [0, 6, False], + 'Lampylumen Myriad': [1, 0, False], + 'Feilian Beringal': [1, 1, False], + 'Mourning Aix': [1, 2, False], + 'Crownless': [1, 3, False], + 'Mech Abomination': [1, 4, False], + 'Thundering Mephis': [1, 5, False], + 'Fallacy of No Return': [1, 6, False], + } def validate(self, key, value): message = self.validate_config(key, value) @@ -363,7 +378,7 @@ class BaseWWTask(BaseTask, FindFeature, OCR): def click_traval_button(self): if btn := self.find_one('fast_travel_custom', threshold=0.6): - self.click_box(btn, relative_x=-1) + self.click_box(btn, relative_x=1) self.sleep(1) return self.wait_click_feature('gray_confirm_exit_button', relative_x=-1, raise_if_not_found=True, threshold=0.7, diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py index a83c31f..ee7402a 100644 --- a/src/task/FarmWorldBossTask.py +++ b/src/task/FarmWorldBossTask.py @@ -15,7 +15,7 @@ class FarmWorldBossTask(BaseCombatTask): super().__init__() self.description = "Click Start in Game World" self.name = "Farm World Boss(Must Drop a WayPoint on the Boss First)" - self.boss_names = ['N/A', 'Bell-Borne Geochelone', 'Crownless', 'Thundering Mephis', + self.boss_names = ['N/A', 'Bell-Borne Geochelone', 'Crownless', 'Thundering Mephis', 'Tempest Mephis', 'Inferno Rider', 'Feilian Beringal', 'Mourning Aix', 'Impermanence Heron', 'Lampylumen Myriad', 'Mech Abomination',