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

Opt: Allow starting from is_page_rogue_main

Browse Source 
so user can have their team prepared manually
This commit is contained in:
LmeSzinc 2023-11-18 03:55:41 +08:00
parent 7219a7d7bd
commit ff7e9e7e78
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasks/rogue/entry/entry.py
View File

@ -211,7 +211,7 @@ class RogueEntry(RouteBase, RogueRewardHandler, RoguePathHandler, DungeonUI):
"""
Pages:
in: page_guide, Survival_Index, Simulated_Universe
out: page_rogue
out: page_rogue, is_page_rogue_main()
"""
logger.info('Rogue teleport')
self.interval_clear(page_guide.check_button)
@ -237,6 +237,11 @@ class RogueEntry(RouteBase, RogueRewardHandler, RoguePathHandler, DungeonUI):
self.interval_clear(page_guide.check_button)
def goto_rogue(self):
"""
Pages:
in: Any
out: page_rogue, is_page_rogue_main()
"""
self.dungeon_tab_goto(Survival_Index)
self._dungeon_nav_goto(Simulated_Universe_World_1)
self._rogue_teleport()
@ -290,9 +295,6 @@ class RogueEntry(RouteBase, RogueRewardHandler, RoguePathHandler, DungeonUI):
if self.is_page_rogue_main():
logger.info('At is_page_rogue_main()')
return True
if self.is_page_rogue_launch():
logger.info('At is_page_rogue_launch()')
return True
if self.appear(LEVEL_CONFIRM):
logger.info('At LEVEL_CONFIRM')
return True
@ -312,6 +314,10 @@ class RogueEntry(RouteBase, RogueRewardHandler, RoguePathHandler, DungeonUI):
if self.appear(CONFIRM_PATH):
logger.info('At CONFIRM_PATH')
self.rogue_path_select(self.config.RogueWorld_Path)
# Team prepared
if self.is_page_rogue_launch():
logger.info('At is_page_rogue_launch()')
self.rogue_path_select(self.config.RogueWorld_Path)
logger.info('At any page_rogue')
self.clear_blessing()
self.ui_get_current_page()

3
tasks/rogue/rogue.py
View File

@ -16,7 +16,8 @@ class Rogue(RouteLoader, RogueEntry):
try:
self.rogue_world_enter()
except RogueTeamNotPrepared:
logger.error(f'Please prepare your team in {self.config.RogueWorld_World}')
logger.error(f'Please prepare your team in {self.config.RogueWorld_World} '
f'and start rogue task at team preparation page')
self.rogue_world_exit()
return False
except RogueReachedWeeklyPointLimit: