diff --git a/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py b/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py index 40837f7d6..5435f1f37 100644 --- a/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py +++ b/route/rogue/Combat/Jarilo_SilvermaneGuardRestrictedZone_F1.py @@ -86,6 +86,34 @@ class Route(RouteBase): # Ignore item self.clear_enemy(enemy) + def Jarilo_SilvermaneGuardRestrictedZone_F1_X227Y432(self): + """ + | Waypoint | Position | Direction | Rotation | + | -------- | ------------------------- | --------- | -------- | + | spawn | Waypoint((227.7, 425.5)), | 274.2 | 274 | + | item | Waypoint((208.3, 414.8)), | 303.8 | 301 | + | enemy | Waypoint((170.2, 426.2)), | 274.2 | 274 | + | exit_ | Waypoint((170.2, 426.2)), | 274.2 | 274 | + | exit1 | Waypoint((158.5, 432.5)), | 282.0 | 274 | + | exit2 | Waypoint((158.8, 418.6)), | 282.0 | 274 | + """ + self.map_init(plane=Jarilo_SilvermaneGuardRestrictedZone, floor="F1", position=(227.7, 432)) + self.register_domain_exit( + Waypoint((170.2, 426.2)), end_rotation=274, + left_door=Waypoint((158.5, 432.5)), right_door=Waypoint((158.8, 418.6))) + item = Waypoint((208.3, 414.8)) + enemy = Waypoint((170.2, 426.2)) + # ===== End of generated waypoints ===== + + # Ignore item + self.clear_enemy(enemy) + + """ + Notes + Jarilo_SilvermaneGuardRestrictedZone_F1_X227Y432 is the same as Jarilo_SilvermaneGuardRestrictedZone_F1_X227Y425 + but for wrong spawn point detected + """ + def Jarilo_SilvermaneGuardRestrictedZone_F1_X317Y425(self): """ | Waypoint | Position | Direction | Rotation | diff --git a/route/rogue/Combat/Luofu_Cloudford_F2.py b/route/rogue/Combat/Luofu_Cloudford_F2.py index 07eb9dc1b..e9eda1a17 100644 --- a/route/rogue/Combat/Luofu_Cloudford_F2.py +++ b/route/rogue/Combat/Luofu_Cloudford_F2.py @@ -28,6 +28,8 @@ class Route(RouteBase): enemy3 = Waypoint((320.2, 266.4)) # ===== End of generated waypoints ===== + # Look right + self.rotation_set(210) self.clear_enemy(enemy1) # Enemy2 self.clear_enemy( diff --git a/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py b/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py index a1e0d1f51..35d322a9b 100644 --- a/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py +++ b/route/rogue/Occurrence/Jarilo_BackwaterPass_F1.py @@ -13,9 +13,13 @@ class Route(RouteBase): | 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 | + | exit1 | Waypoint((489.7, 97.3)), | 101.1 | 91 | + | exit2 | Waypoint((489.4, 111.4)), | 101.1 | 91 | """ 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) + self.register_domain_exit( + Waypoint((483.4, 105.3)), end_rotation=89, + left_door=Waypoint((489.7, 97.3)), right_door=Waypoint((489.4, 111.4))) item = Waypoint((458.6, 92.2)) event = Waypoint((476.8, 108.9)) diff --git a/route/rogue/route.json b/route/rogue/route.json index cd8d00d89..190ce619a 100644 --- a/route/rogue/route.json +++ b/route/rogue/route.json @@ -571,6 +571,17 @@ ], "domain": "Combat" }, + { + "name": "Combat_Jarilo_SilvermaneGuardRestrictedZone_F1_X227Y432", + "route": "route.rogue.Combat.Jarilo_SilvermaneGuardRestrictedZone_F1:Jarilo_SilvermaneGuardRestrictedZone_F1_X227Y432", + "plane": "Jarilo_SilvermaneGuardRestrictedZone", + "floor": "F1", + "position": [ + 227.7, + 432.0 + ], + "domain": "Combat" + }, { "name": "Combat_Jarilo_SilvermaneGuardRestrictedZone_F1_X317Y425", "route": "route.rogue.Combat.Jarilo_SilvermaneGuardRestrictedZone_F1:Jarilo_SilvermaneGuardRestrictedZone_F1_X317Y425", diff --git a/tasks/rogue/route/loader.py b/tasks/rogue/route/loader.py index 196dbe872..abc3b4a03 100644 --- a/tasks/rogue/route/loader.py +++ b/tasks/rogue/route/loader.py @@ -272,7 +272,7 @@ class RouteLoader(RogueUI, MinimapWrapper, RouteLoader_, CharacterSwitch): if __name__ == '__main__': - self = RouteLoader('1101九', task='Rogue') + self = RouteLoader('src', task='Rogue') # self.image_file = r'' self.device.screenshot() self.position_find()