From 95dfaff9809e8e685635a1d39169be2489e0ebbe Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sun, 26 Nov 2023 21:48:24 +0800 Subject: [PATCH] Upd: Rogue routes --- route/rogue/Combat/Herta_StorageZone_F1.py | 6 +++++- route/rogue/Combat/Jarilo_GreatMine_F1.py | 6 +++++- route/rogue/Combat/Luofu_Cloudford_F1.py | 4 +++- route/rogue/Combat/Luofu_Cloudford_F2.py | 2 +- route/rogue/Combat/Luofu_StargazerNavalia_F1.py | 6 +++++- route/rogue/Combat/Luofu_StargazerNavalia_F2.py | 12 ++++++------ 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/route/rogue/Combat/Herta_StorageZone_F1.py b/route/rogue/Combat/Herta_StorageZone_F1.py index be681b182..ecc2b4407 100644 --- a/route/rogue/Combat/Herta_StorageZone_F1.py +++ b/route/rogue/Combat/Herta_StorageZone_F1.py @@ -67,9 +67,13 @@ class Route(RouteBase): | door | Waypoint((215.4, 65.1)), | 303.8 | 301 | | enemy | Waypoint((202.7, 57.9)), | 297.8 | 294 | | exit_ | Waypoint((202.4, 58.1)), | 302.9 | 301 | + | exit1 | Waypoint((195.0, 61.2)), | 306.4 | 304 | + | exit2 | Waypoint((199.4, 49.4)), | 306.4 | 304 | """ self.map_init(plane=Herta_StorageZone, floor="F1", position=(257.3, 85.5)) - self.register_domain_exit(Waypoint((202.4, 58.1)), end_rotation=301) + self.register_domain_exit( + Waypoint((202.4, 58.1)), end_rotation=301, + left_door=Waypoint((195.0, 61.2)), right_door=Waypoint((199.4, 49.4))) item = Waypoint((244.2, 66.3)) door = Waypoint((215.4, 65.1)) enemy = Waypoint((202.7, 57.9)) diff --git a/route/rogue/Combat/Jarilo_GreatMine_F1.py b/route/rogue/Combat/Jarilo_GreatMine_F1.py index 5553bdb5a..553c3039c 100644 --- a/route/rogue/Combat/Jarilo_GreatMine_F1.py +++ b/route/rogue/Combat/Jarilo_GreatMine_F1.py @@ -150,9 +150,13 @@ class Route(RouteBase): | enemy3 | Waypoint((339.0, 595.4)), | 297.8 | 294 | | enemy4 | Waypoint((312.7, 575.6)), | 312.1 | 318 | | exit_ | Waypoint((315.6, 572.6)), | 334.7 | 329 | + | exit1 | Waypoint((301.0, 565.9)), | 332.8 | 327 | + | exit2 | Waypoint((313.4, 561.4)), | 337.2 | 334 | """ self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(407.2, 572.8)) - self.register_domain_exit(Waypoint((315.6, 572.6)), end_rotation=329) + self.register_domain_exit( + Waypoint((315.6, 572.6)), end_rotation=329, + left_door=Waypoint((301.0, 565.9)), right_door=Waypoint((313.4, 561.4))) item1 = Waypoint((382.9, 585.3)) enemy1 = Waypoint((382.4, 590.4)) item2 = Waypoint((378.2, 610.6)) diff --git a/route/rogue/Combat/Luofu_Cloudford_F1.py b/route/rogue/Combat/Luofu_Cloudford_F1.py index ab6bc70e2..47e8442c0 100644 --- a/route/rogue/Combat/Luofu_Cloudford_F1.py +++ b/route/rogue/Combat/Luofu_Cloudford_F1.py @@ -40,7 +40,9 @@ class Route(RouteBase): | exit_ | Waypoint((194.4, 947.2)), | 4.2 | 274 | """ self.map_init(plane=Luofu_Cloudford, floor="F1", position=(257.3, 947)) - self.register_domain_exit(Waypoint((194.4, 947.2)), end_rotation=274) + self.register_domain_exit( + Waypoint((194.4, 947.2)), end_rotation=274, + left_door=Waypoint((183.9, 954.4)), right_door=Waypoint((183.0, 942.4))) item = Waypoint((236.8, 934.2)) node = Waypoint((221.6, 946.2)) enemy = Waypoint((193.7, 949.5)) diff --git a/route/rogue/Combat/Luofu_Cloudford_F2.py b/route/rogue/Combat/Luofu_Cloudford_F2.py index e9eda1a17..16aa6e7a5 100644 --- a/route/rogue/Combat/Luofu_Cloudford_F2.py +++ b/route/rogue/Combat/Luofu_Cloudford_F2.py @@ -87,5 +87,5 @@ class Route(RouteBase): self.minimap.lock_rotation(270) # self.clear_item(item3.straight_run()) self.clear_enemy( - enemy3.straight_run() + enemy3 ) diff --git a/route/rogue/Combat/Luofu_StargazerNavalia_F1.py b/route/rogue/Combat/Luofu_StargazerNavalia_F1.py index 4c0ecde71..9ea884489 100644 --- a/route/rogue/Combat/Luofu_StargazerNavalia_F1.py +++ b/route/rogue/Combat/Luofu_StargazerNavalia_F1.py @@ -14,9 +14,13 @@ class Route(RouteBase): | item | Waypoint((208.5, 306.1)), | 82.5 | 80 | | enemy | Waypoint((247.4, 320.2)), | 114.1 | 112 | | exit_ | Waypoint((243.4, 319.4)), | 274.2 | 89 | + | exit1 | Waypoint((251.4, 311.5)), | 96.9 | 89 | + | exit2 | Waypoint((251.4, 323.5)), | 96.9 | 89 | """ self.map_init(plane=Luofu_StargazerNavalia, floor="F1", position=(183.4, 315.6)) - self.register_domain_exit(Waypoint((243.4, 319.4)), end_rotation=89) + self.register_domain_exit( + Waypoint((243.4, 319.4)), end_rotation=89, + left_door=Waypoint((251.4, 311.5)), right_door=Waypoint((251.4, 323.5))) item = Waypoint((208.5, 306.1)) enemy = Waypoint((247.4, 320.2)) # ===== End of generated waypoints ===== diff --git a/route/rogue/Combat/Luofu_StargazerNavalia_F2.py b/route/rogue/Combat/Luofu_StargazerNavalia_F2.py index 65a513663..597304409 100644 --- a/route/rogue/Combat/Luofu_StargazerNavalia_F2.py +++ b/route/rogue/Combat/Luofu_StargazerNavalia_F2.py @@ -15,14 +15,14 @@ class Route(RouteBase): | enemy2 | Waypoint((572.4, 180.2)), | 284.6 | 94 | | 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 | + | exit_ | Waypoint((619.5, 171.5)), | 101.3 | 6 | + | exit1 | Waypoint((611.5, 161.1)), | 12.6 | 6 | + | exit2 | Waypoint((629.3, 161.0)), | 12.6 | 6 | """ 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, - left_door=Waypoint((612.2, 160.4)), right_door=Waypoint((628.2, 160.4))) + Waypoint((619.5, 171.5)), end_rotation=6, + left_door=Waypoint((611.5, 161.1)), right_door=Waypoint((629.3, 161.0))) item1 = Waypoint((516.4, 194.2)) enemy1 = Waypoint((538.2, 182.6)) enemy2 = Waypoint((572.4, 180.2)) @@ -39,7 +39,7 @@ class Route(RouteBase): enemy2, ) self.rotation_set(60) - self.minimap.lock_rotation(self.minimap.rotation) + self.minimap.lock_rotation(60) self.clear_enemy( node3, enemy3,