Skip to content

Commit

Permalink
Fix: Enlarge strategy search area since they are shown in 2x4 now (#4108
Browse files Browse the repository at this point in the history
)
  • Loading branch information
LmeSzinc committed Aug 22, 2024
1 parent 7eadaa7 commit 918e700
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions module/handler/strategy.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
submarine_view.add_status('on', check_button=SUBMARINE_VIEW_ON)
submarine_view.add_status('off', check_button=SUBMARINE_VIEW_OFF)

MOB_MOVE_OFFSET = (120, 120)
MOB_MOVE_OFFSET = (120, 200)


class StrategyHandler(InfoHandler):
Expand All @@ -35,10 +35,10 @@ def strategy_open(self, skip_first_screenshot=True):
else:
self.device.screenshot()

if self.appear(STRATEGY_OPENED, offset=120):
if self.appear(STRATEGY_OPENED, offset=200):
break

if self.appear(IN_MAP, interval=5) and not self.appear(STRATEGY_OPENED, offset=120):
if self.appear(IN_MAP, interval=5) and not self.appear(STRATEGY_OPENED, offset=200):
self.device.click(STRATEGY_OPEN)
continue

Expand All @@ -54,10 +54,10 @@ def strategy_close(self, skip_first_screenshot=True):
else:
self.device.screenshot()

if self.appear_then_click(STRATEGY_OPENED, offset=120, interval=5):
if self.appear_then_click(STRATEGY_OPENED, offset=200, interval=5):
continue

if not self.appear(STRATEGY_OPENED, offset=120):
if not self.appear(STRATEGY_OPENED, offset=200):
break

def strategy_set_execute(self, formation_index=None, sub_view=None, sub_hunt=None):
Expand Down Expand Up @@ -156,7 +156,7 @@ def strategy_submarine_move_enter(self, skip_first_screenshot=True):
else:
self.device.screenshot()

if self.appear(SUBMARINE_MOVE_ENTER, offset=120, interval=5):
if self.appear(SUBMARINE_MOVE_ENTER, offset=200, interval=5):
self.device.click(SUBMARINE_MOVE_ENTER)

if self.appear(SUBMARINE_MOVE_CONFIRM, offset=(20, 20)):
Expand All @@ -180,7 +180,7 @@ def strategy_submarine_move_confirm(self, skip_first_screenshot=True):
if self.handle_popup_confirm('SUBMARINE_MOVE'):
pass

if self.appear(SUBMARINE_MOVE_ENTER, offset=120):
if self.appear(SUBMARINE_MOVE_ENTER, offset=200):
break

def strategy_submarine_move_cancel(self, skip_first_screenshot=True):
Expand All @@ -201,7 +201,7 @@ def strategy_submarine_move_cancel(self, skip_first_screenshot=True):
if self.handle_popup_confirm('SUBMARINE_MOVE'):
pass

if self.appear(SUBMARINE_MOVE_ENTER, offset=120):
if self.appear(SUBMARINE_MOVE_ENTER, offset=200):
break

def is_in_strategy_mob_move(self):
Expand Down

0 comments on commit 918e700

Please sign in to comment.