0
0
mirror of https://github.com/ok-oldking/ok-wuthering-waves.git synced 2025-06-07 09:25:34 +00:00

add farm echo screenshots remove encore heavy attack

This commit is contained in:
firedcto@gmail.com 2024-07-06 16:02:09 +08:00
parent 77167e9eab
commit b2dddce519
4 changed files with 10 additions and 11 deletions

View File

@ -13,16 +13,14 @@ class Encore(BaseChar):
self.sleep(0.4) self.sleep(0.4)
self.n4() self.n4()
self.click_resonance() self.click_resonance()
if self.is_forte_full(): # if self.is_forte_full():
self.logger.info('Encore is_forte_full cast') # self.logger.info('Encore is_forte_full cast')
self.sleep(2) # self.sleep(2)
self.heavy_attack() # self.heavy_attack()
elif self.resonance_available(): elif self.resonance_available():
self.click_resonance() self.click_resonance()
elif self.echo_available(): elif self.echo_available():
self.click_echo(duration=1.5) self.click_echo(duration=1.5)
elif self.is_forte_full():
self.heavy_attack()
else: else:
self.logger.info('Encore nothing is available') self.logger.info('Encore nothing is available')
self.switch_next_char() self.switch_next_char()

View File

@ -14,8 +14,8 @@ class AutoCombatTask(BaseCombatTask, TriggerTask):
self.get_current_char().perform() self.get_current_char().perform()
except NotInCombatException as e: except NotInCombatException as e:
logger.info(f'out of combat break {e}') logger.info(f'out of combat break {e}')
# if self.debug: if self.debug:
self.screenshot(f'out of combat break {e}') self.screenshot(f'out of combat break {e}')
break break
def trigger(self): def trigger(self):

View File

@ -88,7 +88,8 @@ class BaseCombatTask(BaseTask, FindFeature, OCR, CombatCheck):
if not in_team or now - start > 10: if not in_team or now - start > 10:
if self.debug: if self.debug:
self.screenshot(f'not in team while switching chars_{current_char}_to_{switch_to} {now - start}') 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: if current_index != switch_to.index:
has_intro = free_intro if free_intro else current_char.is_con_full() has_intro = free_intro if free_intro else current_char.is_con_full()
switch_to.has_intro = has_intro switch_to.has_intro = has_intro

View File

@ -73,8 +73,8 @@ class FarmEchoTask(BaseCombatTask):
self.get_current_char().perform() self.get_current_char().perform()
except NotInCombatException as e: except NotInCombatException as e:
logger.info(f'farm echo loop out of combat break {e}') logger.info(f'farm echo loop out of combat break {e}')
if self.debug: # if self.debug:
self.screenshot(f'out of combat break {e}') self.screenshot(f'out of combat break {e}')
break break
logger.info(f'farm echo combat end') logger.info(f'farm echo combat end')
self.wait_in_team_and_world(time_out=20) self.wait_in_team_and_world(time_out=20)