From 8375e8729d4fbe20ecc107b2acede8f73bc0bc9e Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Tue, 14 May 2024 02:17:24 +0800 Subject: [PATCH] Upd: Route copies --- route/rogue/Combat/Luofu_Cloudford_F1.py | 55 +++++++++++++++++++ .../Elite/Jarilo_CorridorofFadingEchoes_F1.py | 30 ++++++++++ .../Elite/Luofu_ArtisanshipCommission_F1.py | 30 ++++++++++ route/rogue/Elite/Luofu_Cloudford_F1.py | 31 +++++++++++ .../rogue/Elite/Luofu_StargazerNavalia_F1.py | 31 +++++++++++ route/rogue/route.json | 55 +++++++++++++++++++ 6 files changed, 232 insertions(+) diff --git a/route/rogue/Combat/Luofu_Cloudford_F1.py b/route/rogue/Combat/Luofu_Cloudford_F1.py index a8c5fde6e..e320e3973 100644 --- a/route/rogue/Combat/Luofu_Cloudford_F1.py +++ b/route/rogue/Combat/Luofu_Cloudford_F1.py @@ -256,3 +256,58 @@ class Route(RouteBase): ) self.clear_item(item4) self.clear_enemy(enemy4) + + def Luofu_Cloudford_F1_X432Y685(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((435.4, 669.2)), | 6.7 | 4 | + | item1 | Waypoint((432.2, 628.3)), | 2.7 | 357 | + | enemy1 | Waypoint((428.6, 598.8)), | 8.0 | 177 | + | node2 | Waypoint((421.2, 590.8)), | 44.2 | 285 | + | 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((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 | + """ + self.map_init(plane=Luofu_Cloudford, floor="F1", position=(432.8, 685.1)) + self.register_domain_exit( + Waypoint((271.3, 585.5)), end_rotation=274, + left_door=Waypoint((267.9, 592.3)), right_door=Waypoint((267.8, 580.0))) + item1 = Waypoint((432.2, 628.3)) + enemy1 = Waypoint((428.6, 598.8)) + node2 = Waypoint((421.2, 590.8)) + node3 = Waypoint((366.6, 588.2)) + enemy3 = Waypoint((344.9, 590.4)) + item4 = Waypoint((309.6, 580.2)) + enemy4 = Waypoint((271.3, 585.5)) + # ===== End of generated waypoints ===== + + self.clear_item(item1) + self.clear_enemy(enemy1) + # Go through bridges + self.rotation_set(270) + self.minimap.lock_rotation(270) + self.clear_enemy( + node2.set_threshold(3), + node3.set_threshold(3), + enemy3, + ) + self.clear_item(item4) + self.clear_enemy(enemy4) + + """ + Notes + Luofu_Cloudford_F1_X435Y685 is the same as Luofu_Cloudford_F1_X435Y669 + but for wrong spawn point detected + """ + # Best 3 predictions: [ + # ('Combat_Luofu_Cloudford_F1_X433Y617', 0.195, (432.8, 668.4)), + # ('Combat_Herta_SupplyZone_F2_X45Y369', 0.18, (24.2, 372.2)), + # ('Combat_Luofu_Cloudford_F1_X435Y669', 0.18, (432.8, 685.1)) + # ] + # (432.9, 684.9) + # ('Combat_Luofu_Cloudford_F1_X435Y669', 0.172, (432.8, 685.0)) diff --git a/route/rogue/Elite/Jarilo_CorridorofFadingEchoes_F1.py b/route/rogue/Elite/Jarilo_CorridorofFadingEchoes_F1.py index db8fb74cc..9438b33b1 100644 --- a/route/rogue/Elite/Jarilo_CorridorofFadingEchoes_F1.py +++ b/route/rogue/Elite/Jarilo_CorridorofFadingEchoes_F1.py @@ -30,6 +30,36 @@ class Route(RouteBase): but for wrong spawn point detected """ + def Jarilo_CorridorofFadingEchoes_F1_X415Y953(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((415.5, 947.9)), | 96.7 | 91 | + | enemy | Waypoint((464.0, 953.0)), | 96.8 | 94 | + | reward | Waypoint((472.7, 958.5)), | 214.6 | 114 | + | exit_ | Waypoint((480.0, 944.0)), | 92.7 | 84 | + """ + self.map_init(plane=Jarilo_CorridorofFadingEchoes, floor="F1", position=(415.4, 953.3)) + enemy = Waypoint((464.0, 953.0)) + reward = Waypoint((472.7, 958.5)) + exit_ = Waypoint((480.0, 944.0)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + + """ + Notes + Jarilo_CorridorofFadingEchoes_F1_X415Y953 is the same as Jarilo_CorridorofFadingEchoes_F1_X415Y947 + but for wrong spawn point detected + """ + # Best 3 predictions: [ + # ('Elite_Jarilo_CorridorofFadingEchoes_F1_X415Y933', 0.169, (415.4, 953.3)), + # ('Elite_Jarilo_CorridorofFadingEchoes_F1_X415Y947', 0.169, (415.4, 953.3)), + # ('Elite_Herta_SupplyZone_F2_X680Y247', 0.162, (738.4, 252.2)) + # ] + def Jarilo_CorridorofFadingEchoes_F1_X415Y947(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py b/route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py index c563530d0..d376ff325 100644 --- a/route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py +++ b/route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py @@ -24,6 +24,36 @@ class Route(RouteBase): self.domain_single_exit(exit_) # ===== End of generated waypoints ===== + def Luofu_ArtisanshipCommission_F1_X391Y493(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=(391.1, 493.2)) + 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 ===== + + """ + Notes + Luofu_ArtisanshipCommission_F1_X391Y493 is the same as Luofu_ArtisanshipCommission_F1_X385Y494 + but for wrong spawn point detected + """ + # Best 3 predictions: [ + # ('Elite_Luofu_ArtisanshipCommission_F1_X385Y494', 0.182, (391.1, 493.2)), + # ('Elite_Jarilo_CorridorofFadingEchoes_F1_X415Y933', 0.157, (364.0, 951.0)), + # ('Elite_Jarilo_CorridorofFadingEchoes_F1_X415Y947', 0.157, (364.0, 951.0)) + # ] + def Luofu_ArtisanshipCommission_F1_X504Y493(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Elite/Luofu_Cloudford_F1.py b/route/rogue/Elite/Luofu_Cloudford_F1.py index 2ade4c4ab..6d9c7d26a 100644 --- a/route/rogue/Elite/Luofu_Cloudford_F1.py +++ b/route/rogue/Elite/Luofu_Cloudford_F1.py @@ -25,3 +25,34 @@ class Route(RouteBase): self.domain_reward(reward) self.domain_single_exit(exit_) # ===== End of generated waypoints ===== + + @locked_rotation(0) + def Luofu_Cloudford_F1_X342Y1003(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | -------------------------- | --------- | -------- | + | spawn | Waypoint((337.3, 1003.4)), | 6.7 | 4 | + | enemy | Waypoint((336.2, 962.2)), | 6.7 | 4 | + | reward | Waypoint((342.9, 950.8)), | 44.2 | 31 | + | exit_ | Waypoint((328.8, 942.8)), | 316.1 | 331 | + """ + self.map_init(plane=Luofu_Cloudford, floor="F1", position=(342.3, 1003.4)) + enemy = Waypoint((336.2, 962.2)) + reward = Waypoint((342.9, 950.8)) + exit_ = Waypoint((328.8, 942.8)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + + """ + Notes + Luofu_Cloudford_F1_X342Y1003 is the same as Luofu_Cloudford_F1_X337Y1003 + but for wrong spawn point detected + """ + # Best 3 predictions: [ + # ('Elite_Luofu_Cloudford_F1_X337Y1003', 0.169, (342.3, 1002.7)), + # ('Elite_Luofu_ArtisanshipCommission_F1_X504Y493', 0.106, (519.3, 452.7)), + # ('Elite_Jarilo_CorridorofFadingEchoes_F1_X415Y933', 0.104, (433.8, 982.0)) + # ] diff --git a/route/rogue/Elite/Luofu_StargazerNavalia_F1.py b/route/rogue/Elite/Luofu_StargazerNavalia_F1.py index ca696d3aa..cc1d221f7 100644 --- a/route/rogue/Elite/Luofu_StargazerNavalia_F1.py +++ b/route/rogue/Elite/Luofu_StargazerNavalia_F1.py @@ -25,3 +25,34 @@ class Route(RouteBase): self.domain_reward(reward) self.domain_single_exit(exit_) # ===== End of generated waypoints ===== + + @locked_rotation(90) + def Luofu_StargazerNavalia_F1_X617Y511(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((617.5, 511.5)), | 96.7 | 91 | + | enemy | Waypoint((664.6, 512.6)), | 96.8 | 94 | + | reward | Waypoint((677.1, 521.2)), | 212.8 | 108 | + | exit_ | Waypoint((684.6, 505.0)), | 91.3 | 82 | + """ + self.map_init(plane=Luofu_StargazerNavalia, floor="F1", position=(617.5, 511.5)) + enemy = Waypoint((664.6, 512.6)) + reward = Waypoint((677.1, 521.2)) + exit_ = Waypoint((684.6, 505.0)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + + """ + Notes + Herta_SupplyZone_F2_X397Y239 is the same as Herta_SupplyZone_F2_X397Y233 + but for wrong spawn point detected + """ + # Best 3 predictions: [ + # ('Elite_Luofu_StargazerNavalia_F1_X617Y511', 0.338, (621.0, 507.0)), + # ('Elite_Luofu_ArtisanshipCommission_F1_X385Y494', 0.203, (329.2, 492.8)), + # ('Elite_Jarilo_SilvermaneGuardRestrictedZone_F1_X225Y425', 0.181, (224.8, 423.2)) + # ] diff --git a/route/rogue/route.json b/route/rogue/route.json index ffb40f57f..6f78834c5 100644 --- a/route/rogue/route.json +++ b/route/rogue/route.json @@ -912,6 +912,17 @@ ], "domain": "Combat" }, + { + "name": "Combat_Luofu_Cloudford_F1_X432Y685", + "route": "route.rogue.Combat.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X432Y685", + "plane": "Luofu_Cloudford", + "floor": "F1", + "position": [ + 432.8, + 685.1 + ], + "domain": "Combat" + }, { "name": "Combat_Luofu_Cloudford_F1Rogue_X59Y405", "route": "route.rogue.Combat.Luofu_Cloudford_F1Rogue:Luofu_Cloudford_F1Rogue_X59Y405", @@ -1297,6 +1308,17 @@ ], "domain": "Elite" }, + { + "name": "Elite_Jarilo_CorridorofFadingEchoes_F1_X415Y953", + "route": "route.rogue.Elite.Jarilo_CorridorofFadingEchoes_F1:Jarilo_CorridorofFadingEchoes_F1_X415Y953", + "plane": "Jarilo_CorridorofFadingEchoes", + "floor": "F1", + "position": [ + 415.4, + 953.3 + ], + "domain": "Elite" + }, { "name": "Elite_Jarilo_CorridorofFadingEchoes_F1_X415Y947", "route": "route.rogue.Elite.Jarilo_CorridorofFadingEchoes_F1:Jarilo_CorridorofFadingEchoes_F1_X415Y947", @@ -1396,6 +1418,17 @@ ], "domain": "Elite" }, + { + "name": "Elite_Luofu_ArtisanshipCommission_F1_X391Y493", + "route": "route.rogue.Elite.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X391Y493", + "plane": "Luofu_ArtisanshipCommission", + "floor": "F1", + "position": [ + 391.1, + 493.2 + ], + "domain": "Elite" + }, { "name": "Elite_Luofu_ArtisanshipCommission_F1_X504Y493", "route": "route.rogue.Elite.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X504Y493", @@ -1418,6 +1451,17 @@ ], "domain": "Elite" }, + { + "name": "Elite_Luofu_Cloudford_F1_X342Y1003", + "route": "route.rogue.Elite.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X342Y1003", + "plane": "Luofu_Cloudford", + "floor": "F1", + "position": [ + 342.3, + 1003.4 + ], + "domain": "Elite" + }, { "name": "Elite_Luofu_DivinationCommission_F2_X338Y345", "route": "route.rogue.Elite.Luofu_DivinationCommission_F2:Luofu_DivinationCommission_F2_X338Y345", @@ -1451,6 +1495,17 @@ ], "domain": "Elite" }, + { + "name": "Elite_Luofu_StargazerNavalia_F1_X617Y511", + "route": "route.rogue.Elite.Luofu_StargazerNavalia_F1:Luofu_StargazerNavalia_F1_X617Y511", + "plane": "Luofu_StargazerNavalia", + "floor": "F1", + "position": [ + 617.5, + 511.5 + ], + "domain": "Elite" + }, { "name": "Occurrence_Herta_StorageZone_F1_X273Y93", "route": "route.rogue.Occurrence.Herta_StorageZone_F1:Herta_StorageZone_F1_X273Y93",