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

Upd: Update rogue routes

Browse Source
This commit is contained in:
LmeSzinc 2023-11-16 22:21:04 +08:00
parent ece55f2070
commit 914da3715f
16 changed files with 117 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/ocr/keyword.py
View File

@ -7,7 +7,7 @@ import module.config.server as server
from module.exception import ScriptError
# ord('．') = 65294
REGEX_PUNCTUATION = re.compile(r'[ ,.．\'"“”，。:：;；!！?？·•\-—－/\\\n\t()\[\]（）「」『』【】《》［］]')
REGEX_PUNCTUATION = re.compile(r'[ ,.．\'"“”，。:：;；!！?？·・•*※\-—－/\\\n\t()\[\]（）「」『』【】《》［］]')
def parse_name(n):

12
route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py
View File

@ -59,13 +59,13 @@ class Route(RouteBase):
self.clear_enemy(
enemy1left.set_threshold(5),
node2.set_threshold(5),
enemy2left.straight_run(),
enemy2right.straight_run(),
enemy2left,
enemy2right,
)
# 3
self.clear_enemy(
node3.set_threshold(5),
enemy3,
enemy3.straight_run(),
)
def Jarilo_CorridorofFadingEchoes_F1_X266Y457(self):
@ -170,9 +170,13 @@ class Route(RouteBase):
| item3 | Waypoint((562.4, 168.8)), | 157.2 | 154 |
| enemy3 | Waypoint((556.1, 192.5)), | 188.2 | 184 |
| exit_ | Waypoint((555.0, 204.8)), | 188.2 | 184 |
| exit1 | Waypoint((563.8, 212.2)), | 192.7 | 184 |
| exit2 | Waypoint((548.6, 212.1)), | 192.7 | 184 |
"""
self.map_init(plane=Jarilo_CorridorofFadingEchoes, floor="F1", position=(437.4, 122.9))
self.register_domain_exit(Waypoint((555.0, 204.8)), end_rotation=184)
self.register_domain_exit(
Waypoint((555.0, 204.8)), end_rotation=184,
left_door=Waypoint((563.8, 212.2)), right_door=Waypoint((548.6, 212.1)))
item1 = Waypoint((459.2, 117.0))
enemy1 = Waypoint((516.5, 123.4))
enemy2 = Waypoint((540.6, 122.4))

12
route/rogue/Combat/Jarilo_GreatMine_F1.py
View File

@ -171,9 +171,13 @@ class Route(RouteBase):
| item3 | Waypoint((460.3, 570.3)), | 193.0 | 188 |
| node4 | Waypoint((480.3, 575.6)), | 105.5 | 101 |
| exit_ | Waypoint((549.0, 515.6)), | 112.7 | 15 |
| exit1 | Waypoint((542.6, 502.6)), | 21.0 | 15 |
| exit2 | Waypoint((556.2, 509.4)), | 30.1 | 27 |
"""
self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(485.5, 450.4))
self.register_domain_exit(Waypoint((549.0, 515.6)), end_rotation=15)
self.register_domain_exit(
Waypoint((549.0, 515.6)), end_rotation=15,
left_door=Waypoint((542.6, 502.6)), right_door=Waypoint((556.2, 509.4)))
item1 = Waypoint((478.8, 484.8))
item2 = Waypoint((488.4, 522.0))
enemy3 = Waypoint((465.3, 531.1))
@ -210,9 +214,13 @@ class Route(RouteBase):
| node1 | Waypoint((478.5, 576.5)), | 237.2 | 237 |
| item1 | Waypoint((461.4, 572.2)), | 289.1 | 288 |
| exit_ | Waypoint((485.1, 456.8)), | 102.9 | 4 |
| exit1 | Waypoint((475.2, 449.0)), | 4.1 | 359 |
| exit2 | Waypoint((490.6, 449.2)), | 4.1 | 359 |
"""
self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(545.3, 513.0))
self.register_domain_exit(Waypoint((485.1, 456.8)), end_rotation=4)
self.register_domain_exit(
Waypoint((485.1, 456.8)), end_rotation=4,
left_door=Waypoint((475.2, 449.0)), right_door=Waypoint((490.6, 449.2)))
item2 = Waypoint((486.8, 523.6))
enemy2 = Waypoint((478.3, 519.6))
item3 = Waypoint((480.0, 490.2))

6
route/rogue/Combat/Jarilo_RivetTown_F1.py
View File

@ -201,9 +201,13 @@ class Route(RouteBase):
| item2 | Waypoint((240.4, 178.8)), | 276.0 | 274 |
| enemy2 | Waypoint((234.6, 204.8)), | 315.9 | 209 |
| exit_ | Waypoint((234.6, 204.8)), | 315.9 | 209 |
| exit1 | Waypoint((237.5, 216.3)), | 216.3 | 211 |
| exit2 | Waypoint((225.8, 210.0)), | 215.8 | 211 |
"""
self.map_init(plane=Jarilo_RivetTown, floor="F1", position=(323.4, 151.5))
self.register_domain_exit(Waypoint((234.6, 204.8)), end_rotation=209)
self.register_domain_exit(
Waypoint((234.6, 204.8)), end_rotation=209,
left_door=Waypoint((237.5, 216.3)), right_door=Waypoint((225.8, 210.0)))
item1 = Waypoint((298.4, 150.8))
enemy1 = Waypoint((260.2, 184.6))
item2 = Waypoint((240.4, 178.8))

6
route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py
View File

@ -204,9 +204,13 @@ class Route(RouteBase):
| item3 | Waypoint((536.4, 628.1)), | 210.2 | 204 |
| enemy4 | Waypoint((494.2, 611.8)), | 274.2 | 274 |
| exit_ | Waypoint((494.2, 611.8)), | 274.2 | 274 |
| exit1 | Waypoint((489.2, 617.2)), | 282.6 | 276 |
| exit2 | Waypoint((489.8, 606.2)), | 282.1 | 276 |
"""
self.map_init(plane=Jarilo_SilvermaneGuardRestrictedZone, floor="F1", position=(569.1, 495.0))
self.register_domain_exit(Waypoint((494.2, 611.8)), end_rotation=274)
self.register_domain_exit(
Waypoint((494.2, 611.8)), end_rotation=274,
left_door=Waypoint((489.2, 617.2)), right_door=Waypoint((489.8, 606.2)))
item1 = Waypoint((562.4, 528.4))
enemy1 = Waypoint((566.2, 572.0))
item2 = Waypoint((574.0, 583.2))

16
route/rogue/Combat/Luofu_Cloudford_F1.py
View File

@ -95,9 +95,13 @@ class Route(RouteBase):
| item | Waypoint((297.0, 841.4)), | 36.1 | 31 |
| enemy | Waypoint((282.4, 814.2)), | 8.1 | 1 |
| exit_ | Waypoint((284.5, 816.8)), | 5.7 | 1 |
| exit1 | Waypoint((276.2, 807.8)), | 4.4 | 4 |
| exit2 | Waypoint((290.4, 810.2)), | 4.3 | 4 |
"""
self.map_init(plane=Luofu_Cloudford, floor="F1", position=(281, 873))
self.register_domain_exit(Waypoint((284.5, 816.8)), end_rotation=1)
self.register_domain_exit(
Waypoint((284.5, 816.8)), end_rotation=1,
left_door=Waypoint((276.2, 807.8)), right_door=Waypoint((290.4, 810.2)))
item = Waypoint((297.0, 841.4))
enemy = Waypoint((282.4, 814.2))
# ===== End of generated waypoints =====
@ -117,9 +121,13 @@ class Route(RouteBase):
| item | Waypoint((297.0, 841.4)), | 36.1 | 31 |
| enemy | Waypoint((282.4, 814.2)), | 8.1 | 1 |
| exit_ | Waypoint((284.5, 816.8)), | 5.7 | 1 |
| exit1 | Waypoint((276.2, 807.8)), | 4.4 | 4 |
| exit2 | Waypoint((290.4, 810.2)), | 4.3 | 4 |
"""
self.map_init(plane=Luofu_Cloudford, floor="F1", position=(283.4, 865.3))
self.register_domain_exit(Waypoint((284.5, 816.8)), end_rotation=1)
self.register_domain_exit(
Waypoint((284.5, 816.8)), end_rotation=1,
left_door=Waypoint((276.2, 807.8)), right_door=Waypoint((290.4, 810.2)))
item = Waypoint((297.0, 841.4))
enemy = Waypoint((282.4, 814.2))
# ===== End of generated waypoints =====
@ -169,7 +177,7 @@ class Route(RouteBase):
| node3 | Waypoint((366.6, 588.2)), | 274.2 | 274 |
| enemy3 | Waypoint((344.9, 590.4)), | 191.8 | 357 |
| item4 | Waypoint((309.6, 580.2)), | 290.1 | 281 |
| enemy4 | Waypoint((269.3, 549.6)), | 275.8 | 278 |
| enemy4 | Waypoint((271.3, 585.5)), | 285.0 | 274 |
| exit_ | Waypoint((271.3, 585.5)), | 285.0 | 274 |
| exit1 | Waypoint((267.9, 592.3)), | 275.9 | 274 |
| exit2 | Waypoint((267.8, 580.0)), | 275.8 | 274 |
@ -184,7 +192,7 @@ class Route(RouteBase):
node3 = Waypoint((366.6, 588.2))
enemy3 = Waypoint((344.9, 590.4))
item4 = Waypoint((309.6, 580.2))
enemy4 = Waypoint((269.3, 549.6))
enemy4 = Waypoint((271.3, 585.5))
# ===== End of generated waypoints =====
self.clear_item(item1)

14
route/rogue/Combat/Luofu_Cloudford_F2.py
View File

@ -29,12 +29,18 @@ class Route(RouteBase):
# ===== End of generated waypoints =====
self.clear_enemy(enemy1)
# Ignore enemy2
# Enemy2
self.clear_enemy(
node2left,
node2right.straight_run(),
enemy3.straight_run(),
)
# Possible enemy 3
if self.minimap.position_diff(enemy3.position) > 50:
self.clear_enemy(
node2right.straight_run(),
enemy3.straight_run(),
)
def Luofu_Cloudford_F2_X425Y171(self):
"""
@ -48,9 +54,13 @@ class Route(RouteBase):
| item3 | Waypoint((382.4, 275.3)), | 250.8 | 251 |
| enemy3 | Waypoint((318.8, 267.0)), | 279.8 | 281 |
| exit_ | Waypoint((324.8, 268.5)), | 283.0 | 278 |
| exit1 | Waypoint((312.6, 276.0)), | 284.8 | 283 |
| exit2 | Waypoint((313.2, 259.0)), | 177.5 | 271 |
"""
self.map_init(plane=Luofu_Cloudford, floor="F2", position=(425.5, 171.6))
self.register_domain_exit(Waypoint((324.8, 268.5)), end_rotation=278)
self.register_domain_exit(
Waypoint((324.8, 268.5)), end_rotation=278,
left_door=Waypoint((312.6, 276.0)), right_door=Waypoint((313.2, 259.0)))
item1 = Waypoint((436.8, 203.6))
item2 = Waypoint((407.1, 205.3))
enemy2left = Waypoint((426.6, 252.0))

6
route/rogue/Combat/Luofu_StargazerNavalia_F2.py
View File

@ -16,9 +16,13 @@ class Route(RouteBase):
| node3 | Waypoint((618.0, 182.4)), | 274.2 | 105 |
| enemy3 | Waypoint((622.2, 170.0)), | 284.7 | 94 |
| exit_ | Waypoint((619.5, 169.4)), | 193.0 | 6 |
| exit1 | Waypoint((612.2, 160.4)), | 12.7 | 6 |
| exit2 | Waypoint((628.2, 160.4)), | 12.7 | 8 |
"""
self.map_init(plane=Luofu_StargazerNavalia, floor="F2", position=(479.5, 187.5))
self.register_domain_exit(Waypoint((619.5, 169.4)), end_rotation=6)
self.register_domain_exit(
Waypoint((619.5, 169.4)), end_rotation=6,
left_door=Waypoint((612.2, 160.4)), right_door=Waypoint((628.2, 160.4)))
item1 = Waypoint((516.4, 194.2))
enemy1 = Waypoint((538.2, 182.6))
enemy2 = Waypoint((572.4, 180.2))

6
route/rogue/Occurrence/Herta_StorageZone_F1.py
View File

@ -12,9 +12,13 @@ class Route(RouteBase):
| spawn | Waypoint((273.5, 93.2)), | 308.0 | 304 |
| event | Waypoint((238.4, 64.8)), | 324.9 | 311 |
| exit_ | Waypoint((227.8, 69.5)), | 30.2 | 299 |
| exit1 | Waypoint((218.2, 74.8)), | 303.8 | 301 |
| exit2 | Waypoint((225.8, 60.2)), | 303.8 | 301 |
"""
self.map_init(plane=Herta_StorageZone, floor="F1", position=(273.5, 93.2))
self.register_domain_exit(Waypoint((227.8, 69.5)), end_rotation=299)
self.register_domain_exit(
Waypoint((227.8, 69.5)), end_rotation=299,
left_door=Waypoint((218.2, 74.8)), right_door=Waypoint((225.8, 60.2)))
event = Waypoint((238.4, 64.8))
self.clear_event(event)

24
route/rogue/Occurrence/Herta_SupplyZone_F2Rogue.py
View File

@ -78,9 +78,13 @@ class Route(RouteBase):
| spawn | Waypoint((397.4, 223.3)), | 6.7 | 4 |
| event | Waypoint((404.5, 182.1)), | 26.8 | 24 |
| exit_ | Waypoint((398.6, 173.0)), | 4.2 | 1 |
| exit1 | Waypoint((391.4, 170.9)), | 11.2 | 8 |
| exit2 | Waypoint((402.4, 170.0)), | 11.2 | 11 |
"""
self.map_init(plane=Herta_SupplyZone, floor="F2Rogue", position=(397.4, 223.3))
self.register_domain_exit(Waypoint((398.6, 173.0)), end_rotation=1)
self.register_domain_exit(
Waypoint((398.6, 173.0)), end_rotation=1,
left_door=Waypoint((391.4, 170.9)), right_door=Waypoint((402.4, 170.0)))
event = Waypoint((404.5, 182.1))
self.clear_event(event)
@ -93,9 +97,13 @@ class Route(RouteBase):
| spawn | Waypoint((397.4, 223.3)), | 6.7 | 4 |
| event | Waypoint((404.5, 182.1)), | 26.8 | 24 |
| exit_ | Waypoint((398.6, 173.0)), | 4.2 | 1 |
| exit1 | Waypoint((391.4, 170.9)), | 11.2 | 8 |
| exit2 | Waypoint((402.4, 170.0)), | 11.2 | 11 |
"""
self.map_init(plane=Herta_SupplyZone, floor="F2Rogue", position=(397.4, 227))
self.register_domain_exit(Waypoint((398.6, 173.0)), end_rotation=1)
self.register_domain_exit(
Waypoint((398.6, 173.0)), end_rotation=1,
left_door=Waypoint((391.4, 170.9)), right_door=Waypoint((402.4, 170.0)))
event = Waypoint((404.5, 182.1))
self.clear_event(event)
@ -114,9 +122,13 @@ class Route(RouteBase):
| spawn | Waypoint((397.4, 223.3)), | 6.7 | 4 |
| event | Waypoint((404.5, 182.1)), | 26.8 | 24 |
| exit_ | Waypoint((398.6, 173.0)), | 4.2 | 1 |
| exit1 | Waypoint((391.4, 170.9)), | 11.2 | 8 |
| exit2 | Waypoint((402.4, 170.0)), | 11.2 | 11 |
"""
self.map_init(plane=Herta_SupplyZone, floor="F2Rogue", position=(397.4, 230))
self.register_domain_exit(Waypoint((398.6, 173.0)), end_rotation=1)
self.register_domain_exit(
Waypoint((398.6, 173.0)), end_rotation=1,
left_door=Waypoint((391.4, 170.9)), right_door=Waypoint((402.4, 170.0)))
event = Waypoint((404.5, 182.1))
self.clear_event(event)
@ -135,9 +147,13 @@ class Route(RouteBase):
| spawn | Waypoint((397.4, 223.3)), | 6.7 | 4 |
| event | Waypoint((404.5, 182.1)), | 26.8 | 24 |
| exit_ | Waypoint((398.6, 173.0)), | 4.2 | 1 |
| exit1 | Waypoint((391.4, 170.9)), | 11.2 | 8 |
| exit2 | Waypoint((402.4, 170.0)), | 11.2 | 11 |
"""
self.map_init(plane=Herta_SupplyZone, floor="F2Rogue", position=(397.4, 235))
self.register_domain_exit(Waypoint((398.6, 173.0)), end_rotation=1)
self.register_domain_exit(
Waypoint((398.6, 173.0)), end_rotation=1,
left_door=Waypoint((391.4, 170.9)), right_door=Waypoint((402.4, 170.0)))
event = Waypoint((404.5, 182.1))
self.clear_event(event)

6
route/rogue/Occurrence/Jarilo_GreatMine_F1RogueOcc.py
View File

@ -13,9 +13,13 @@ class Route(RouteBase):
| item | Waypoint((93.3, 399.2)), | 327.8 | 324 |
| event | Waypoint((96.2, 382.0)), | 354.1 | 350 |
| exit_ | Waypoint((85.9, 381.5)), | 334.8 | 331 |
| exit1 | Waypoint((74.8, 379.4)), | 334.8 | 334 |
| exit2 | Waypoint((90.9, 370.5)), | 334.8 | 334 |
"""
self.map_init(plane=Jarilo_GreatMine, floor="F1RogueOcc", position=(109.3, 422.9))
self.register_domain_exit(Waypoint((85.9, 381.5)), end_rotation=331)
self.register_domain_exit(
Waypoint((85.9, 381.5)), end_rotation=331,
left_door=Waypoint((74.8, 379.4)), right_door=Waypoint((90.9, 370.5)))
item = Waypoint((93.3, 399.2))
event = Waypoint((96.2, 382.0))

6
route/rogue/Occurrence/Jarilo_RivetTown_F1.py
View File

@ -12,9 +12,13 @@ class Route(RouteBase):
| spawn | Waypoint((157.4, 435.5)), | 96.7 | 91 |
| event | Waypoint((200.4, 426.5)), | 76.4 | 73 |
| exit_ | Waypoint((211.2, 435.4)), | 96.7 | 91 |
| exit1 | Waypoint((216.4, 428.6)), | 97.9 | 91 |
| exit2 | Waypoint((218.0, 442.4)), | 101.1 | 91 |
"""
self.map_init(plane=Jarilo_RivetTown, floor="F1", position=(157.4, 435.5))
self.register_domain_exit(Waypoint((211.2, 435.4)), end_rotation=91)
self.register_domain_exit(
Waypoint((211.2, 435.4)), end_rotation=91,
left_door=Waypoint((216.4, 428.6)), right_door=Waypoint((218.0, 442.4)))
event = Waypoint((200.4, 426.5))
self.clear_event(event)

6
route/rogue/Occurrence/Jarilo_SilvermaneGuardRestrictedZone_F1.py
View File

@ -31,9 +31,13 @@ class Route(RouteBase):
| item | Waypoint((440.8, 215.2)), | 15.6 | 11 |
| event | Waypoint((434.8, 192.4)), | 355.9 | 359 |
| exit_ | Waypoint((428.6, 190.4)), | 76.4 | 338 |
| exit1 | Waypoint((416.8, 184.4)), | 337.5 | 334 |
| exit2 | Waypoint((428.8, 180.4)), | 339.1 | 336 |
"""
self.map_init(plane=Jarilo_SilvermaneGuardRestrictedZone, floor="F1", position=(439.3, 237.1))
self.register_domain_exit(Waypoint((428.6, 190.4)), end_rotation=338)
self.register_domain_exit(
Waypoint((428.6, 190.4)), end_rotation=338,
left_door=Waypoint((416.8, 184.4)), right_door=Waypoint((428.8, 180.4)))
item = Waypoint((440.8, 215.2))
event = Waypoint((434.8, 192.4))

12
route/rogue/Occurrence/Luofu_Cloudford_F1.py
View File

@ -32,9 +32,13 @@ class Route(RouteBase):
| item | Waypoint((272.2, 840.2)), | 332.7 | 327 |
| event | Waypoint((291.8, 822.2)), | 26.8 | 22 |
| exit_ | Waypoint((285.3, 818.1)), | 99.0 | 1 |
| exit1 | Waypoint((276.2, 807.8)), | 4.4 | 4 |
| exit2 | Waypoint((290.4, 810.2)), | 4.3 | 4 |
"""
self.map_init(plane=Luofu_Cloudford, floor="F1", position=(281, 873))
self.register_domain_exit(Waypoint((285.3, 818.1)), end_rotation=1)
self.register_domain_exit(
Waypoint((285.3, 818.1)), end_rotation=1,
left_door=Waypoint((276.2, 807.8)), right_door=Waypoint((290.4, 810.2)))
item = Waypoint((272.2, 840.2))
event = Waypoint((291.8, 822.2))
@ -56,9 +60,13 @@ class Route(RouteBase):
| item | Waypoint((272.2, 840.2)), | 332.7 | 327 |
| event | Waypoint((291.8, 822.2)), | 26.8 | 22 |
| exit_ | Waypoint((285.3, 818.1)), | 99.0 | 1 |
| exit1 | Waypoint((276.2, 807.8)), | 4.4 | 4 |
| exit2 | Waypoint((290.4, 810.2)), | 4.3 | 4 |
"""
self.map_init(plane=Luofu_Cloudford, floor="F1", position=(283.2, 865.2))
self.register_domain_exit(Waypoint((285.3, 818.1)), end_rotation=1)
self.register_domain_exit(
Waypoint((285.3, 818.1)), end_rotation=1,
left_door=Waypoint((276.2, 807.8)), right_door=Waypoint((290.4, 810.2)))
item = Waypoint((272.2, 840.2))
event = Waypoint((291.8, 822.2))

4
tasks/rogue/event/event.py
View File

@ -95,12 +95,12 @@ class OcrRogueEventOption(OcrRogueEvent):
(KEYWORDS_ROGUE_EVENT_OPTION.Wait_for_them, '^等待.*'),
(KEYWORDS_ROGUE_EVENT_OPTION.Choose_number_two_It_snores_like_Andatur_Zazzalo, '.*二号.*安达.*'),
(KEYWORDS_ROGUE_EVENT_OPTION.Choose_number_three_Its_teeth_are_rusted, '.*三号.*牙齿.*'),
(KEYWORDS_ROGUE_EVENT_OPTION.Believe_in_them_with_pure_devotion, '虔诚信仰'),
],
'en': [
(KEYWORDS_ROGUE_EVENT_OPTION.Deposit_2_Cosmic_Fragments, 'Deposit \d+.*'),
(KEYWORDS_ROGUE_EVENT_OPTION.Withdraw_2_Cosmic_Fragments, 'Withdraw \d+.*'),
(KEYWORDS_ROGUE_EVENT_OPTION.Record_of_the_Aeon_of_1,
'^Record of the Aeon.*'),
(KEYWORDS_ROGUE_EVENT_OPTION.Record_of_the_Aeon_of_1, '^Record of the Aeon.*'),
]
}

7
tasks/rogue/route/loader.py
View File

@ -163,6 +163,13 @@ class RouteLoader(RogueUI, MinimapWrapper, RouteLoader_, CharacterSwitch):
# ('Occurrence_Herta_StorageZone_F2_X363Y166', 0.094, (363.0, 166.8))]
if route.name == 'Occurrence_Herta_StorageZone_F2_X363Y166' and similarity > 0.05:
return True
# INFO 21:27:00.816 │ Best 3 nearby predictions: [
# ('Combat_Herta_SupplyZone_F2_X45Y369', 0.184, (41.0, 369.1)),
# ('Combat_Luofu_Cloudford_F1_X281Y873', 0.149, (281.8, 869.6)),
# ('Combat_Luofu_Cloudford_F1_X283Y865', 0.149, (281.8, 869.6))]
if route.name in ['Combat_Luofu_Cloudford_F1_X283Y865', 'Occurrence_Luofu_Cloudford_F1_X283Y865'] \
and similarity > 0.1:
return True
return False
def position_find_bruteforce(self, image) -> Minimap: