xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-25 10:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Retry synthesize_rarity_reset() if inv.wait_selected() failed

Browse Source
This commit is contained in:
LmeSzinc 2024-06-18 16:52:08 +08:00
parent 6be818dfd6
commit e60f4c2e5a
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tasks/item/synthesize.py
View File

@ -174,26 +174,41 @@ class Synthesize(CombatObtain, ItemUI):
return switched return switched
def synthesize_rarity_reset(self, skip_first_screenshot=True): def synthesize_rarity_reset(self, inv=None, skip_first_screenshot=True):
""" """
Reset rarity switch, so current item will pin on the first row Reset rarity switch, so current item will pin on the first row
Args:
inv: InventoryManager object if wait until item selected
skip_first_screenshot:
Returns: Returns:
bool: If success bool: If success
""" """
logger.hr('synthesize rarity reset') for _ in range(3):
current = self.item_get_rarity_retry(ENTRY_ITEM_FROM) logger.hr('synthesize rarity reset')
if current == 'blue': current = self.item_get_rarity_retry(ENTRY_ITEM_FROM)
r1, r2 = 'green', 'blue' if current == 'blue':
elif current == 'green': r1, r2 = 'green', 'blue'
r1, r2 = 'blue', 'green' elif current == 'green':
else: r1, r2 = 'blue', 'green'
logger.error(f'item_synthesize_rarity_reset: Unknown current rarity {current}') else:
return False logger.error(f'item_synthesize_rarity_reset: Unknown current rarity {current}')
return False
self.synthesize_rarity_set(r1, skip_first_screenshot=skip_first_screenshot) self.synthesize_rarity_set(r1, skip_first_screenshot=skip_first_screenshot)
self.synthesize_rarity_set(r2, skip_first_screenshot=True) self.synthesize_rarity_set(r2, skip_first_screenshot=True)
return True if inv is not None:
if inv.wait_selected():
return True
else:
continue
else:
logger.info('synthesize_rarity_reset ended without wait_selected()')
return True
logger.error('synthesize_rarity_reset failed 3 times')
return False
def synthesize_obtain_get(self) -> list[ObtainedAmmount]: def synthesize_obtain_get(self) -> list[ObtainedAmmount]:
""" """
@ -301,7 +316,6 @@ class Synthesize(CombatObtain, ItemUI):
if inv.selected.loca[1] >= 3: if inv.selected.loca[1] >= 3:
logger.info('Reached inventory view end, reset view') logger.info('Reached inventory view end, reset view')
self.synthesize_rarity_reset() self.synthesize_rarity_reset()
inv.wait_selected()
logger.hr('Synthesize select view', level=2) logger.hr('Synthesize select view', level=2)
continue continue
else: else: