Merge pull request #209 from LmeSzinc/bug_fix

Bug fix
This commit is contained in:
LmeSzinc 2023-11-28 08:57:54 +08:00 committed by GitHub
commit f65a5ac4e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View File

@ -16,7 +16,7 @@ class CombatState(UI):
def is_combat_executing(self) -> bool:
appear = self.appear(COMBAT_PAUSE)
if appear:
if COMBAT_PAUSE.button_offset[0] <= 5:
if COMBAT_PAUSE.button_offset[0] < 3:
return True
return False

View File

@ -95,7 +95,8 @@ class ForgottenHallTeam(UI):
if timeout.reached():
logger.info('Team not prepared')
return False
chosen_list = [not self.appear(s) for s in seats]
if all(chosen_list):
logger.info("Team already prepared")
return True
if self.team_prepared():
chosen_list = [not self.appear(s) for s in seats]
if all(chosen_list):
logger.info("Team already prepared")
return True