Opt: Ignore obtain_frequent_check if combat will be reentered later

This commit is contained in:
LmeSzinc 2024-05-20 04:28:38 +08:00
parent 8fa0c47a96
commit 616f072a2b

View File

@ -232,8 +232,15 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
# Planner # Planner
logger.attr('obtain_frequent_check', self.obtain_frequent_check) logger.attr('obtain_frequent_check', self.obtain_frequent_check)
if self.obtain_frequent_check: if self.obtain_frequent_check:
logger.info('Re-enter combat to check obtained items') if self.config.stored.TrailblazePower.value >= self.combat_wave_cost \
return True and (self.combat_wave_limit and self.combat_wave_done < self.combat_wave_limit):
logger.info(f'Stall having some trailblaze power '
f'but wave limit reached {self.combat_wave_done}/{self.combat_wave_limit}, '
f'ignore obtain_frequent_check cause will reenter later')
return False
else:
logger.info('Re-enter combat to check obtained items')
return True
# Stamina # Stamina
if self.config.stored.TrailblazePower.value < self.combat_wave_cost: if self.config.stored.TrailblazePower.value < self.combat_wave_cost:
logger.info('Current trailblaze power is not enough for next run') logger.info('Current trailblaze power is not enough for next run')