From b2dddce5190497d8914cfef75dc3ddb78e35ae22 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Sat, 6 Jul 2024 16:02:09 +0800 Subject: [PATCH] add farm echo screenshots remove encore heavy attack --- src/char/Encore.py | 10 ++++------ src/task/AutoCombatTask.py | 4 ++-- src/task/BaseCombatTask.py | 3 ++- src/task/FarmEchoTask.py | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/char/Encore.py b/src/char/Encore.py index 400c05d..0f2a47a 100644 --- a/src/char/Encore.py +++ b/src/char/Encore.py @@ -13,16 +13,14 @@ class Encore(BaseChar): self.sleep(0.4) self.n4() self.click_resonance() - if self.is_forte_full(): - self.logger.info('Encore is_forte_full cast') - self.sleep(2) - self.heavy_attack() + # if self.is_forte_full(): + # self.logger.info('Encore is_forte_full cast') + # self.sleep(2) + # self.heavy_attack() elif self.resonance_available(): self.click_resonance() elif self.echo_available(): self.click_echo(duration=1.5) - elif self.is_forte_full(): - self.heavy_attack() else: self.logger.info('Encore nothing is available') self.switch_next_char() diff --git a/src/task/AutoCombatTask.py b/src/task/AutoCombatTask.py index 4bcb468..049cbdc 100644 --- a/src/task/AutoCombatTask.py +++ b/src/task/AutoCombatTask.py @@ -14,8 +14,8 @@ class AutoCombatTask(BaseCombatTask, TriggerTask): self.get_current_char().perform() except NotInCombatException as e: logger.info(f'out of combat break {e}') - # if self.debug: - self.screenshot(f'out of combat break {e}') + if self.debug: + self.screenshot(f'out of combat break {e}') break def trigger(self): diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index 7b026d4..ff62265 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -88,7 +88,8 @@ class BaseCombatTask(BaseTask, FindFeature, OCR, CombatCheck): if not in_team or now - start > 10: if self.debug: self.screenshot(f'not in team while switching chars_{current_char}_to_{switch_to} {now - start}') - self.raise_not_in_combat('not in team while switching chars') + self.raise_not_in_combat( + f'not in team while switching chars_{current_char}_to_{switch_to}, {now - start}') if current_index != switch_to.index: has_intro = free_intro if free_intro else current_char.is_con_full() switch_to.has_intro = has_intro diff --git a/src/task/FarmEchoTask.py b/src/task/FarmEchoTask.py index 26fb190..d67bf43 100644 --- a/src/task/FarmEchoTask.py +++ b/src/task/FarmEchoTask.py @@ -73,8 +73,8 @@ class FarmEchoTask(BaseCombatTask): self.get_current_char().perform() except NotInCombatException as e: logger.info(f'farm echo loop out of combat break {e}') - if self.debug: - self.screenshot(f'out of combat break {e}') + # if self.debug: + self.screenshot(f'out of combat break {e}') break logger.info(f'farm echo combat end') self.wait_in_team_and_world(time_out=20)