Skip to content

Commit 8b8f5e4

Browse files
committed
Fix: prevent double dragging in _pq_target_appear
1 parent 40434b6 commit 8b8f5e4

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

module/private_quarters/interact.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ def _pq_handle_dialogue(self):
2727
Hence this call is used in other states
2828
besides on room enter
2929
"""
30+
3031
# Helper funcs to hold off spam clicking until loading
3132
# state is not present
3233
def after_loading_state():
3334
return not self.appear(PRIVATE_QUARTERS_LOADING_CHECK, offset=(20, 20))
35+
3436
def additional():
3537
return True
3638

@@ -79,12 +81,13 @@ def _pq_target_appear(self):
7981
(0, -30), box=PRIVATE_QUARTERS_ROOM_SAFE_CLICK_AREA.area,
8082
random_range=(-10, -10, 10, 10), padding=5)
8183
self.device.drag(p1, p2, segments=2,
82-
shake=(0, 25), point_random=(0, 0, 0, 0),
83-
shake_random=(0, -5, 0, 5))
84+
shake=(0, 25), point_random=(0, 0, 0, 0),
85+
shake_random=(0, -5, 0, 5))
86+
settle_timer.reset()
8487
else:
8588
# Absence of check likely means dialogue is ongoing
8689
self._pq_handle_dialogue()
87-
settle_timer.reset();
90+
settle_timer.reset()
8891

8992
def _pq_goto_room_seek(self, target_ship):
9093
"""
@@ -149,8 +152,11 @@ def _pq_goto_room_check(self):
149152
"""
150153
Callable wrapper for whether is loading or blocked by download asset popup
151154
"""
152-
return self.appear(PRIVATE_QUARTERS_LOADING_CHECK, offset=(20, 20)) \
153-
or self.appear(POPUP_CANCEL, offset=(20, 20))
155+
if self.appear(PRIVATE_QUARTERS_LOADING_CHECK, offset=(20, 20)):
156+
return True
157+
if self.appear(POPUP_CANCEL, offset=(20, 20)):
158+
return True
159+
return False
154160

155161
def _pq_goto_room_enter(self, target_ship):
156162
"""

0 commit comments

Comments
 (0)