From 6c2e209f76d3de662afdee235aae93610a463d09 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sun, 19 Nov 2023 02:07:09 +0800 Subject: [PATCH] Upd: Rogue routes --- route/rogue/Combat/Herta_StorageZone_F1.py | 10 ++- route/rogue/Combat/Herta_StorageZone_F2.py | 6 +- route/rogue/Combat/Herta_SupplyZone_F2.py | 38 ++++++----- .../rogue/Combat/Herta_SupplyZone_F2Rogue.py | 63 ++++++++++++------- .../Jarilo_CorridorofFadingEchoes_F1.py | 18 ++++-- route/rogue/Combat/Jarilo_GreatMine_F1.py | 6 +- route/rogue/Combat/Jarilo_RivetTown_F1.py | 12 +++- ...Jarilo_SilvermaneGuardRestrictedZone_F1.py | 15 ++++- route/rogue/Occurrence/Jarilo_GreatMine_F1.py | 12 +++- route/rogue/Occurrence/Luofu_Cloudford_F1.py | 8 ++- 10 files changed, 130 insertions(+), 58 deletions(-) diff --git a/route/rogue/Combat/Herta_StorageZone_F1.py b/route/rogue/Combat/Herta_StorageZone_F1.py index 1ec6a487c..be681b182 100644 --- a/route/rogue/Combat/Herta_StorageZone_F1.py +++ b/route/rogue/Combat/Herta_StorageZone_F1.py @@ -40,7 +40,7 @@ class Route(RouteBase): self.register_domain_exit( Waypoint((392.5, 312.4)), end_rotation=91, - left_door=Waypoint((400.2, 301.8)), right_door=Waypoint((400.8, 318.9))) + left_door=Waypoint((406.2, 307.8)), right_door=Waypoint((406.8, 318.9))) # 1 self.clear_item(item1.straight_run()) self.clear_enemy(enemy1.straight_run()) @@ -86,9 +86,13 @@ class Route(RouteBase): | item | Waypoint((248.4, 59.4)), | 334.8 | 331 | | enemy | Waypoint((227.8, 69.5)), | 30.2 | 299 | | exit_ | Waypoint((227.8, 69.5)), | 30.2 | 299 | + | exit1 | Waypoint((216.0, 74.4)), | 302.9 | 304 | + | exit2 | Waypoint((224.9, 59.4)), | 306.3 | 306 | """ self.map_init(plane=Herta_StorageZone, floor="F1", position=(273.4, 92.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((216.0, 74.4)), right_door=Waypoint((224.9, 59.4))) item = Waypoint((248.4, 59.4)) enemy = Waypoint((227.8, 69.5)) # ===== End of generated waypoints ===== @@ -140,7 +144,7 @@ class Route(RouteBase): # 3 self.rotation_set(255) self.clear_item( - door.set_threshold(3), + door.set_threshold(2), node, item3, ) diff --git a/route/rogue/Combat/Herta_StorageZone_F2.py b/route/rogue/Combat/Herta_StorageZone_F2.py index 09588510f..2098f1cd7 100644 --- a/route/rogue/Combat/Herta_StorageZone_F2.py +++ b/route/rogue/Combat/Herta_StorageZone_F2.py @@ -13,13 +13,13 @@ class Route(RouteBase): | item | Waypoint((342.8, 155.7)), | 274.2 | 274 | | enemy | Waypoint((304.0, 165.4)), | 261.9 | 264 | | exit_ | Waypoint((300.8, 163.8)), | 2.6 | 262 | - | exit1 | Waypoint((305.2, 169.2)), | 275.9 | 274 | - | exit2 | Waypoint((304.6, 160.8)), | 277.8 | 276 | + | exit1 | Waypoint((293.4, 175.3)), | 282.0 | 274 | + | exit2 | Waypoint((293.0, 157.2)), | 282.0 | 274 | """ self.map_init(plane=Herta_StorageZone, floor="F2", position=(351.4, 164.9)) self.register_domain_exit( Waypoint((300.8, 163.8)), end_rotation=262, - left_door=Waypoint((304.6, 160.8)), right_door=Waypoint((305.2, 169.2))) + left_door=Waypoint((293.4, 175.3)), right_door=Waypoint((293.0, 157.2))) item = Waypoint((342.8, 155.7)) enemy = Waypoint((304.0, 165.4)) # ===== End of generated waypoints ===== diff --git a/route/rogue/Combat/Herta_SupplyZone_F2.py b/route/rogue/Combat/Herta_SupplyZone_F2.py index 6eb24702b..68bde55d3 100644 --- a/route/rogue/Combat/Herta_SupplyZone_F2.py +++ b/route/rogue/Combat/Herta_SupplyZone_F2.py @@ -7,26 +7,26 @@ class Route(RouteBase): def Herta_SupplyZone_F2_X45Y369(self): """ - | Waypoint | Position | Direction | Rotation | - | ----------- | ------------------------- | --------- | -------- | - | spawn | Waypoint((45.5, 369.5)), | 6.7 | 4 | - | item1 | Waypoint((38.7, 346.8)), | 36.0 | 359 | - | door1 | Waypoint((46.6, 343.9)), | 12.6 | 6 | - | enemy1 | Waypoint((46.2, 328.2)), | 12.6 | 8 | - | item2 | Waypoint((42.4, 299.0)), | 352.8 | 348 | - | door2 | Waypoint((46.4, 284.5)), | 4.2 | 1 | - | enemy2left | Waypoint((31.2, 248.8)), | 183.8 | 84 | - | enemy2right | Waypoint((55.2, 247.2)), | 96.7 | 91 | - | item3 | Waypoint((68.5, 226.5)), | 30.2 | 29 | - | enemy3 | Waypoint((114.4, 234.7)), | 105.5 | 101 | - | exit_ | Waypoint((119.1, 235.4)), | 6.8 | 96 | - | exit1 | Waypoint((121.4, 229.4)), | 102.9 | 96 | - | exit2 | Waypoint((695.4, 251.6)), | 99.1 | 354 | + | Waypoint | Position | Direction | Rotation | + | -------------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((45.5, 369.5)), | 6.7 | 4 | + | item1 | Waypoint((38.7, 346.8)), | 36.0 | 359 | + | door1 | Waypoint((46.6, 343.9)), | 12.6 | 6 | + | enemy1 | Waypoint((46.2, 328.2)), | 12.6 | 8 | + | item2 | Waypoint((42.4, 299.0)), | 352.8 | 348 | + | door2 | Waypoint((46.4, 284.5)), | 4.2 | 1 | + | enemy2left | Waypoint((31.2, 248.8)), | 183.8 | 84 | + | enemy2right | Waypoint((55.2, 247.2)), | 96.7 | 91 | + | item3 | Waypoint((68.5, 226.5)), | 30.2 | 29 | + | enemy3 | Waypoint((114.4, 234.7)), | 105.5 | 101 | + | exit_ | Waypoint((119.1, 235.4)), | 6.8 | 96 | + | exit1 | Waypoint((121.4, 229.4)), | 102.9 | 96 | + | exit2_X121Y241 | Waypoint((121.7, 241.1)), | 99.1 | 354 | """ self.map_init(plane=Herta_SupplyZone, floor="F2", position=(45.5, 369.5)) self.register_domain_exit( Waypoint((119.1, 235.4)), end_rotation=96, - left_door=Waypoint((121.4, 229.4)), right_door=Waypoint((695.4, 251.6))) + left_door=Waypoint((121.4, 229.4)), right_door=Waypoint((121.7, 241.1))) item1 = Waypoint((38.7, 346.8)) door1 = Waypoint((46.6, 343.9)) enemy1 = Waypoint((46.2, 328.2)) @@ -66,9 +66,13 @@ class Route(RouteBase): | item_X406Y202 | Waypoint((406.5, 202.1)), | 48.1 | 45 | | enemy_X397Y182 | Waypoint((397.2, 183.1)), | 356.3 | 4 | | exit_X397Y182 | Waypoint((397.2, 183.1)), | 356.3 | 4 | + | exit1_X393Y163 | Waypoint((393.6, 163.7)), | 11.1 | 4 | + | exit2_X406Y161 | Waypoint((406.6, 161.5)), | 4.3 | 357 | """ self.map_init(plane=Herta_SupplyZone, floor="F2", position=(397.4, 233.5)) - self.register_domain_exit(Waypoint((397.2, 183.1)), end_rotation=4) + self.register_domain_exit( + Waypoint((397.2, 183.1)), end_rotation=4, + left_door=Waypoint((393.6, 163.7)), right_door=Waypoint((406.6, 161.5))) item_X406Y202 = Waypoint((406.5, 202.1)) enemy_X397Y182 = Waypoint((397.2, 183.1)) # ===== End of generated waypoints ===== diff --git a/route/rogue/Combat/Herta_SupplyZone_F2Rogue.py b/route/rogue/Combat/Herta_SupplyZone_F2Rogue.py index 4a0970d4e..330a3b234 100644 --- a/route/rogue/Combat/Herta_SupplyZone_F2Rogue.py +++ b/route/rogue/Combat/Herta_SupplyZone_F2Rogue.py @@ -7,15 +7,19 @@ class Route(RouteBase): def Herta_SupplyZone_F2Rogue_X209Y112(self): """ - | Waypoint | Position | Direction | Rotation | - | -------- | ------------------------- | --------- | -------- | - | spawn | Waypoint((219.6, 112.8)), | 96.7 | 91 | - | item | Waypoint((227.4, 105.1)), | 67.2 | 61 | - | enemy | Waypoint((264.2, 114.1)), | 101.1 | 98 | - | exit_ | Waypoint((266.7, 113.7)), | 60.8 | 91 | + | Waypoint | Position | Direction | Rotation | + | -------------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((219.6, 112.8)), | 96.7 | 91 | + | item | Waypoint((227.4, 105.1)), | 67.2 | 61 | + | enemy | Waypoint((264.2, 114.1)), | 101.1 | 98 | + | exit_ | Waypoint((266.7, 113.7)), | 60.8 | 91 | + | exit1_X269Y105 | Waypoint((269.7, 105.7)), | 101.1 | 91 | + | exit2_X273Y119 | Waypoint((273.0, 119.2)), | 101.1 | 91 | """ self.map_init(plane=Herta_SupplyZone, floor="F2Rogue", position=(209.6, 112.8)) - self.register_domain_exit(Waypoint((266.7, 113.7)), end_rotation=91) + self.register_domain_exit( + Waypoint((266.7, 113.7)), end_rotation=91, + left_door=Waypoint((269.7, 105.7)), right_door=Waypoint((273.0, 119.2))) item = Waypoint((227.4, 105.1)) enemy = Waypoint((264.2, 114.1)) # ===== End of generated waypoints ===== @@ -24,20 +28,27 @@ class Route(RouteBase): Notes: Herta_SupplyZone_F2Rogue_X209Y112 is the same as Herta_SupplyZone_F2Rogue_X219Y112 to handle detection errors """ + self.register_domain_exit( + Waypoint((266.7, 113.7)), end_rotation=91, + left_door=Waypoint((270.7, 105.7)), right_door=Waypoint((270.7, 119.2))) self.clear_item(item) self.clear_enemy(enemy) def Herta_SupplyZone_F2Rogue_X215Y112(self): """ - | Waypoint | Position | Direction | Rotation | - | -------- | ------------------------- | --------- | -------- | - | spawn | Waypoint((219.6, 112.8)), | 96.7 | 91 | - | item | Waypoint((227.4, 105.1)), | 67.2 | 61 | - | enemy | Waypoint((264.2, 114.1)), | 101.1 | 98 | - | exit_ | Waypoint((266.7, 113.7)), | 60.8 | 91 | + | Waypoint | Position | Direction | Rotation | + | -------------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((219.6, 112.8)), | 96.7 | 91 | + | item | Waypoint((227.4, 105.1)), | 67.2 | 61 | + | enemy | Waypoint((264.2, 114.1)), | 101.1 | 98 | + | exit_ | Waypoint((266.7, 113.7)), | 60.8 | 91 | + | exit1_X269Y105 | Waypoint((269.7, 105.7)), | 101.1 | 91 | + | exit2_X273Y119 | Waypoint((273.0, 119.2)), | 101.1 | 91 | """ self.map_init(plane=Herta_SupplyZone, floor="F2Rogue", position=(215.6, 112.8)) - self.register_domain_exit(Waypoint((266.7, 113.7)), end_rotation=91) + self.register_domain_exit( + Waypoint((266.7, 113.7)), end_rotation=91, + left_door=Waypoint((269.7, 105.7)), right_door=Waypoint((273.0, 119.2))) item = Waypoint((227.4, 105.1)) enemy = Waypoint((264.2, 114.1)) # ===== End of generated waypoints ===== @@ -46,23 +57,33 @@ class Route(RouteBase): Notes: Herta_SupplyZone_F2Rogue_X215Y112 is the same as Herta_SupplyZone_F2Rogue_X219Y112 to handle detection errors """ + self.register_domain_exit( + Waypoint((266.7, 113.7)), end_rotation=91, + left_door=Waypoint((270.7, 105.7)), right_door=Waypoint((270.7, 119.2))) self.clear_item(item) self.clear_enemy(enemy) def Herta_SupplyZone_F2Rogue_X219Y112(self): """ - | Waypoint | Position | Direction | Rotation | - | -------- | ------------------------- | --------- | -------- | - | spawn | Waypoint((219.6, 112.8)), | 96.7 | 91 | - | item | Waypoint((227.4, 105.1)), | 67.2 | 61 | - | enemy | Waypoint((264.2, 114.1)), | 101.1 | 98 | - | exit_ | Waypoint((266.7, 113.7)), | 60.8 | 91 | + | Waypoint | Position | Direction | Rotation | + | -------------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((219.6, 112.8)), | 96.7 | 91 | + | item | Waypoint((227.4, 105.1)), | 67.2 | 61 | + | enemy | Waypoint((264.2, 114.1)), | 101.1 | 98 | + | exit_ | Waypoint((266.7, 113.7)), | 60.8 | 91 | + | exit1_X269Y105 | Waypoint((269.7, 105.7)), | 101.1 | 91 | + | exit2_X273Y119 | Waypoint((273.0, 119.2)), | 101.1 | 91 | """ self.map_init(plane=Herta_SupplyZone, floor="F2Rogue", position=(219.6, 112.8)) - self.register_domain_exit(Waypoint((266.7, 113.7)), end_rotation=91) + self.register_domain_exit( + Waypoint((266.7, 113.7)), end_rotation=91, + left_door=Waypoint((269.7, 105.7)), right_door=Waypoint((273.0, 119.2))) item = Waypoint((227.4, 105.1)) enemy = Waypoint((264.2, 114.1)) # ===== End of generated waypoints ===== + self.register_domain_exit( + Waypoint((266.7, 113.7)), end_rotation=91, + left_door=Waypoint((270.7, 105.7)), right_door=Waypoint((270.7, 119.2))) self.clear_item(item) self.clear_enemy(enemy) diff --git a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py index c2735dd09..95b2bce50 100644 --- a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py +++ b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py @@ -99,9 +99,13 @@ class Route(RouteBase): | item | Waypoint((282.1, 782.4)), | 216.3 | 211 | | enemy | Waypoint((291.2, 821.2)), | 188.1 | 181 | | exit_ | Waypoint((291.2, 821.2)), | 188.1 | 181 | + | exit1 | Waypoint((299.4, 833.4)), | 191.8 | 184 | + | exit2 | Waypoint((281.9, 833.4)), | 191.8 | 184 | """ self.map_init(plane=Jarilo_CorridorofFadingEchoes, floor="F1", position=(291.1, 765.3)) - self.register_domain_exit(Waypoint((291.2, 821.2)), end_rotation=181) + self.register_domain_exit( + Waypoint((291.2, 821.2)), end_rotation=181, + left_door=Waypoint((299.4, 833.4)), right_door=Waypoint((281.9, 833.4))) item = Waypoint((282.1, 782.4)) enemy = Waypoint((291.2, 821.2)) # ===== End of generated waypoints ===== @@ -136,8 +140,8 @@ class Route(RouteBase): | enemy2right | Waypoint((444.6, 466.0)), | 129.8 | 124 | | enemy4 | Waypoint((452.2, 392.2)), | 318.0 | 318 | | enemy2left | Waypoint((475.0, 462.4)), | 67.2 | 64 | - | node4 | Waypoint((493.0, 437.4)), | 4.1 | 359 | | node3 | Waypoint((493.0, 449.0)), | 190.0 | 43 | + | node4 | Waypoint((497.8, 433.7)), | 79.8 | 341 | | exit_ | Waypoint((452.2, 392.2)), | 318.0 | 318 | | exit1 | Waypoint((443.0, 392.6)), | 323.8 | 320 | | exit2 | Waypoint((451.6, 383.3)), | 332.9 | 329 | @@ -150,8 +154,8 @@ class Route(RouteBase): enemy2right = Waypoint((444.6, 466.0)) enemy4 = Waypoint((452.2, 392.2)) enemy2left = Waypoint((475.0, 462.4)) - node4 = Waypoint((493.0, 437.4)) node3 = Waypoint((493.0, 449.0)) + node4 = Waypoint((497.8, 433.7)) # ===== End of generated waypoints ===== self.clear_enemy(enemy1) @@ -162,7 +166,7 @@ class Route(RouteBase): self.clear_enemy( enemy2left.set_threshold(5), node3.straight_run(), - node4.straight_run(), + node4.set_threshold(3).straight_run(), enemy4.straight_run(), ) @@ -212,9 +216,13 @@ class Route(RouteBase): | node2 | Waypoint((554.6, 141.6)), | 166.6 | 158 | | enemy2 | Waypoint((556.4, 206.8)), | 190.1 | 184 | | exit_ | Waypoint((556.4, 206.8)), | 190.1 | 184 | + | exit1 | Waypoint((563.1, 211.9)), | 189.0 | 186 | + | exit2 | Waypoint((544.4, 211.7)), | 188.9 | 186 | """ self.map_init(plane=Jarilo_CorridorofFadingEchoes, floor="F1", position=(463.3, 123.5)) - self.register_domain_exit(Waypoint((556.4, 206.8)), end_rotation=184) + self.register_domain_exit( + Waypoint((556.4, 206.8)), end_rotation=184, + left_door=Waypoint((563.1, 211.9)), right_door=Waypoint((544.4, 211.7))) item = Waypoint((476.9, 129.9)) enemy1 = Waypoint((544.4, 128.5)) node2 = Waypoint((554.6, 141.6)) diff --git a/route/rogue/Combat/Jarilo_GreatMine_F1.py b/route/rogue/Combat/Jarilo_GreatMine_F1.py index 3e08b8f46..5553bdb5a 100644 --- a/route/rogue/Combat/Jarilo_GreatMine_F1.py +++ b/route/rogue/Combat/Jarilo_GreatMine_F1.py @@ -125,9 +125,13 @@ class Route(RouteBase): | item | Waypoint((282.4, 240.8)), | 295.5 | 292 | | enemy | Waypoint((246.2, 248.4)), | 282.8 | 281 | | exit_ | Waypoint((246.6, 248.8)), | 96.8 | 274 | + | exit1 | Waypoint((235.7, 255.9)), | 281.9 | 274 | + | exit2 | Waypoint((237.4, 239.4)), | 281.9 | 276 | """ self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(299.3, 255.3)) - self.register_domain_exit(Waypoint((246.6, 248.8)), end_rotation=274) + self.register_domain_exit( + Waypoint((246.6, 248.8)), end_rotation=274, + left_door=Waypoint((235.7, 255.9)), right_door=Waypoint((237.4, 239.4))) item = Waypoint((282.4, 240.8)) enemy = Waypoint((246.2, 248.4)) # ===== End of generated waypoints ===== diff --git a/route/rogue/Combat/Jarilo_RivetTown_F1.py b/route/rogue/Combat/Jarilo_RivetTown_F1.py index 6d010db64..646911501 100644 --- a/route/rogue/Combat/Jarilo_RivetTown_F1.py +++ b/route/rogue/Combat/Jarilo_RivetTown_F1.py @@ -81,9 +81,13 @@ class Route(RouteBase): | item | Waypoint((222.6, 371.5)), | 166.7 | 165 | | enemy | Waypoint((206.2, 387.8)), | 190.1 | 191 | | exit_ | Waypoint((209.2, 392.8)), | 189.0 | 184 | + | exit1 | Waypoint((217.5, 403.4)), | 180.0 | 181 | + | exit2 | Waypoint((201.6, 401.5)), | 180.0 | 181 | """ self.map_init(plane=Jarilo_RivetTown, floor="F1", position=(209.4, 333.5)) - self.register_domain_exit(Waypoint((209.2, 392.8)), end_rotation=184) + self.register_domain_exit( + Waypoint((209.2, 392.8)), end_rotation=184, + left_door=Waypoint((217.5, 403.4)), right_door=Waypoint((201.6, 401.5))) item = Waypoint((222.6, 371.5)) enemy = Waypoint((206.2, 387.8)) # ===== End of generated waypoints ===== @@ -132,9 +136,13 @@ class Route(RouteBase): | item | Waypoint((302.6, 270.6)), | 59.1 | 54 | | enemy | Waypoint((298.2, 246.0)), | 36.2 | 36 | | exit_ | Waypoint((298.2, 246.0)), | 36.2 | 36 | + | exit1 | Waypoint((295.5, 239.4)), | 36.2 | 31 | + | exit2 | Waypoint((305.2, 244.8)), | 36.2 | 31 | """ self.map_init(plane=Jarilo_RivetTown, floor="F1", position=(279.4, 301.6)) - self.register_domain_exit(Waypoint((298.2, 246.0)), end_rotation=36) + self.register_domain_exit( + Waypoint((298.2, 246.0)), end_rotation=36, + left_door=Waypoint((295.5, 239.4)), right_door=Waypoint((305.2, 244.8))) item = Waypoint((302.6, 270.6)) enemy = Waypoint((298.2, 246.0)) # ===== End of generated waypoints ===== diff --git a/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py b/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py index b03416ff1..40837f7d6 100644 --- a/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py +++ b/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py @@ -156,9 +156,13 @@ class Route(RouteBase): | enemy2 | Waypoint((247.9, 426.4)), | 11.2 | 45 | | enemy3 | Waypoint((163.9, 426.5)), | 282.9 | 278 | | exit_ | Waypoint((163.9, 426.5)), | 282.9 | 278 | + | exit1 | Waypoint((157.9, 433.4)), | 275.9 | 274 | + | exit2 | Waypoint((158.0, 419.2)), | 281.9 | 274 | """ self.map_init(plane=Jarilo_SilvermaneGuardRestrictedZone, floor="F1", position=(371.6, 425.3)) - self.register_domain_exit(Waypoint((163.9, 426.5)), end_rotation=278) + self.register_domain_exit( + Waypoint((163.9, 426.5)), end_rotation=278, + left_door=Waypoint((157.9, 433.4)), right_door=Waypoint((158.0, 419.2))) item1 = Waypoint((350.3, 410.5)) enemy1 = Waypoint((304.0, 424.2)) enemy2 = Waypoint((247.9, 426.4)) @@ -197,9 +201,13 @@ class Route(RouteBase): | item | Waypoint((418.5, 218.3)), | 183.8 | 181 | | enemy | Waypoint((440.2, 232.4)), | 166.6 | 154 | | exit_ | Waypoint((440.2, 232.4)), | 166.6 | 154 | + | exit1 | Waypoint((449.4, 237.1)), | 157.5 | 154 | + | exit2 | Waypoint((439.2, 240.8)), | 157.3 | 156 | """ self.map_init(plane=Jarilo_SilvermaneGuardRestrictedZone, floor="F1", position=(421.5, 173.4)) - self.register_domain_exit(Waypoint((440.2, 232.4)), end_rotation=154) + self.register_domain_exit( + Waypoint((440.2, 232.4)), end_rotation=154, + left_door=Waypoint((449.4, 237.1)), right_door=Waypoint((439.2, 240.8))) item = Waypoint((418.5, 218.3)) enemy = Waypoint((440.2, 232.4)) # ===== End of generated waypoints ===== @@ -216,6 +224,7 @@ class Route(RouteBase): | enemy1 | Waypoint((566.2, 572.0)), | 282.8 | 181 | | item2 | Waypoint((574.0, 583.2)), | 139.4 | 140 | | enemy3 | Waypoint((542.6, 613.0)), | 239.8 | 237 | + | node4 | Waypoint((527.6, 625.4)), | 21.0 | 283 | | 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 | @@ -230,6 +239,7 @@ class Route(RouteBase): enemy1 = Waypoint((566.2, 572.0)) item2 = Waypoint((574.0, 583.2)) enemy3 = Waypoint((542.6, 613.0)) + node4 = Waypoint((527.6, 625.4)) item3 = Waypoint((536.4, 628.1)) enemy4 = Waypoint((494.2, 611.8)) # ===== End of generated waypoints ===== @@ -247,5 +257,6 @@ class Route(RouteBase): ) # 4 self.clear_enemy( + node4.set_threshold(3), enemy4.straight_run(), ) diff --git a/route/rogue/Occurrence/Jarilo_GreatMine_F1.py b/route/rogue/Occurrence/Jarilo_GreatMine_F1.py index 5fae71602..342fab91c 100644 --- a/route/rogue/Occurrence/Jarilo_GreatMine_F1.py +++ b/route/rogue/Occurrence/Jarilo_GreatMine_F1.py @@ -12,9 +12,13 @@ class Route(RouteBase): | spawn | Waypoint((153.8, 271.7)), | 79.8 | 75 | | event | Waypoint((198.5, 257.0)), | 87.9 | 82 | | exit_ | Waypoint((198.5, 258.5)), | 342.3 | 80 | + | exit1 | Waypoint((208.9, 243.5)), | 87.8 | 80 | + | exit2 | Waypoint((213.1, 263.5)), | 87.8 | 82 | """ self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(153.8, 271.7)) - self.register_domain_exit(Waypoint((198.5, 258.5)), end_rotation=80) + self.register_domain_exit( + Waypoint((198.5, 258.5)), end_rotation=80, + left_door=Waypoint((208.9, 243.5)), right_door=Waypoint((213.1, 263.5))) event = Waypoint((198.5, 257.0)) self.clear_event(event) @@ -27,9 +31,13 @@ class Route(RouteBase): | spawn | Waypoint((277.5, 605.9)), | 239.8 | 237 | | event | Waypoint((242.2, 618.8)), | 247.1 | 241 | | exit_ | Waypoint((241.2, 628.9)), | 149.1 | 241 | + | exit1 | Waypoint((239.7, 637.4)), | 239.8 | 239 | + | exit2 | Waypoint((234.3, 627.4)), | 250.8 | 251 | """ self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(277.5, 605.9)) - self.register_domain_exit(Waypoint((241.2, 628.9)), end_rotation=241) + self.register_domain_exit( + Waypoint((241.2, 628.9)), end_rotation=241, + left_door=Waypoint((239.7, 637.4)), right_door=Waypoint((234.3, 627.4))) event = Waypoint((242.2, 618.8)) self.clear_event(event) diff --git a/route/rogue/Occurrence/Luofu_Cloudford_F1.py b/route/rogue/Occurrence/Luofu_Cloudford_F1.py index 240f1bf9e..7de6f83e4 100644 --- a/route/rogue/Occurrence/Luofu_Cloudford_F1.py +++ b/route/rogue/Occurrence/Luofu_Cloudford_F1.py @@ -81,10 +81,14 @@ class Route(RouteBase): | spawn | Waypoint((537.4, 373.3)), | 96.7 | 91 | | item | Waypoint((567.0, 346.6)), | 96.7 | 91 | | event | Waypoint((580.8, 363.0)), | 94.2 | 91 | - | exit_ | Waypoint((593.4, 373.4)), | 96.7 | 94 | + | exit_ | Waypoint((588.6, 372.8)), | 282.4 | 89 | + | exit1 | Waypoint((595.5, 365.6)), | 96.8 | 87 | + | exit2 | Waypoint((595.3, 379.7)), | 96.8 | 87 | """ self.map_init(plane=Luofu_Cloudford, floor="F1", position=(537.4, 373.3)) - self.register_domain_exit(Waypoint((593.4, 373.4)), end_rotation=94) + self.register_domain_exit( + Waypoint((588.6, 372.8)), end_rotation=89, + left_door=Waypoint((595.5, 365.6)), right_door=Waypoint((595.3, 379.7))) item = Waypoint((567.0, 346.6)) event = Waypoint((580.8, 363.0))