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: Wrong path distance as too many paths defined but never used in game

Browse Source
This commit is contained in:
LmeSzinc 2023-12-30 23:52:36 +08:00
parent 23f9cb7d52
commit ae07b19d07
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tasks/rogue/entry/path.py
View File

@ -1,5 +1,6 @@
from module.base.decorator import cached_property from module.base.decorator import cached_property
from module.base.timer import Timer from module.base.timer import Timer
from module.exception import RequestHumanTakeover
from module.logger import logger from module.logger import logger
from tasks.rogue.assets.assets_rogue_path import * from tasks.rogue.assets.assets_rogue_path import *
from tasks.rogue.assets.assets_rogue_ui import ROGUE_LAUNCH from tasks.rogue.assets.assets_rogue_ui import ROGUE_LAUNCH
@ -38,7 +39,7 @@ class RoguePathHandler(RogueUI):
KEYWORDS_ROGUE_PATH.The_Hunt: CHECK_THE_HUNT, KEYWORDS_ROGUE_PATH.The_Hunt: CHECK_THE_HUNT,
KEYWORDS_ROGUE_PATH.Destruction: CHECK_DESTRUCTION, KEYWORDS_ROGUE_PATH.Destruction: CHECK_DESTRUCTION,
KEYWORDS_ROGUE_PATH.Elation: CHECK_ELATION, KEYWORDS_ROGUE_PATH.Elation: CHECK_ELATION,
KEYWORDS_ROGUE_PATH.Propagation: CHECK_PROPAGATION KEYWORDS_ROGUE_PATH.Propagation: CHECK_PROPAGATION,
} }
# 2023.12.28 Buttons moved up # 2023.12.28 Buttons moved up
for b in buttons.values(): for b in buttons.values():
@ -61,6 +62,23 @@ class RoguePathHandler(RogueUI):
b.load_search(area_pad_around(b.area, pad=(-100, -5, -100, -5))) b.load_search(area_pad_around(b.area, pad=(-100, -5, -100, -5)))
return buttons return buttons
@cached_property
def _rogue_paths(self) -> dict[RoguePath, int]:
"""
Paths that can be selected
"""
buttons = {
KEYWORDS_ROGUE_PATH.Preservation: 1,
KEYWORDS_ROGUE_PATH.Remembrance: 2,
KEYWORDS_ROGUE_PATH.Nihility: 3,
KEYWORDS_ROGUE_PATH.Abundance: 4,
KEYWORDS_ROGUE_PATH.The_Hunt: 5,
KEYWORDS_ROGUE_PATH.Destruction: 6,
KEYWORDS_ROGUE_PATH.Elation: 7,
KEYWORDS_ROGUE_PATH.Propagation: 8,
}
return buttons
def _get_path_click(self, path: RoguePath) -> ButtonWrapper: def _get_path_click(self, path: RoguePath) -> ButtonWrapper:
buttons = self._rogue_path_clicks buttons = self._rogue_path_clicks
if ret := buttons.get(path): if ret := buttons.get(path):
@ -71,8 +89,7 @@ class RoguePathHandler(RogueUI):
path_click = min(paths, key=lambda p: abs(self._calculate_distance(p, path))) path_click = min(paths, key=lambda p: abs(self._calculate_distance(p, path)))
return buttons.get(path_click) return buttons.get(path_click)
@staticmethod def _calculate_distance(self, path_1: RoguePath, path_2: RoguePath):
def _calculate_distance(path_1: RoguePath, path_2: RoguePath):
""" """
click times from path1 to path2 click times from path1 to path2
@ -81,8 +98,12 @@ class RoguePathHandler(RogueUI):
negative value to click left, negative value to click left,
0 to be the same. 0 to be the same.
""" """
length = len(path_1.instances) try:
distance = path_1.id - path_2.id distance = self._rogue_paths[path_1] - self._rogue_paths[path_2]
except KeyError:
logger.error(f'Rogue path {path_1} {path_2} does not belongs to this rogue theme')
raise RequestHumanTakeover
length = len(self._rogue_paths)
left_times = distance % length left_times = distance % length
right_times = -distance % length right_times = -distance % length
if right_times <= left_times: if right_times <= left_times: