From 31ae87d05fa6ce4a2363ab995f758fd54ebcbc1d Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Tue, 28 Nov 2023 08:50:12 +0800 Subject: [PATCH 1/2] Fix: Check team prepare button also --- tasks/forgotten_hall/team.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tasks/forgotten_hall/team.py b/tasks/forgotten_hall/team.py index 4ba10c185..ac91a6ca1 100644 --- a/tasks/forgotten_hall/team.py +++ b/tasks/forgotten_hall/team.py @@ -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 From 678a26584a1da1a91e64efcd80c3edf27df05a2c Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Tue, 28 Nov 2023 08:53:13 +0800 Subject: [PATCH 2/2] Fix: Limit COMBAT_PAUSE offset or will cause combat state detection error --- tasks/combat/state.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/combat/state.py b/tasks/combat/state.py index 25cb85d9d..9c21b3251 100644 --- a/tasks/combat/state.py +++ b/tasks/combat/state.py @@ -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