diff --git a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py index cf6e38389..24ab8771f 100644 --- a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py +++ b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py @@ -136,7 +136,7 @@ class Route(RouteBase): self.clear_enemy(enemy1) self.clear_enemy( enemy2right.straight_run(), - enemy2left.straight_run(), + enemy2left.straight_run().set_threshold(3), ) self.clear_enemy( node3.straight_run(), diff --git a/route/rogue/Combat/Jarilo_RivetTown_F1.py b/route/rogue/Combat/Jarilo_RivetTown_F1.py index 7d13793b5..67197f6a3 100644 --- a/route/rogue/Combat/Jarilo_RivetTown_F1.py +++ b/route/rogue/Combat/Jarilo_RivetTown_F1.py @@ -58,6 +58,7 @@ class Route(RouteBase): enemy = Waypoint((137.0, 438.1)) # ===== End of generated waypoints ===== + self.minimap.init_position(item.position, locked=True) self.clear_item(item) self.clear_enemy(enemy) diff --git a/route/rogue/Combat/Luofu_ArtisanshipCommission_F1.py b/route/rogue/Combat/Luofu_ArtisanshipCommission_F1.py index 56aaf30b3..3df77af52 100644 --- a/route/rogue/Combat/Luofu_ArtisanshipCommission_F1.py +++ b/route/rogue/Combat/Luofu_ArtisanshipCommission_F1.py @@ -39,7 +39,8 @@ class Route(RouteBase): enemy = Waypoint((216.2, 860.2)) # ===== End of generated waypoints ===== - self.clear_item(item) + # ignore item, randomly generated + # self.clear_item(item) self.clear_enemy(enemy) def Luofu_ArtisanshipCommission_F1_X655Y537(self): diff --git a/route/rogue/Combat/Luofu_Cloudford_F1Rogue.py b/route/rogue/Combat/Luofu_Cloudford_F1Rogue.py index e5e3e2d95..479ca7815 100644 --- a/route/rogue/Combat/Luofu_Cloudford_F1Rogue.py +++ b/route/rogue/Combat/Luofu_Cloudford_F1Rogue.py @@ -16,7 +16,7 @@ class Route(RouteBase): | enemy2top | Waypoint((214.6, 432.8)), | 94.1 | 87 | | enemy2bottom_X212Y483 | Waypoint((211.4, 483.3)), | 191.8 | 174 | | enemy3 | Waypoint((288.0, 452.2)), | 87.7 | 260 | - | exit_X288Y454 | Waypoint((291.8, 454.4)), | 5.7 | 91 | + | exit_X291Y454 | Waypoint((291.8, 454.4)), | 5.7 | 91 | """ self.map_init(plane=Luofu_Cloudford, floor="F1Rogue", position=(49.3, 405.6)) self.register_domain_exit(Waypoint((291.8, 454.4)), end_rotation=91) diff --git a/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py b/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py index 70024ad4c..0ca14c329 100644 --- a/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py +++ b/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py @@ -63,6 +63,34 @@ class Route(RouteBase): self.clear_enemy(enemy1) self.clear_enemy(enemy2.straight_run()) + def Luofu_ScalegorgeWaterscape_F1_X567Y280(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((567.4, 280.2)), | 274.2 | 274 | + | enemy1 | Waypoint((495.3, 273.7)), | 219.9 | 292 | + | node2 | Waypoint((482.8, 252.6)), | 337.3 | 336 | + | enemy2 | Waypoint((485.0, 211.7)), | 17.3 | 15 | + | item2 | Waypoint((472.6, 228.6)), | 342.0 | 343 | + | exit | Waypoint((485.0, 211.7)), | 17.3 | 15 | + """ + self.map_init(plane=Luofu_ScalegorgeWaterscape, floor="F1", position=(567.4, 280.2)) + self.register_domain_exit(Waypoint((485.0, 211.7)), end_rotation=15) + enemy1 = Waypoint((495.3, 273.7)) + node2 = Waypoint((482.8, 252.6)) + enemy2 = Waypoint((485.0, 211.7)) + item2 = Waypoint((472.6, 228.6)) + # ===== End of generated waypoints ===== + + self.clear_enemy(enemy1) + self.clear_item( + node2.straight_run(), + item2.straight_run(), + ) + self.clear_enemy( + enemy2.straight_run(), + ) + def Luofu_ScalegorgeWaterscape_F1_X617Y99(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Elite/Herta_SupplyZone_F2.py b/route/rogue/Elite/Herta_SupplyZone_F2.py index cf5985a85..8b9236579 100644 --- a/route/rogue/Elite/Herta_SupplyZone_F2.py +++ b/route/rogue/Elite/Herta_SupplyZone_F2.py @@ -28,8 +28,86 @@ class Route(RouteBase): Notes Herta_SupplyZone_F2_X641Y247 is the same as Herta_SupplyZone_F2_X657Y247 but for wrong spawn point detected + + So do the rest of the routes """ + def Herta_SupplyZone_F2_X674Y247(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((657.1, 247.5)), | 96.7 | 91 | + | enemy | Waypoint((726.4, 246.6)), | 99.0 | 94 | + | reward | Waypoint((738.2, 254.2)), | 166.6 | 112 | + | exit | Waypoint((746.0, 240.0)), | 82.8 | 75 | + """ + self.map_init(plane=Herta_SupplyZone, floor="F2", position=(674, 247.5)) + enemy = Waypoint((726.4, 246.6)) + reward = Waypoint((738.2, 254.2)) + exit_ = Waypoint((746.0, 240.0)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + + def Herta_SupplyZone_F2_X680Y247(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((657.1, 247.5)), | 96.7 | 91 | + | enemy | Waypoint((726.4, 246.6)), | 99.0 | 94 | + | reward | Waypoint((738.2, 254.2)), | 166.6 | 112 | + | exit | Waypoint((746.0, 240.0)), | 82.8 | 75 | + """ + self.map_init(plane=Herta_SupplyZone, floor="F2", position=(680, 247.5)) + enemy = Waypoint((726.4, 246.6)) + reward = Waypoint((738.2, 254.2)) + exit_ = Waypoint((746.0, 240.0)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + + def Herta_SupplyZone_F2_X682Y247(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((657.1, 247.5)), | 96.7 | 91 | + | enemy | Waypoint((726.4, 246.6)), | 99.0 | 94 | + | reward | Waypoint((738.2, 254.2)), | 166.6 | 112 | + | exit | Waypoint((746.0, 240.0)), | 82.8 | 75 | + """ + self.map_init(plane=Herta_SupplyZone, floor="F2", position=(682, 247.5)) + enemy = Waypoint((726.4, 246.6)) + reward = Waypoint((738.2, 254.2)) + exit_ = Waypoint((746.0, 240.0)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + + def Herta_SupplyZone_F2_X684Y247(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((657.1, 247.5)), | 96.7 | 91 | + | enemy | Waypoint((726.4, 246.6)), | 99.0 | 94 | + | reward | Waypoint((738.2, 254.2)), | 166.6 | 112 | + | exit | Waypoint((746.0, 240.0)), | 82.8 | 75 | + """ + self.map_init(plane=Herta_SupplyZone, floor="F2", position=(684, 247.5)) + enemy = Waypoint((726.4, 246.6)) + reward = Waypoint((738.2, 254.2)) + exit_ = Waypoint((746.0, 240.0)) + + self.clear_elite(enemy) + self.domain_reward(reward) + self.domain_single_exit(exit_) + # ===== End of generated waypoints ===== + def Herta_SupplyZone_F2_X657Y247(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Occurrence/Luofu_ScalegorgeWaterscape_F1.py b/route/rogue/Occurrence/Luofu_ScalegorgeWaterscape_F1.py index 90f5ed989..4442d21cd 100644 --- a/route/rogue/Occurrence/Luofu_ScalegorgeWaterscape_F1.py +++ b/route/rogue/Occurrence/Luofu_ScalegorgeWaterscape_F1.py @@ -20,6 +20,24 @@ class Route(RouteBase): self.clear_event(event) # ===== End of generated waypoints ===== + def Luofu_ScalegorgeWaterscape_F1_X619Y387(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((619.4, 387.3)), | 190.1 | 184 | + | item | Waypoint((612.9, 413.0)), | 222.0 | 214 | + | event | Waypoint((622.3, 422.5)), | 190.1 | 186 | + | exit | Waypoint((619.0, 423.6)), | 190.1 | 184 | + """ + self.map_init(plane=Luofu_ScalegorgeWaterscape, floor="F1", position=(619.4, 387.3)) + self.register_domain_exit(Waypoint((619.0, 423.6)), end_rotation=184) + item = Waypoint((612.9, 413.0)) + event = Waypoint((622.3, 422.5)) + + self.clear_item(item) + self.clear_event(event) + # ===== End of generated waypoints ===== + def Luofu_ScalegorgeWaterscape_F1_X714Y243(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Respite/Luofu_ArtisanshipCommission_F1.py b/route/rogue/Respite/Luofu_ArtisanshipCommission_F1.py index 1cc481b14..2098e94d6 100644 --- a/route/rogue/Respite/Luofu_ArtisanshipCommission_F1.py +++ b/route/rogue/Respite/Luofu_ArtisanshipCommission_F1.py @@ -5,6 +5,10 @@ from tasks.rogue.route.base import RouteBase class Route(RouteBase): + def map_init(self, *args, **kwargs): + super().map_init(*args, **kwargs) + self.minimap.init_position(self.minimap.position, locked=True) + def Luofu_ArtisanshipCommission_F1_X299Y863(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Respite/Luofu_ScalegorgeWaterscape_F1.py b/route/rogue/Respite/Luofu_ScalegorgeWaterscape_F1.py index f0ccd4b1f..c1b15f6d7 100644 --- a/route/rogue/Respite/Luofu_ScalegorgeWaterscape_F1.py +++ b/route/rogue/Respite/Luofu_ScalegorgeWaterscape_F1.py @@ -5,21 +5,25 @@ from tasks.rogue.route.base import RouteBase class Route(RouteBase): + def map_init(self, *args, **kwargs): + super().map_init(*args, **kwargs) + self.minimap.init_position(self.minimap.position, locked=True) + def Luofu_ScalegorgeWaterscape_F1_X701Y321(self): """ - | Waypoint | Position | Direction | Rotation | - | -------- | -------------------------- | --------- | -------- | - | spawn | Waypoint((701.5, 320.8)), | 274.2 | 274 | - | herta | Waypoint((673.0, 314.9)), | 300.1 | 297 | - | item | Waypoint((1418.8, 300.8)), | 315.9 | 301 | - | exit | Waypoint((953.0, 279.7)), | 263.8 | 258 | + | Waypoint | Position | Direction | Rotation | + | ------------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((701.5, 320.8)), | 274.2 | 274 | + | item_X691Y314 | Waypoint((691.4, 314.9)), | 315.9 | 301 | + | herta | Waypoint((673.0, 314.9)), | 300.1 | 297 | + | exit_X664Y319 | Waypoint((664.2, 319.4)), | 256.9 | 264 | """ self.map_init(plane=Luofu_ScalegorgeWaterscape, floor="F1", position=(701.5, 320.8)) + item_X691Y314 = Waypoint((691.4, 314.9)) herta = Waypoint((673.0, 314.9)) - item = Waypoint((1418.8, 300.8)) - exit_ = Waypoint((953.0, 279.7)) + exit_X664Y319 = Waypoint((664.2, 319.4)) - self.clear_item(item) + self.clear_item(item_X691Y314) self.domain_herta(herta) - self.domain_single_exit(exit_) + self.domain_single_exit(exit_X664Y319) # ===== End of generated waypoints ===== diff --git a/route/rogue/route.json b/route/rogue/route.json index cde85ee1b..e98d7d43a 100644 --- a/route/rogue/route.json +++ b/route/rogue/route.json @@ -714,6 +714,17 @@ ], "domain": "Combat" }, + { + "name": "Combat_Luofu_ScalegorgeWaterscape_F1_X567Y280", + "route": "route.rogue.Combat.Luofu_ScalegorgeWaterscape_F1:Luofu_ScalegorgeWaterscape_F1_X567Y280", + "plane": "Luofu_ScalegorgeWaterscape", + "floor": "F1", + "position": [ + 567.4, + 280.2 + ], + "domain": "Combat" + }, { "name": "Combat_Luofu_ScalegorgeWaterscape_F1_X617Y99", "route": "route.rogue.Combat.Luofu_ScalegorgeWaterscape_F1:Luofu_ScalegorgeWaterscape_F1_X617Y99", @@ -835,6 +846,50 @@ ], "domain": "Elite" }, + { + "name": "Elite_Herta_SupplyZone_F2_X674Y247", + "route": "route.rogue.Elite.Herta_SupplyZone_F2:Herta_SupplyZone_F2_X674Y247", + "plane": "Herta_SupplyZone", + "floor": "F2", + "position": [ + 674.0, + 247.5 + ], + "domain": "Elite" + }, + { + "name": "Elite_Herta_SupplyZone_F2_X680Y247", + "route": "route.rogue.Elite.Herta_SupplyZone_F2:Herta_SupplyZone_F2_X680Y247", + "plane": "Herta_SupplyZone", + "floor": "F2", + "position": [ + 680.0, + 247.5 + ], + "domain": "Elite" + }, + { + "name": "Elite_Herta_SupplyZone_F2_X682Y247", + "route": "route.rogue.Elite.Herta_SupplyZone_F2:Herta_SupplyZone_F2_X682Y247", + "plane": "Herta_SupplyZone", + "floor": "F2", + "position": [ + 682.0, + 247.5 + ], + "domain": "Elite" + }, + { + "name": "Elite_Herta_SupplyZone_F2_X684Y247", + "route": "route.rogue.Elite.Herta_SupplyZone_F2:Herta_SupplyZone_F2_X684Y247", + "plane": "Herta_SupplyZone", + "floor": "F2", + "position": [ + 684.0, + 247.5 + ], + "domain": "Elite" + }, { "name": "Elite_Herta_SupplyZone_F2_X657Y247", "route": "route.rogue.Elite.Herta_SupplyZone_F2:Herta_SupplyZone_F2_X657Y247", @@ -1319,6 +1374,17 @@ ], "domain": "Occurrence" }, + { + "name": "Occurrence_Luofu_ScalegorgeWaterscape_F1_X619Y387", + "route": "route.rogue.Occurrence.Luofu_ScalegorgeWaterscape_F1:Luofu_ScalegorgeWaterscape_F1_X619Y387", + "plane": "Luofu_ScalegorgeWaterscape", + "floor": "F1", + "position": [ + 619.4, + 387.3 + ], + "domain": "Occurrence" + }, { "name": "Occurrence_Luofu_ScalegorgeWaterscape_F1_X714Y243", "route": "route.rogue.Occurrence.Luofu_ScalegorgeWaterscape_F1:Luofu_ScalegorgeWaterscape_F1_X714Y243", diff --git a/tasks/rogue/bleesing/blessing.py b/tasks/rogue/bleesing/blessing.py index 9da76c8b2..73eb11009 100644 --- a/tasks/rogue/bleesing/blessing.py +++ b/tasks/rogue/bleesing/blessing.py @@ -131,7 +131,6 @@ class RogueBlessingSelector(RogueSelector): if blessing_count != len(results): logger.warning(f"The OCR result does not match the blessing count. " f"Expect {blessing_count}, but recognized {len(results)} only.") - exit(1) for result in results: if result in enhanced_blessing: result.matched_keyword.enhancement = KEYWORDS_ROGUE_ENHANCEMENT.Already_Enhanced.enhancement_keyword