From eefc68f876856ac719a10f9b39ba5215050d549d Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 17 Nov 2023 01:32:32 +0800 Subject: [PATCH] Upd: Rogue routes --- dev_tools/route_extract.py | 3 +- route/rogue/Combat/Jarilo_BackwaterPass_F1.py | 50 ++-- .../Jarilo_CorridorofFadingEchoes_F1.py | 8 +- ...Jarilo_SilvermaneGuardRestrictedZone_F1.py | 9 +- .../Combat/Luofu_AlchemyCommission_F1.py | 25 ++ .../Combat/Luofu_AlchemyCommission_F2.py | 65 +++++ .../Combat/Luofu_ArtisanshipCommission_F1.py | 75 +++++ .../Combat/Luofu_DivinationCommission_F1.py | 84 ++++++ .../Combat/Luofu_DivinationCommission_F2.py | 40 +++ .../rogue/Combat/Luofu_StargazerNavalia_F1.py | 9 +- .../rogue/Combat/Luofu_StargazerNavalia_F2.py | 6 +- .../rogue/Elite/Luofu_AlchemyCommission_F2.py | 26 ++ .../Elite/Luofu_ArtisanshipCommission_F1.py | 19 ++ .../Elite/Luofu_DivinationCommission_F2.py | 25 ++ .../Occurrence/Jarilo_BackwaterPass_F1.py | 6 +- .../Occurrence/Luofu_AlchemyCommission_F2.py | 61 ++++ .../Luofu_DivinationCommission_F2.py | 55 ++++ .../Occurrence/Luofu_StargazerNavalia_F2.py | 2 + .../Respite/Luofu_AlchemyCommission_F2.py | 46 +++ .../Respite/Luofu_DivinationCommission_F2.py | 25 ++ route/rogue/route.json | 264 ++++++++++++++++++ tasks/rogue/route/loader.py | 4 +- 22 files changed, 876 insertions(+), 31 deletions(-) create mode 100644 route/rogue/Combat/Luofu_AlchemyCommission_F1.py create mode 100644 route/rogue/Combat/Luofu_AlchemyCommission_F2.py create mode 100644 route/rogue/Combat/Luofu_DivinationCommission_F1.py create mode 100644 route/rogue/Combat/Luofu_DivinationCommission_F2.py create mode 100644 route/rogue/Elite/Luofu_AlchemyCommission_F2.py create mode 100644 route/rogue/Elite/Luofu_DivinationCommission_F2.py create mode 100644 route/rogue/Occurrence/Luofu_AlchemyCommission_F2.py create mode 100644 route/rogue/Occurrence/Luofu_DivinationCommission_F2.py create mode 100644 route/rogue/Respite/Luofu_AlchemyCommission_F2.py create mode 100644 route/rogue/Respite/Luofu_DivinationCommission_F2.py diff --git a/dev_tools/route_extract.py b/dev_tools/route_extract.py index fe1fe7cd5..485414aa3 100644 --- a/dev_tools/route_extract.py +++ b/dev_tools/route_extract.py @@ -286,7 +286,8 @@ class RouteDetect: exit1: RogueWaypointModel = waypoints.select(is_exit1=True).first_or_none() exit2: RogueWaypointModel = waypoints.select(is_exit2=True).first_or_none() if spawn is None or exit_ is None: - return + print(f'WARNING | No spawn point or no exit: {waypoints}') + return '' class WaypointRepr: def __init__(self, position): diff --git a/route/rogue/Combat/Jarilo_BackwaterPass_F1.py b/route/rogue/Combat/Jarilo_BackwaterPass_F1.py index cd086a32e..4dcf89e09 100644 --- a/route/rogue/Combat/Jarilo_BackwaterPass_F1.py +++ b/route/rogue/Combat/Jarilo_BackwaterPass_F1.py @@ -32,37 +32,43 @@ class Route(RouteBase): def Jarilo_BackwaterPass_F1_X475Y49(self): """ - | Waypoint | Position | Direction | Rotation | - | -------- | ------------------------- | --------- | -------- | - | spawn | Waypoint((475.2, 49.5)), | 190.1 | 184 | - | item1 | Waypoint((468.4, 77.7)), | 203.1 | 200 | - | enemy1 | Waypoint((475.6, 99.4)), | 30.1 | 184 | - | item2 | Waypoint((448.4, 116.3)), | 245.9 | 248 | - | enemy2 | Waypoint((464.2, 168.0)), | 166.8 | 341 | - | enemy3 | Waypoint((500.9, 202.8)), | 135.8 | 133 | - | exit_ | Waypoint((500.9, 202.8)), | 135.8 | 133 | + | Waypoint | Position | Direction | Rotation | + | ----------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((475.2, 49.5)), | 190.1 | 184 | + | enemy1left | Waypoint((475.6, 99.4)), | 30.1 | 184 | + | enemy1right | Waypoint((451.5, 103.2)), | 277.2 | 274 | + | node2 | Waypoint((456.2, 110.4)), | 290.2 | 186 | + | enemy2 | Waypoint((464.2, 168.0)), | 166.8 | 341 | + | enemy3 | Waypoint((500.9, 202.8)), | 135.8 | 133 | + | exit_ | Waypoint((500.9, 202.8)), | 135.8 | 133 | + | exit1 | Waypoint((511.2, 201.2)), | 148.4 | 140 | + | exit2 | Waypoint((501.0, 212.0)), | 148.8 | 140 | """ self.map_init(plane=Jarilo_BackwaterPass, floor="F1", position=(475.2, 49.5)) - self.register_domain_exit(Waypoint((500.9, 202.8)), end_rotation=133) - item1 = Waypoint((468.4, 77.7)) - enemy1 = Waypoint((475.6, 99.4)) - item2 = Waypoint((448.4, 116.3)) + self.register_domain_exit( + Waypoint((500.9, 202.8)), end_rotation=133, + left_door=Waypoint((511.2, 201.2)), right_door=Waypoint((501.0, 212.0))) + enemy1left = Waypoint((475.6, 99.4)) + enemy1right = Waypoint((451.5, 103.2)) + node2 = Waypoint((456.2, 110.4)) enemy2 = Waypoint((464.2, 168.0)) enemy3 = Waypoint((500.9, 202.8)) # ===== End of generated waypoints ===== # 1 - self.clear_item(item1) - self.clear_enemy(enemy1) - # 2 - self.clear_item( - item2.straight_run(), - ) + self.rotation_set(225) self.clear_enemy( + enemy1left, + enemy1right, + ) + # 2 + self.clear_enemy( + node2, enemy2.straight_run(), ) # 3 self.clear_enemy( + enemy2, enemy3.straight_run(), ) @@ -179,9 +185,13 @@ class Route(RouteBase): | spawn | Waypoint((595.5, 681.5)), | 96.7 | 91 | | enemy | Waypoint((631.8, 705.4)), | 134.2 | 91 | | exit_ | Waypoint((635.5, 706.9)), | 129.9 | 126 | + | exit1 | Waypoint((647.4, 705.3)), | 119.8 | 121 | + | exit2 | Waypoint((639.3, 715.4)), | 135.8 | 131 | """ self.map_init(plane=Jarilo_BackwaterPass, floor="F1", position=(595.5, 681.5)) - self.register_domain_exit(Waypoint((635.5, 706.9)), end_rotation=126) + self.register_domain_exit( + Waypoint((635.5, 706.9)), end_rotation=126, + left_door=Waypoint((647.4, 705.3)), right_door=Waypoint((639.3, 715.4))) enemy = Waypoint((631.8, 705.4)) # ===== End of generated waypoints ===== diff --git a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py index 7f45b8bb2..226528566 100644 --- a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py +++ b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py @@ -75,9 +75,13 @@ class Route(RouteBase): | spawn | Waypoint((267.0, 457.2)), | 274.2 | 274 | | enemy | Waypoint((220.2, 457.6)), | 185.8 | 274 | | exit_ | Waypoint((208.6, 458.6)), | 274.2 | 276 | + | exit1 | Waypoint((204.6, 466.8)), | 282.0 | 274 | + | exit2 | Waypoint((204.2, 450.0)), | 282.1 | 274 | """ self.map_init(plane=Jarilo_CorridorofFadingEchoes, floor="F1", position=(267.0, 457.2)) - self.register_domain_exit(Waypoint((208.6, 458.6)), end_rotation=276) + self.register_domain_exit( + Waypoint((208.6, 458.6)), end_rotation=276, + left_door=Waypoint((204.6, 466.8)), right_door=Waypoint((204.2, 450.0))) enemy = Waypoint((220.2, 457.6)) # ===== End of generated waypoints ===== @@ -152,7 +156,7 @@ class Route(RouteBase): enemy2left.straight_run().set_threshold(5), ) self.clear_enemy( - enemy2left.straight_run().set_threshold(5), + enemy2left.set_threshold(5), node3.straight_run(), node4.straight_run(), enemy4.straight_run(), diff --git a/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py b/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py index 1fbef54ae..34c1a94e5 100644 --- a/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py +++ b/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py @@ -36,11 +36,10 @@ class Route(RouteBase): self.clear_enemy(enemy1) self.clear_item(item2) # Go through trench gaps, a moving enemy in it - self.clear_enemy( + self.goto( node2.set_threshold(3), node3.set_threshold(3), ) - self.clear_item(item3) self.clear_enemy(enemy3) def Jarilo_SilvermaneGuardRestrictedZone_F1_X221Y426(self): @@ -69,9 +68,13 @@ class Route(RouteBase): | item | Waypoint((208.3, 414.8)), | 303.8 | 301 | | enemy | Waypoint((170.2, 426.2)), | 274.2 | 274 | | exit_ | Waypoint((170.2, 426.2)), | 274.2 | 274 | + | exit1 | Waypoint((158.5, 432.5)), | 282.0 | 274 | + | exit2 | Waypoint((158.8, 418.6)), | 282.0 | 274 | """ self.map_init(plane=Jarilo_SilvermaneGuardRestrictedZone, floor="F1", position=(227.7, 425.5)) - self.register_domain_exit(Waypoint((170.2, 426.2)), end_rotation=274) + self.register_domain_exit( + Waypoint((170.2, 426.2)), end_rotation=274, + left_door=Waypoint((158.5, 432.5)), right_door=Waypoint((158.8, 418.6))) item = Waypoint((208.3, 414.8)) enemy = Waypoint((170.2, 426.2)) # ===== End of generated waypoints ===== diff --git a/route/rogue/Combat/Luofu_AlchemyCommission_F1.py b/route/rogue/Combat/Luofu_AlchemyCommission_F1.py new file mode 100644 index 000000000..b2a5e3b9b --- /dev/null +++ b/route/rogue/Combat/Luofu_AlchemyCommission_F1.py @@ -0,0 +1,25 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_AlchemyCommission +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_AlchemyCommission_F1_X301Y441(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((301.6, 441.5)), | 282.2 | 274 | + | enemy | Waypoint((248.6, 441.0)), | 282.0 | 274 | + | exit_ | Waypoint((248.6, 441.0)), | 282.0 | 274 | + | exit1 | Waypoint((235.8, 448.9)), | 282.0 | 274 | + | exit2 | Waypoint((239.4, 432.2)), | 282.1 | 274 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F1", position=(301.6, 441.5)) + self.register_domain_exit( + Waypoint((248.6, 441.0)), end_rotation=274, + left_door=Waypoint((235.8, 448.9)), right_door=Waypoint((239.4, 432.2))) + enemy = Waypoint((248.6, 441.0)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy) diff --git a/route/rogue/Combat/Luofu_AlchemyCommission_F2.py b/route/rogue/Combat/Luofu_AlchemyCommission_F2.py new file mode 100644 index 000000000..83eaa430d --- /dev/null +++ b/route/rogue/Combat/Luofu_AlchemyCommission_F2.py @@ -0,0 +1,65 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_AlchemyCommission +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_AlchemyCommission_F2_X415Y589(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((415.5, 589.4)), | 94.2 | 91 | + | enemy | Waypoint((469.2, 591.0)), | 189.1 | 89 | + | exit_ | Waypoint((469.2, 591.0)), | 189.1 | 89 | + | exit1 | Waypoint((478.2, 580.4)), | 97.0 | 89 | + | exit2 | Waypoint((478.1, 598.6)), | 97.9 | 89 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(415.5, 589.4)) + self.register_domain_exit( + Waypoint((469.2, 591.0)), end_rotation=89, + left_door=Waypoint((478.2, 580.4)), right_door=Waypoint((478.1, 598.6))) + enemy = Waypoint((469.2, 591.0)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy) + + def Luofu_AlchemyCommission_F2_X447Y508(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((447.4, 508.1)), | 59.1 | 48 | + | enemy | Waypoint((494.8, 461.2)), | 149.0 | 48 | + | exit_ | Waypoint((494.8, 461.2)), | 149.0 | 48 | + | exit1 | Waypoint((494.0, 448.0)), | 59.1 | 48 | + | exit2 | Waypoint((506.8, 460.8)), | 59.1 | 48 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(447.4, 508.1)) + self.register_domain_exit( + Waypoint((494.8, 461.2)), end_rotation=48, + left_door=Waypoint((494.0, 448.0)), right_door=Waypoint((506.8, 460.8))) + enemy = Waypoint((494.8, 461.2)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy) + + def Luofu_AlchemyCommission_F2_X457Y497(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((447.4, 508.1)), | 59.1 | 48 | + | enemy | Waypoint((494.8, 461.2)), | 149.0 | 48 | + | exit_ | Waypoint((494.8, 461.2)), | 149.0 | 48 | + | exit1 | Waypoint((494.0, 448.0)), | 59.1 | 48 | + | exit2 | Waypoint((506.8, 460.8)), | 59.1 | 48 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(457, 497)) + self.register_domain_exit( + Waypoint((494.8, 461.2)), end_rotation=48, + left_door=Waypoint((494.0, 448.0)), right_door=Waypoint((506.8, 460.8))) + enemy = Waypoint((494.8, 461.2)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy) + + # Same as Luofu_AlchemyCommission_F2_X447Y508 diff --git a/route/rogue/Combat/Luofu_ArtisanshipCommission_F1.py b/route/rogue/Combat/Luofu_ArtisanshipCommission_F1.py index ee5c0d506..fabc8536a 100644 --- a/route/rogue/Combat/Luofu_ArtisanshipCommission_F1.py +++ b/route/rogue/Combat/Luofu_ArtisanshipCommission_F1.py @@ -6,6 +6,29 @@ from tasks.rogue.route.base import RouteBase class Route(RouteBase): + def Luofu_ArtisanshipCommission_F1_X41Y640(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------ | --------- | -------- | + | spawn | Waypoint((41.4, 639.9)), | 4.5 | 4 | + | enemy1 | Waypoint((40.2, 576.2)), | 4.3 | 4 | + | enemy2 | Waypoint((34.3, 494.4)), | 192.7 | 1 | + | exit_ | Waypoint((34.3, 494.4)), | 192.7 | 1 | + | exit1 | Waypoint((22.3, 486.2)), | 8.2 | 1 | + | exit2 | Waypoint((41.2, 485.2)), | 4.3 | 1 | + """ + self.map_init(plane=Luofu_ArtisanshipCommission, floor="F1", position=(41.4, 639.9)) + self.register_domain_exit( + Waypoint((34.3, 494.4)), end_rotation=1, + left_door=Waypoint((22.3, 486.2)), right_door=Waypoint((41.2, 485.2))) + enemy1 = Waypoint((40.2, 576.2)) + enemy2 = Waypoint((34.3, 494.4)) + # ===== End of generated waypoints ===== + + self.minimap.lock_rotation(0) + self.clear_enemy(enemy1) + self.clear_enemy(enemy2) + @locked_position def Luofu_ArtisanshipCommission_F1_X185Y361(self): """ @@ -52,6 +75,58 @@ class Route(RouteBase): self.clear_item(item) self.clear_enemy(enemy) + def Luofu_ArtisanshipCommission_F1_X473Y920(self): + """ + | Waypoint | Position | Direction | Rotation | + | ----------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((473.5, 920.9)), | 4.5 | 4 | + | enemy1left | Waypoint((475.0, 848.4)), | 4.4 | 4 | + | enemy2right | Waypoint((493.5, 807.4)), | 157.1 | 48 | + | enemy3 | Waypoint((528.9, 782.9)), | 198.5 | 91 | + | exit_ | Waypoint((528.9, 782.9)), | 198.5 | 91 | + | exit1 | Waypoint((537.0, 773.2)), | 99.0 | 89 | + | exit2 | Waypoint((537.5, 790.6)), | 101.1 | 91 | + """ + self.map_init(plane=Luofu_ArtisanshipCommission, floor="F1", position=(473.5, 920.9)) + self.register_domain_exit( + Waypoint((528.9, 782.9)), end_rotation=91, + left_door=Waypoint((537.0, 773.2)), right_door=Waypoint((537.5, 790.6))) + enemy1left = Waypoint((475.0, 848.4)) + enemy2right = Waypoint((493.5, 807.4)) + enemy3 = Waypoint((528.9, 782.9)) + # ===== End of generated waypoints ===== + + self.rotation_set(30) + self.clear_enemy( + enemy1left, + enemy2right, + ) + self.clear_enemy(enemy3) + if self.minimap.position_diff(enemy3.position) > 25: + self.clear_enemy(enemy3) + + def Luofu_ArtisanshipCommission_F1_X543Y269(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((543.3, 269.6)), | 94.2 | 91 | + | enemy1 | Waypoint((619.2, 268.0)), | 45.8 | 91 | + | enemy2 | Waypoint((654.6, 266.6)), | 282.7 | 87 | + | exit_ | Waypoint((654.6, 266.6)), | 282.7 | 87 | + | exit1 | Waypoint((664.6, 258.5)), | 96.8 | 87 | + | exit2 | Waypoint((665.0, 274.4)), | 96.8 | 87 | + """ + self.map_init(plane=Luofu_ArtisanshipCommission, floor="F1", position=(543.3, 269.6)) + self.register_domain_exit( + Waypoint((654.6, 266.6)), end_rotation=87, + left_door=Waypoint((664.6, 258.5)), right_door=Waypoint((665.0, 274.4))) + enemy1 = Waypoint((619.2, 268.0)) + enemy2 = Waypoint((654.6, 266.6)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy1) + self.clear_enemy(enemy2) + def Luofu_ArtisanshipCommission_F1_X655Y537(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Combat/Luofu_DivinationCommission_F1.py b/route/rogue/Combat/Luofu_DivinationCommission_F1.py new file mode 100644 index 000000000..bb99d8e7b --- /dev/null +++ b/route/rogue/Combat/Luofu_DivinationCommission_F1.py @@ -0,0 +1,84 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_DivinationCommission +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_DivinationCommission_F1_X63Y303(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------ | --------- | -------- | + | spawn | Waypoint((63.7, 303.4)), | 4.5 | 4 | + | item | Waypoint((53.1, 268.1)), | 356.3 | 354 | + | enemy1 | Waypoint((65.3, 245.4)), | 157.1 | 24 | + | enemy2 | Waypoint((64.4, 220.2)), | 6.8 | 1 | + | exit_ | Waypoint((64.4, 220.2)), | 6.8 | 1 | + | exit1 | Waypoint((55.2, 212.8)), | 4.1 | 1 | + | exit2 | Waypoint((73.2, 213.3)), | 6.9 | 1 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F1", position=(63.7, 303.4)) + self.register_domain_exit( + Waypoint((64.4, 220.2)), end_rotation=1, + left_door=Waypoint((55.2, 212.8)), right_door=Waypoint((73.2, 213.3))) + item = Waypoint((53.1, 268.1)) + enemy1 = Waypoint((65.3, 245.4)) + enemy2 = Waypoint((64.4, 220.2)) + # ===== End of generated waypoints ===== + + self.minimap.lock_rotation(0) + self.clear_item(item) + self.clear_enemy( + item.set_threshold(7), + enemy1, + ) + self.clear_enemy( + enemy1.set_threshold(5), + enemy2, + ) + + def Luofu_DivinationCommission_F1_X97Y457(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((97.2, 456.9)), | 192.6 | 184 | + | enemy1 | Waypoint((104.6, 502.8)), | 185.7 | 168 | + | enemy2 | Waypoint((126.6, 528.0)), | 48.1 | 140 | + | exit_ | Waypoint((126.6, 528.0)), | 48.1 | 140 | + | exit1 | Waypoint((137.5, 527.4)), | 137.7 | 140 | + | exit2 | Waypoint((125.1, 540.0)), | 135.9 | 140 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F1", position=(97.2, 456.9)) + self.register_domain_exit( + Waypoint((126.6, 528.0)), end_rotation=140, + left_door=Waypoint((137.5, 527.4)), right_door=Waypoint((125.1, 540.0))) + enemy1 = Waypoint((104.6, 502.8)) + enemy2 = Waypoint((126.6, 528.0)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy1) + self.clear_enemy( + enemy2.straight_run(), + ) + + def Luofu_DivinationCommission_F1_X737Y372(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((737.4, 372.2)), | 4.5 | 4 | + | enemy1 | Waypoint((738.3, 288.3)), | 4.4 | 4 | + | enemy2 | Waypoint((737.3, 245.6)), | 96.8 | 1 | + | exit_ | Waypoint((737.3, 245.6)), | 96.8 | 1 | + | exit1 | Waypoint((730.1, 236.6)), | 4.1 | 1 | + | exit2 | Waypoint((748.0, 237.0)), | 5.6 | 1 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F1", position=(737.4, 372.2)) + self.register_domain_exit( + Waypoint((737.3, 245.6)), end_rotation=1, + left_door=Waypoint((730.1, 236.6)), right_door=Waypoint((748.0, 237.0))) + enemy1 = Waypoint((738.3, 288.3)) + enemy2 = Waypoint((737.3, 245.6)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy1) + self.clear_enemy(enemy2) diff --git a/route/rogue/Combat/Luofu_DivinationCommission_F2.py b/route/rogue/Combat/Luofu_DivinationCommission_F2.py new file mode 100644 index 000000000..f5077b56b --- /dev/null +++ b/route/rogue/Combat/Luofu_DivinationCommission_F2.py @@ -0,0 +1,40 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_DivinationCommission +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_DivinationCommission_F2_X216Y659(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((216.8, 659.5)), | 281.9 | 274 | + | enemy | Waypoint((164.0, 660.2)), | 275.8 | 271 | + | exit_ | Waypoint((164.0, 660.2)), | 275.8 | 271 | + | exit1 | Waypoint((153.8, 670.7)), | 277.1 | 271 | + | exit2 | Waypoint((153.5, 651.6)), | 277.2 | 274 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F2", position=(216.8, 659.5)) + self.register_domain_exit( + Waypoint((164.0, 660.2)), end_rotation=271, + left_door=Waypoint((153.8, 670.7)), right_door=Waypoint((153.5, 651.6))) + enemy = Waypoint((164.0, 660.2)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy) + + def Luofu_DivinationCommission_F2_X239Y785(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((239.4, 785.5)), | 282.2 | 274 | + | enemy | Waypoint((188.9, 784.2)), | 281.9 | 274 | + | exit_ | Waypoint((188.9, 784.2)), | 281.9 | 274 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F2", position=(239.4, 785.5)) + self.register_domain_exit(Waypoint((188.9, 784.2)), end_rotation=274) + enemy = Waypoint((188.9, 784.2)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy) diff --git a/route/rogue/Combat/Luofu_StargazerNavalia_F1.py b/route/rogue/Combat/Luofu_StargazerNavalia_F1.py index 99a45d431..5298438e5 100644 --- a/route/rogue/Combat/Luofu_StargazerNavalia_F1.py +++ b/route/rogue/Combat/Luofu_StargazerNavalia_F1.py @@ -108,10 +108,13 @@ class Route(RouteBase): enemy3 = Waypoint((560.5, 601.8)) # ===== End of generated waypoints ===== + self.minimap.lock_rotation(90) # Ignore items self.clear_enemy(enemy1) # Ignore enemy2 self.clear_enemy(enemy3) + if self.minimap.position_diff(enemy3.position) > 35: + self.clear_enemy(enemy3) @locked_position def Luofu_StargazerNavalia_F1_X499Y581(self): @@ -122,9 +125,13 @@ class Route(RouteBase): | item_X502Y605 | Waypoint((502.6, 605.0)), | 180.0 | 179 | | enemy | Waypoint((519.0, 623.0)), | 149.8 | 149 | | exit_ | Waypoint((524.4, 624.7)), | 166.7 | 161 | + | exit1 | Waypoint((533.4, 631.2)), | 160.8 | 158 | + | exit2 | Waypoint((517.9, 636.5)), | 160.9 | 158 | """ self.map_init(plane=Luofu_StargazerNavalia, floor="F1", position=(499.6, 581.5)) - self.register_domain_exit(Waypoint((524.4, 624.7)), end_rotation=161) + self.register_domain_exit( + Waypoint((524.4, 624.7)), end_rotation=161, + left_door=Waypoint((533.4, 631.2)), right_door=Waypoint((517.9, 636.5))) item_X502Y605 = Waypoint((502.6, 605.0)) enemy = Waypoint((519.0, 623.0)) # ===== End of generated waypoints ===== diff --git a/route/rogue/Combat/Luofu_StargazerNavalia_F2.py b/route/rogue/Combat/Luofu_StargazerNavalia_F2.py index d39d83b70..65a513663 100644 --- a/route/rogue/Combat/Luofu_StargazerNavalia_F2.py +++ b/route/rogue/Combat/Luofu_StargazerNavalia_F2.py @@ -55,9 +55,13 @@ class Route(RouteBase): | item2 | Waypoint((504.8, 177.2)), | 283.0 | 278 | | enemy2 | Waypoint((488.6, 188.2)), | 282.3 | 274 | | exit_ | Waypoint((486.5, 189.4)), | 182.7 | 274 | + | exit1 | Waypoint((480.2, 195.0)), | 281.9 | 274 | + | exit2 | Waypoint((481.2, 180.8)), | 282.0 | 274 | """ self.map_init(plane=Luofu_StargazerNavalia, floor="F2", position=(627.8, 179.5)) - self.register_domain_exit(Waypoint((486.5, 189.4)), end_rotation=274) + self.register_domain_exit( + Waypoint((486.5, 189.4)), end_rotation=274, + left_door=Waypoint((480.2, 195.0)), right_door=Waypoint((481.2, 180.8))) item1 = Waypoint((574.0, 172.5)) enemy1 = Waypoint((571.9, 180.5)) item2 = Waypoint((504.8, 177.2)) diff --git a/route/rogue/Elite/Luofu_AlchemyCommission_F2.py b/route/rogue/Elite/Luofu_AlchemyCommission_F2.py new file mode 100644 index 000000000..84b0c2e61 --- /dev/null +++ b/route/rogue/Elite/Luofu_AlchemyCommission_F2.py @@ -0,0 +1,26 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_AlchemyCommission +from tasks.map.route.base import locked_position +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_AlchemyCommission_F2_X625Y590(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((623.1, 590.0)), | 282.2 | 274 | + | enemy | Waypoint((571.6, 589.5)), | 282.0 | 274 | + | reward | Waypoint((563.5, 581.4)), | 281.9 | 274 | + | exit_ | Waypoint((555.5, 597.3)), | 267.8 | 264 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(623.1, 590.0)) + enemy = Waypoint((571.6, 589.5)) + reward = Waypoint((563.5, 581.4)) + exit_ = Waypoint((555.5, 597.3)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== diff --git a/route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py b/route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py index 45b408759..c563530d0 100644 --- a/route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py +++ b/route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py @@ -5,6 +5,25 @@ from tasks.rogue.route.base import RouteBase class Route(RouteBase): + def Luofu_ArtisanshipCommission_F1_X385Y494(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((385.2, 494.6)), | 94.2 | 91 | + | enemy | Waypoint((444.2, 490.5)), | 94.2 | 91 | + | reward | Waypoint((448.6, 497.2)), | 149.7 | 91 | + | exit_ | Waypoint((458.0, 483.7)), | 94.2 | 91 | + """ + self.map_init(plane=Luofu_ArtisanshipCommission, floor="F1", position=(385.2, 494.6)) + enemy = Waypoint((444.2, 490.5)) + reward = Waypoint((448.6, 497.2)) + exit_ = Waypoint((458.0, 483.7)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + def Luofu_ArtisanshipCommission_F1_X504Y493(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Elite/Luofu_DivinationCommission_F2.py b/route/rogue/Elite/Luofu_DivinationCommission_F2.py new file mode 100644 index 000000000..dc9ad4070 --- /dev/null +++ b/route/rogue/Elite/Luofu_DivinationCommission_F2.py @@ -0,0 +1,25 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_DivinationCommission +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_DivinationCommission_F2_X338Y345(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((338.0, 345.5)), | 4.5 | 4 | + | enemy | Waypoint((338.4, 278.2)), | 4.3 | 4 | + | reward | Waypoint((345.8, 267.2)), | 99.0 | 1 | + | exit_ | Waypoint((331.2, 261.0)), | 352.8 | 348 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F2", position=(338.0, 345.5)) + enemy = Waypoint((338.4, 278.2)) + reward = Waypoint((345.8, 267.2)) + exit_ = Waypoint((331.2, 261.0)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== diff --git a/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py b/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py index b729a54d3..f31598540 100644 --- a/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py +++ b/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py @@ -46,9 +46,13 @@ class Route(RouteBase): | item | Waypoint((603.0, 734.6)), | 342.6 | 343 | | event | Waypoint((586.8, 724.7)), | 318.0 | 315 | | exit_ | Waypoint((576.9, 728.6)), | 126.2 | 304 | + | exit1 | Waypoint((567.0, 732.7)), | 311.8 | 306 | + | exit2 | Waypoint((576.2, 722.0)), | 308.1 | 306 | """ self.map_init(plane=Jarilo_BackwaterPass, floor="F1", position=(613.3, 755.7)) - self.register_domain_exit(Waypoint((576.9, 728.6)), end_rotation=304) + self.register_domain_exit( + Waypoint((576.9, 728.6)), end_rotation=304, + left_door=Waypoint((567.0, 732.7)), right_door=Waypoint((576.2, 722.0))) item = Waypoint((603.0, 734.6)) event = Waypoint((586.8, 724.7)) diff --git a/route/rogue/Occurrence/Luofu_AlchemyCommission_F2.py b/route/rogue/Occurrence/Luofu_AlchemyCommission_F2.py new file mode 100644 index 000000000..b3409d8de --- /dev/null +++ b/route/rogue/Occurrence/Luofu_AlchemyCommission_F2.py @@ -0,0 +1,61 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_AlchemyCommission +from tasks.map.route.base import locked_rotation +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_AlchemyCommission_F2_X473Y867(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((473.7, 867.7)), | 282.2 | 274 | + | event | Waypoint((421.4, 868.6)), | 282.0 | 274 | + | exit_ | Waypoint((419.3, 867.5)), | 277.8 | 274 | + | exit1 | Waypoint((407.9, 880.7)), | 282.0 | 274 | + | exit2 | Waypoint((410.9, 858.4)), | 281.8 | 274 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(473.7, 867.7)) + self.register_domain_exit( + Waypoint((419.3, 867.5)), end_rotation=274, + left_door=Waypoint((407.9, 880.7)), right_door=Waypoint((410.9, 858.4))) + event = Waypoint((421.4, 868.6)) + + self.clear_event(event) + # ===== End of generated waypoints ===== + + @locked_rotation(270) + def Luofu_AlchemyCommission_F2_X487Y589(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((487.4, 589.4)), | 282.2 | 274 | + | event | Waypoint((434.8, 590.6)), | 282.8 | 276 | + | exit_ | Waypoint((434.2, 590.0)), | 274.2 | 271 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(487.4, 589.4)) + self.register_domain_exit(Waypoint((434.2, 590.0)), end_rotation=271) + event = Waypoint((434.8, 590.6)) + + self.clear_event(event) + # ===== End of generated waypoints ===== + + def Luofu_AlchemyCommission_F2_X517Y374(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((517.5, 374.1)), | 146.7 | 140 | + | event | Waypoint((554.5, 411.0)), | 135.9 | 140 | + | exit_ | Waypoint((554.6, 410.8)), | 48.1 | 140 | + | exit1 | Waypoint((568.4, 412.6)), | 148.1 | 140 | + | exit2 | Waypoint((555.0, 423.4)), | 135.9 | 140 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(517.5, 374.1)) + self.register_domain_exit( + Waypoint((554.6, 410.8)), end_rotation=140, + left_door=Waypoint((568.4, 412.6)), right_door=Waypoint((555.0, 423.4))) + event = Waypoint((554.5, 411.0)) + + self.clear_event(event) + # ===== End of generated waypoints ===== diff --git a/route/rogue/Occurrence/Luofu_DivinationCommission_F2.py b/route/rogue/Occurrence/Luofu_DivinationCommission_F2.py new file mode 100644 index 000000000..90962ae4b --- /dev/null +++ b/route/rogue/Occurrence/Luofu_DivinationCommission_F2.py @@ -0,0 +1,55 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_DivinationCommission +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_DivinationCommission_F2_X149Y659(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((149.3, 659.3)), | 94.2 | 91 | + | event | Waypoint((201.1, 659.2)), | 94.2 | 91 | + | exit_ | Waypoint((201.2, 661.0)), | 190.0 | 87 | + | exit1 | Waypoint((211.2, 651.0)), | 96.8 | 87 | + | exit2 | Waypoint((210.9, 669.0)), | 96.8 | 87 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F2", position=(149.3, 659.3)) + self.register_domain_exit( + Waypoint((201.2, 661.0)), end_rotation=87, + left_door=Waypoint((211.2, 651.0)), right_door=Waypoint((210.9, 669.0))) + event = Waypoint((201.1, 659.2)) + + self.clear_event(event) + # ===== End of generated waypoints ===== + + def Luofu_DivinationCommission_F2_X337Y799(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((337.4, 799.4)), | 4.5 | 4 | + | event | Waypoint((337.3, 745.2)), | 4.4 | 359 | + | exit_ | Waypoint((337.1, 742.5)), | 4.4 | 4 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F2", position=(337.4, 799.4)) + self.register_domain_exit(Waypoint((337.1, 742.5)), end_rotation=4) + event = Waypoint((337.3, 745.2)) + + self.clear_event(event) + # ===== End of generated waypoints ===== + + def Luofu_DivinationCommission_F2_X425Y791(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((425.6, 791.4)), | 94.2 | 91 | + | event | Waypoint((478.9, 791.0)), | 96.8 | 94 | + | exit_ | Waypoint((477.2, 789.2)), | 4.3 | 94 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F2", position=(425.6, 791.4)) + self.register_domain_exit(Waypoint((477.2, 789.2)), end_rotation=94) + event = Waypoint((478.9, 791.0)) + + self.clear_event(event) + # ===== End of generated waypoints ===== diff --git a/route/rogue/Occurrence/Luofu_StargazerNavalia_F2.py b/route/rogue/Occurrence/Luofu_StargazerNavalia_F2.py index 1b32f4153..96500e93c 100644 --- a/route/rogue/Occurrence/Luofu_StargazerNavalia_F2.py +++ b/route/rogue/Occurrence/Luofu_StargazerNavalia_F2.py @@ -1,10 +1,12 @@ from tasks.map.control.waypoint import Waypoint from tasks.map.keywords.plane import Luofu_StargazerNavalia +from tasks.map.route.base import locked_rotation from tasks.rogue.route.base import RouteBase class Route(RouteBase): + @locked_rotation(90) def Luofu_StargazerNavalia_F2_X579Y183(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Respite/Luofu_AlchemyCommission_F2.py b/route/rogue/Respite/Luofu_AlchemyCommission_F2.py new file mode 100644 index 000000000..7247ff7ea --- /dev/null +++ b/route/rogue/Respite/Luofu_AlchemyCommission_F2.py @@ -0,0 +1,46 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_AlchemyCommission +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_AlchemyCommission_F2_X681Y625(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((680.9, 625.9)), | 146.7 | 140 | + | item | Waypoint((688.4, 642.0)), | 148.8 | 140 | + | herta | Waypoint((708.9, 664.4)), | 148.4 | 140 | + | exit_ | Waypoint((725.2, 667.3)), | 148.8 | 140 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(680.9, 625.9)) + item = Waypoint((688.4, 642.0)) + herta = Waypoint((708.9, 664.4)) + exit_ = Waypoint((725.2, 667.3)) + + self.clear_item(item) + self.domain_herta(herta) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + + def Luofu_AlchemyCommission_F2_X685Y629(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((680.9, 625.9)), | 146.7 | 140 | + | item | Waypoint((688.4, 642.0)), | 148.8 | 140 | + | herta | Waypoint((708.9, 664.4)), | 148.4 | 140 | + | exit_ | Waypoint((725.2, 667.3)), | 148.8 | 140 | + """ + self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(685, 629)) + item = Waypoint((688.4, 642.0)) + herta = Waypoint((708.9, 664.4)) + exit_ = Waypoint((725.2, 667.3)) + + self.clear_item(item) + self.domain_herta(herta) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + + # Same as Luofu_AlchemyCommission_F2_X681Y625 diff --git a/route/rogue/Respite/Luofu_DivinationCommission_F2.py b/route/rogue/Respite/Luofu_DivinationCommission_F2.py new file mode 100644 index 000000000..f27b20e05 --- /dev/null +++ b/route/rogue/Respite/Luofu_DivinationCommission_F2.py @@ -0,0 +1,25 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Luofu_DivinationCommission +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Luofu_DivinationCommission_F2_X824Y659(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((824.7, 659.4)), | 94.2 | 91 | + | item | Waypoint((838.0, 666.8)), | 149.5 | 91 | + | herta | Waypoint((868.0, 667.2)), | 101.1 | 98 | + | exit_ | Waypoint((881.4, 659.4)), | 101.2 | 98 | + """ + self.map_init(plane=Luofu_DivinationCommission, floor="F2", position=(824.7, 659.4)) + item = Waypoint((838.0, 666.8)) + herta = Waypoint((868.0, 667.2)) + exit_ = Waypoint((881.4, 659.4)) + + self.clear_item(item) + self.domain_herta(herta) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== diff --git a/route/rogue/route.json b/route/rogue/route.json index 0d5180183..9ecc220e7 100644 --- a/route/rogue/route.json +++ b/route/rogue/route.json @@ -637,6 +637,61 @@ ], "domain": "Combat" }, + { + "name": "Combat_Luofu_AlchemyCommission_F1_X301Y441", + "route": "route.rogue.Combat.Luofu_AlchemyCommission_F1:Luofu_AlchemyCommission_F1_X301Y441", + "plane": "Luofu_AlchemyCommission", + "floor": "F1", + "position": [ + 301.6, + 441.5 + ], + "domain": "Combat" + }, + { + "name": "Combat_Luofu_AlchemyCommission_F2_X415Y589", + "route": "route.rogue.Combat.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X415Y589", + "plane": "Luofu_AlchemyCommission", + "floor": "F2", + "position": [ + 415.5, + 589.4 + ], + "domain": "Combat" + }, + { + "name": "Combat_Luofu_AlchemyCommission_F2_X447Y508", + "route": "route.rogue.Combat.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X447Y508", + "plane": "Luofu_AlchemyCommission", + "floor": "F2", + "position": [ + 447.4, + 508.1 + ], + "domain": "Combat" + }, + { + "name": "Combat_Luofu_AlchemyCommission_F2_X457Y497", + "route": "route.rogue.Combat.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X457Y497", + "plane": "Luofu_AlchemyCommission", + "floor": "F2", + "position": [ + 457.0, + 497.0 + ], + "domain": "Combat" + }, + { + "name": "Combat_Luofu_ArtisanshipCommission_F1_X41Y640", + "route": "route.rogue.Combat.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X41Y640", + "plane": "Luofu_ArtisanshipCommission", + "floor": "F1", + "position": [ + 41.4, + 639.9 + ], + "domain": "Combat" + }, { "name": "Combat_Luofu_ArtisanshipCommission_F1_X185Y361", "route": "route.rogue.Combat.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X185Y361", @@ -659,6 +714,28 @@ ], "domain": "Combat" }, + { + "name": "Combat_Luofu_ArtisanshipCommission_F1_X473Y920", + "route": "route.rogue.Combat.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X473Y920", + "plane": "Luofu_ArtisanshipCommission", + "floor": "F1", + "position": [ + 473.5, + 920.9 + ], + "domain": "Combat" + }, + { + "name": "Combat_Luofu_ArtisanshipCommission_F1_X543Y269", + "route": "route.rogue.Combat.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X543Y269", + "plane": "Luofu_ArtisanshipCommission", + "floor": "F1", + "position": [ + 543.3, + 269.6 + ], + "domain": "Combat" + }, { "name": "Combat_Luofu_ArtisanshipCommission_F1_X655Y537", "route": "route.rogue.Combat.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X655Y537", @@ -780,6 +857,61 @@ ], "domain": "Combat" }, + { + "name": "Combat_Luofu_DivinationCommission_F1_X63Y303", + "route": "route.rogue.Combat.Luofu_DivinationCommission_F1:Luofu_DivinationCommission_F1_X63Y303", + "plane": "Luofu_DivinationCommission", + "floor": "F1", + "position": [ + 63.7, + 303.4 + ], + "domain": "Combat" + }, + { + "name": "Combat_Luofu_DivinationCommission_F1_X97Y457", + "route": "route.rogue.Combat.Luofu_DivinationCommission_F1:Luofu_DivinationCommission_F1_X97Y457", + "plane": "Luofu_DivinationCommission", + "floor": "F1", + "position": [ + 97.2, + 456.9 + ], + "domain": "Combat" + }, + { + "name": "Combat_Luofu_DivinationCommission_F1_X737Y372", + "route": "route.rogue.Combat.Luofu_DivinationCommission_F1:Luofu_DivinationCommission_F1_X737Y372", + "plane": "Luofu_DivinationCommission", + "floor": "F1", + "position": [ + 737.4, + 372.2 + ], + "domain": "Combat" + }, + { + "name": "Combat_Luofu_DivinationCommission_F2_X216Y659", + "route": "route.rogue.Combat.Luofu_DivinationCommission_F2:Luofu_DivinationCommission_F2_X216Y659", + "plane": "Luofu_DivinationCommission", + "floor": "F2", + "position": [ + 216.8, + 659.5 + ], + "domain": "Combat" + }, + { + "name": "Combat_Luofu_DivinationCommission_F2_X239Y785", + "route": "route.rogue.Combat.Luofu_DivinationCommission_F2:Luofu_DivinationCommission_F2_X239Y785", + "plane": "Luofu_DivinationCommission", + "floor": "F2", + "position": [ + 239.4, + 785.5 + ], + "domain": "Combat" + }, { "name": "Combat_Luofu_ScalegorgeWaterscape_F1_X415Y261", "route": "route.rogue.Combat.Luofu_ScalegorgeWaterscape_F1:Luofu_ScalegorgeWaterscape_F1_X415Y261", @@ -1110,6 +1242,28 @@ ], "domain": "Elite" }, + { + "name": "Elite_Luofu_AlchemyCommission_F2_X625Y590", + "route": "route.rogue.Elite.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X625Y590", + "plane": "Luofu_AlchemyCommission", + "floor": "F2", + "position": [ + 623.1, + 590.0 + ], + "domain": "Elite" + }, + { + "name": "Elite_Luofu_ArtisanshipCommission_F1_X385Y494", + "route": "route.rogue.Elite.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X385Y494", + "plane": "Luofu_ArtisanshipCommission", + "floor": "F1", + "position": [ + 385.2, + 494.6 + ], + "domain": "Elite" + }, { "name": "Elite_Luofu_ArtisanshipCommission_F1_X504Y493", "route": "route.rogue.Elite.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X504Y493", @@ -1132,6 +1286,17 @@ ], "domain": "Elite" }, + { + "name": "Elite_Luofu_DivinationCommission_F2_X338Y345", + "route": "route.rogue.Elite.Luofu_DivinationCommission_F2:Luofu_DivinationCommission_F2_X338Y345", + "plane": "Luofu_DivinationCommission", + "floor": "F2", + "position": [ + 338.0, + 345.5 + ], + "domain": "Elite" + }, { "name": "Elite_Luofu_ScalegorgeWaterscape_F1_X1368Y261", "route": "route.rogue.Elite.Luofu_ScalegorgeWaterscape_F1:Luofu_ScalegorgeWaterscape_F1_X1368Y261", @@ -1418,6 +1583,39 @@ ], "domain": "Occurrence" }, + { + "name": "Occurrence_Luofu_AlchemyCommission_F2_X473Y867", + "route": "route.rogue.Occurrence.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X473Y867", + "plane": "Luofu_AlchemyCommission", + "floor": "F2", + "position": [ + 473.7, + 867.7 + ], + "domain": "Occurrence" + }, + { + "name": "Occurrence_Luofu_AlchemyCommission_F2_X487Y589", + "route": "route.rogue.Occurrence.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X487Y589", + "plane": "Luofu_AlchemyCommission", + "floor": "F2", + "position": [ + 487.4, + 589.4 + ], + "domain": "Occurrence" + }, + { + "name": "Occurrence_Luofu_AlchemyCommission_F2_X517Y374", + "route": "route.rogue.Occurrence.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X517Y374", + "plane": "Luofu_AlchemyCommission", + "floor": "F2", + "position": [ + 517.5, + 374.1 + ], + "domain": "Occurrence" + }, { "name": "Occurrence_Luofu_ArtisanshipCommission_F1_X169Y491", "route": "route.rogue.Occurrence.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X169Y491", @@ -1495,6 +1693,39 @@ ], "domain": "Occurrence" }, + { + "name": "Occurrence_Luofu_DivinationCommission_F2_X149Y659", + "route": "route.rogue.Occurrence.Luofu_DivinationCommission_F2:Luofu_DivinationCommission_F2_X149Y659", + "plane": "Luofu_DivinationCommission", + "floor": "F2", + "position": [ + 149.3, + 659.3 + ], + "domain": "Occurrence" + }, + { + "name": "Occurrence_Luofu_DivinationCommission_F2_X337Y799", + "route": "route.rogue.Occurrence.Luofu_DivinationCommission_F2:Luofu_DivinationCommission_F2_X337Y799", + "plane": "Luofu_DivinationCommission", + "floor": "F2", + "position": [ + 337.4, + 799.4 + ], + "domain": "Occurrence" + }, + { + "name": "Occurrence_Luofu_DivinationCommission_F2_X425Y791", + "route": "route.rogue.Occurrence.Luofu_DivinationCommission_F2:Luofu_DivinationCommission_F2_X425Y791", + "plane": "Luofu_DivinationCommission", + "floor": "F2", + "position": [ + 425.6, + 791.4 + ], + "domain": "Occurrence" + }, { "name": "Occurrence_Luofu_ScalegorgeWaterscape_F1_X499Y135", "route": "route.rogue.Occurrence.Luofu_ScalegorgeWaterscape_F1:Luofu_ScalegorgeWaterscape_F1_X499Y135", @@ -1638,6 +1869,28 @@ ], "domain": "Respite" }, + { + "name": "Respite_Luofu_AlchemyCommission_F2_X681Y625", + "route": "route.rogue.Respite.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X681Y625", + "plane": "Luofu_AlchemyCommission", + "floor": "F2", + "position": [ + 680.9, + 625.9 + ], + "domain": "Respite" + }, + { + "name": "Respite_Luofu_AlchemyCommission_F2_X685Y629", + "route": "route.rogue.Respite.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X685Y629", + "plane": "Luofu_AlchemyCommission", + "floor": "F2", + "position": [ + 685.0, + 629.0 + ], + "domain": "Respite" + }, { "name": "Respite_Luofu_ArtisanshipCommission_F1_X299Y863", "route": "route.rogue.Respite.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X299Y863", @@ -1660,6 +1913,17 @@ ], "domain": "Respite" }, + { + "name": "Respite_Luofu_DivinationCommission_F2_X824Y659", + "route": "route.rogue.Respite.Luofu_DivinationCommission_F2:Luofu_DivinationCommission_F2_X824Y659", + "plane": "Luofu_DivinationCommission", + "floor": "F2", + "position": [ + 824.7, + 659.4 + ], + "domain": "Respite" + }, { "name": "Respite_Luofu_ScalegorgeWaterscape_F1_X701Y321", "route": "route.rogue.Respite.Luofu_ScalegorgeWaterscape_F1:Luofu_ScalegorgeWaterscape_F1_X701Y321", diff --git a/tasks/rogue/route/loader.py b/tasks/rogue/route/loader.py index 20dea73c5..b29d962c8 100644 --- a/tasks/rogue/route/loader.py +++ b/tasks/rogue/route/loader.py @@ -168,7 +168,7 @@ class RouteLoader(RogueUI, MinimapWrapper, RouteLoader_, CharacterSwitch): # ('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: + and similarity > 0.05: return True return False @@ -191,7 +191,7 @@ class RouteLoader(RogueUI, MinimapWrapper, RouteLoader_, CharacterSwitch): return f'{minimap_.plane.name}_{minimap_.floor}_X{int(minimap_.position[0])}Y{int(minimap_.position[1])}' visited = sorted(self.all_minimap.values(), key=lambda x: x.position_similarity, reverse=True) - logger.info(f'Best 5 prediction: {[(get_name(m), m.position_similarity) for m in visited[:5]]}') + logger.info(f'Best 5 prediction: {[(get_name(m), m.position_similarity) for m in visited[:50]]}') if visited[1].position_similarity / visited[0].position_similarity > 0.75: logger.warning('Similarity too close, predictions may go wrong')