From 0e78cbb4a6493dde699d59b3488f2ad1a0ecb905 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Mon, 2 Oct 2023 02:07:08 +0800 Subject: [PATCH] Add: Treat DomainBoss as DomainElite and add routes --- route/rogue/Combat/Jarilo_GreatMine_F1.py | 53 +++++++++++++ .../Luofu_ArtisanshipCommission_F1.py | 0 .../Occurrence/Jarilo_BackwaterPass_F1.py | 42 ++++++++++ route/rogue/route.json | 77 ++++++++++++++++--- tasks/rogue/route/loader.py | 8 +- 5 files changed, 165 insertions(+), 15 deletions(-) rename route/rogue/{Boss => Elite}/Luofu_ArtisanshipCommission_F1.py (100%) create mode 100644 route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py diff --git a/route/rogue/Combat/Jarilo_GreatMine_F1.py b/route/rogue/Combat/Jarilo_GreatMine_F1.py index 3b035c161..123f99673 100644 --- a/route/rogue/Combat/Jarilo_GreatMine_F1.py +++ b/route/rogue/Combat/Jarilo_GreatMine_F1.py @@ -77,6 +77,41 @@ class Route(RouteBase): enemy4.straight_run(), ) + def Jarilo_GreatMine_F1_X485Y450(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((485.4, 450.4)), | 177.8 | 172 | + | item1 | Waypoint((478.8, 484.8)), | 199.8 | 193 | + | item2 | Waypoint((488.4, 522.0)), | 175.8 | 170 | + | enemy3 | Waypoint((465.3, 531.1)), | 92.8 | 232 | + | enemy5 | Waypoint((546.2, 514.0)), | 45.8 | 225 | + | enemy4 | Waypoint((512.2, 548.2)), | 59.1 | 59 | + | 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 | + """ + self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(485.4, 450.4)) + self.register_domain_exit(Waypoint((549.0, 515.6)), end_rotation=15) + item1 = Waypoint((478.8, 484.8)) + item2 = Waypoint((488.4, 522.0)) + enemy3 = Waypoint((465.3, 531.1)) + enemy5 = Waypoint((546.2, 514.0)) + enemy4 = Waypoint((512.2, 548.2)) + item3 = Waypoint((460.3, 570.3)) + node4 = Waypoint((480.3, 575.6)) + # ===== End of generated waypoints ===== + + self.clear_item(item1) + self.clear_item(item2) + self.clear_enemy(enemy3.straight_run()) + self.clear_item(item3.straight_run()) + self.clear_enemy( + node4.straight_run(), + enemy4.straight_run(), + ) + self.clear_enemy(enemy5.straight_run()) + def Jarilo_GreatMine_F1_X545Y513(self): """ | Waypoint | Position | Direction | Rotation | @@ -122,3 +157,21 @@ class Route(RouteBase): self.clear_enemy( enemy3.straight_run(), ) + + def Jarilo_GreatMine_F1_X84Y378(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------ | --------- | -------- | + | spawn | Waypoint((84.4, 378.7)), | 334.8 | 331 | + | item | Waypoint((60.2, 358.5)), | 319.8 | 308 | + | enemy | Waypoint((56.2, 330.8)), | 340.7 | 149 | + | exit | Waypoint((57.4, 329.5)), | 22.8 | 334 | + """ + self.map_init(plane=Jarilo_GreatMine, floor="F1", position=(84.4, 378.7)) + self.register_domain_exit(Waypoint((57.4, 329.5)), end_rotation=334) + item = Waypoint((60.2, 358.5)) + enemy = Waypoint((56.2, 330.8)) + # ===== End of generated waypoints ===== + + self.clear_item(item) + self.clear_enemy(enemy) diff --git a/route/rogue/Boss/Luofu_ArtisanshipCommission_F1.py b/route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py similarity index 100% rename from route/rogue/Boss/Luofu_ArtisanshipCommission_F1.py rename to route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py diff --git a/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py b/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py new file mode 100644 index 000000000..d838b34f1 --- /dev/null +++ b/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py @@ -0,0 +1,42 @@ +from tasks.map.control.waypoint import Waypoint +from tasks.map.keywords.plane import Jarilo_BackwaterPass +from tasks.rogue.route.base import RouteBase + + +class Route(RouteBase): + + def Jarilo_BackwaterPass_F1_X437Y101(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((437.5, 101.5)), | 96.7 | 91 | + | item | Waypoint((458.6, 92.2)), | 67.2 | 57 | + | event | Waypoint((476.8, 108.9)), | 103.8 | 96 | + | exit | Waypoint((483.4, 105.3)), | 4.1 | 89 | + """ + self.map_init(plane=Jarilo_BackwaterPass, floor="F1", position=(437.5, 101.5)) + self.register_domain_exit(Waypoint((483.4, 105.3)), end_rotation=89) + item = Waypoint((458.6, 92.2)) + event = Waypoint((476.8, 108.9)) + + self.clear_item(item) + self.clear_event(event) + # ===== End of generated waypoints ===== + + def Jarilo_BackwaterPass_F1_X613Y755(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((613.3, 755.7)), | 319.8 | 318 | + | item | Waypoint((603.0, 734.6)), | 342.6 | 343 | + | event | Waypoint((586.8, 724.7)), | 318.0 | 315 | + | exit | Waypoint((568.6, 730.6)), | 274.2 | 271 | + """ + self.map_init(plane=Jarilo_BackwaterPass, floor="F1", position=(613.3, 755.7)) + self.register_domain_exit(Waypoint((568.6, 730.6)), end_rotation=271) + item = Waypoint((603.0, 734.6)) + event = Waypoint((586.8, 724.7)) + + self.clear_item(item) + self.clear_event(event) + # ===== End of generated waypoints ===== diff --git a/route/rogue/route.json b/route/rogue/route.json index 2efb1af38..440a512ec 100644 --- a/route/rogue/route.json +++ b/route/rogue/route.json @@ -1,15 +1,4 @@ [ - { - "name": "Boss_Luofu_ArtisanshipCommission_F1_X506Y495", - "route": "route.rogue.Boss.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X506Y495", - "plane": "Luofu_ArtisanshipCommission", - "floor": "F1", - "position": [ - 506.0, - 495.4 - ], - "domain": "Boss" - }, { "name": "Combat_Herta_StorageZone_F1_X257Y85", "route": "route.rogue.Combat.Herta_StorageZone_F1:Herta_StorageZone_F1_X257Y85", @@ -164,6 +153,28 @@ ], "domain": "Combat" }, + { + "name": "Combat_Jarilo_GreatMine_F1_X485Y452", + "route": "route.rogue.Combat.Jarilo_GreatMine_F1:Jarilo_GreatMine_F1_X485Y452", + "plane": "Jarilo_GreatMine", + "floor": "F1", + "position": [ + 485.4, + 450.4 + ], + "domain": "Combat" + }, + { + "name": "Combat_Jarilo_GreatMine_F1_X485Y450", + "route": "route.rogue.Combat.Jarilo_GreatMine_F1:Jarilo_GreatMine_F1_X485Y450", + "plane": "Jarilo_GreatMine", + "floor": "F1", + "position": [ + 485.5, + 450.4 + ], + "domain": "Combat" + }, { "name": "Combat_Jarilo_GreatMine_F1_X545Y513", "route": "route.rogue.Combat.Jarilo_GreatMine_F1:Jarilo_GreatMine_F1_X545Y513", @@ -175,6 +186,17 @@ ], "domain": "Combat" }, + { + "name": "Combat_Jarilo_GreatMine_F1_X84Y378", + "route": "route.rogue.Combat.Jarilo_GreatMine_F1:Jarilo_GreatMine_F1_X84Y378", + "plane": "Jarilo_GreatMine", + "floor": "F1", + "position": [ + 84.4, + 378.7 + ], + "domain": "Combat" + }, { "name": "Combat_Jarilo_RivetTown_F1_X181Y439", "route": "route.rogue.Combat.Jarilo_RivetTown_F1:Jarilo_RivetTown_F1_X181Y439", @@ -373,6 +395,17 @@ ], "domain": "Elite" }, + { + "name": "Elite_Luofu_ArtisanshipCommission_F1_X506Y495", + "route": "route.rogue.Elite.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X506Y495", + "plane": "Luofu_ArtisanshipCommission", + "floor": "F1", + "position": [ + 506.0, + 495.4 + ], + "domain": "Elite" + }, { "name": "Elite_Luofu_Cloudford_F1_X337Y1003", "route": "route.rogue.Elite.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X337Y1003", @@ -384,6 +417,28 @@ ], "domain": "Elite" }, + { + "name": "Occurrence_Jarilo_BackwaterPass_F1_X437Y101", + "route": "route.rogue.Occurrence.Jarilo_BackwaterPass_F1:Jarilo_BackwaterPass_F1_X437Y101", + "plane": "Jarilo_BackwaterPass", + "floor": "F1", + "position": [ + 437.5, + 101.5 + ], + "domain": "Occurrence" + }, + { + "name": "Occurrence_Jarilo_BackwaterPass_F1_X613Y755", + "route": "route.rogue.Occurrence.Jarilo_BackwaterPass_F1:Jarilo_BackwaterPass_F1_X613Y755", + "plane": "Jarilo_BackwaterPass", + "floor": "F1", + "position": [ + 613.3, + 755.7 + ], + "domain": "Occurrence" + }, { "name": "Occurrence_Luofu_ArtisanshipCommission_F1_X169Y491", "route": "route.rogue.Occurrence.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X169Y491", diff --git a/tasks/rogue/route/loader.py b/tasks/rogue/route/loader.py index 8abcd5ba1..d1196b4e2 100644 --- a/tasks/rogue/route/loader.py +++ b/tasks/rogue/route/loader.py @@ -72,11 +72,11 @@ class RouteLoader(RouteLoader_, MainPage): visited = [] for route in self.all_route: if plane.rogue_domain and plane.rogue_domain != route.domain: - if plane.rogue_domain == 'Transaction' and route.is_DomainOccurrence: - # Treat "Transaction" as "Occurrence" + if plane.rogue_domain in ['Encounter', 'Transaction'] and route.is_DomainOccurrence: + # Treat as "Occurrence" pass - elif plane.rogue_domain == 'Encounter' and route.is_DomainOccurrence: - # Treat "Encounter" as "Occurrence" + if plane.rogue_domain in ['Boss'] and route.is_DomainElite: + # Treat as "Elite" pass else: continue