diff --git a/campaign/event_20200611_en/b3.py b/campaign/event_20200611_en/b3.py index 9606ab0e5..3eddbe164 100644 --- a/campaign/event_20200611_en/b3.py +++ b/campaign/event_20200611_en/b3.py @@ -26,7 +26,7 @@ MAP.wall_data = """ · · | · · · | · · · · | · · · | · · , | | | | , · · | · · · | · · · · | · · · | · · , - +---+ +---+ +----+ +---+ , + +---+ +---+ +---+ +---+ , · · · | · · · · · · · · | · · · , | | , · · · | · · · · · · · · | · · · , diff --git a/campaign/event_20200611_en/d3.py b/campaign/event_20200611_en/d3.py index 26968be89..0cf75e3ed 100644 --- a/campaign/event_20200611_en/d3.py +++ b/campaign/event_20200611_en/d3.py @@ -37,7 +37,7 @@ MAP.wall_data = """ · · | · · · | · · · · | · · · | · · , | | | | , · · | · · · | · · · · | · · · | · · , - +---+ +---+ +----+ +---+ , + +---+ +---+ +---+ +---+ , · · · | · · · · · · · · | · · · , | | , · · · | · · · · · · · · | · · · , diff --git a/module/equipment/equipment.py b/module/equipment/equipment.py index d23e55158..c108c74e7 100644 --- a/module/equipment/equipment.py +++ b/module/equipment/equipment.py @@ -17,7 +17,7 @@ class Equipment(InfoHandler): equipment_has_take_on = False def _view_swipe(self, distance, check_button=EQUIPMENT_OPEN): - swipe_timer = Timer(3, count=5) + swipe_timer = Timer(5, count=10) SWIPE_CHECK.load_color(self.device.image) while 1: if not swipe_timer.started() or swipe_timer.reached(): diff --git a/module/exercise/combat.py b/module/exercise/combat.py index 4e10a9020..30752b195 100644 --- a/module/exercise/combat.py +++ b/module/exercise/combat.py @@ -80,12 +80,12 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment): show_hp_timer.reset() self._show_hp() - if self.appear_then_click(QUIT_CONFIRM, offset=True, interval=1): + if self.appear_then_click(QUIT_CONFIRM, offset=True, interval=5): success = False end = True continue - if self.appear_then_click(QUIT_RECONFIRM, offset=True, interval=1): + if self.appear_then_click(QUIT_RECONFIRM, offset=True, interval=5): self.interval_reset(QUIT_CONFIRM) continue diff --git a/module/handler/enemy_searching.py b/module/handler/enemy_searching.py index 8d51eb4c1..01111fc3b 100644 --- a/module/handler/enemy_searching.py +++ b/module/handler/enemy_searching.py @@ -38,7 +38,9 @@ class EnemySearchingHandler(InfoHandler): def is_in_stage(self): if not self.appear(IN_STAGE, offset=(10, 10)): return False - if self.stage_entrance is not None and not self.appear(self.stage_entrance, threshold=30): + if self.stage_entrance is not None \ + and self.stage_entrance.area \ + and not self.appear(self.stage_entrance, threshold=30): return False return True