diff --git a/assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.2.png b/assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.2.png new file mode 100644 index 000000000..5e96aa5d2 Binary files /dev/null and b/assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.2.png differ diff --git a/tasks/base/daemon.py b/tasks/base/daemon.py index 86bf70863..537d6e5b5 100644 --- a/tasks/base/daemon.py +++ b/tasks/base/daemon.py @@ -59,6 +59,11 @@ class Daemon(RouteBase, DaemonBase, AimDetectorMixin): else: logger.warning(f'Maatouch contact on {builder.contact}, may cause interruptions') + STORY_OPTION.set_search_offset((-5, -5, 32, 5)) + INTERACT_COLLECT.set_search_offset((-5, -5, 32, 5)) + INTERACT_INVESTIGATE.set_search_offset((-5, -5, 32, 5)) + INTERACT_TREASURE.set_search_offset((-5, -5, 32, 5)) + teleport_confirm = Timer(1, count=5) while 1: self.device.screenshot() diff --git a/tasks/combat/assets/assets_combat_interact.py b/tasks/combat/assets/assets_combat_interact.py index 790440071..5cbe5a27c 100644 --- a/tasks/combat/assets/assets_combat_interact.py +++ b/tasks/combat/assets/assets_combat_interact.py @@ -5,13 +5,22 @@ from module.base.button import Button, ButtonWrapper DUNGEON_COMBAT_INTERACT = ButtonWrapper( name='DUNGEON_COMBAT_INTERACT', - share=Button( - file='./assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.png', - area=(753, 419, 781, 441), - search=(733, 399, 801, 461), - color=(199, 197, 198), - button=(750, 411, 997, 448), - ), + share=[ + Button( + file='./assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.png', + area=(753, 419, 781, 441), + search=(733, 399, 801, 461), + color=(199, 197, 198), + button=(750, 411, 997, 448), + ), + Button( + file='./assets/share/combat/interact/DUNGEON_COMBAT_INTERACT.2.png', + area=(780, 419, 808, 441), + search=(760, 399, 828, 461), + color=(199, 197, 198), + button=(750, 411, 997, 448), + ), + ], ) DUNGEON_COMBAT_INTERACT_TEXT = ButtonWrapper( name='DUNGEON_COMBAT_INTERACT_TEXT',