From 616c4a19ca944d0c00c633c717bbfd5521199616 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Thu, 7 Dec 2023 00:42:10 +0800
Subject: [PATCH] Upd: Rogue routes

---
 route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py      | 2 +-
 route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py         | 6 +++---
 route/rogue/Occurrence/Jarilo_CorridorofFadingEchoes_F1.py  | 6 +++++-
 route/rogue/Occurrence/Luofu_Cloudford_F1.py                | 3 +++
 .../Respite/Jarilo_SilvermaneGuardRestrictedZone_F1.py      | 2 ++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py
index 6d6fd5841..12d715200 100644
--- a/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py
+++ b/route/rogue/Combat/Jarilo_CorridorofFadingEchoes_F1.py
@@ -229,7 +229,7 @@ class Route(RouteBase):
         enemy2 = Waypoint((556.4, 206.8))
         # ===== End of generated waypoints =====
 
-        self.rotation_set(135)
+        self.rotation_set(120)
         self.clear_item(item)
         self.clear_enemy(enemy1)
         self.rotation_set(180)
diff --git a/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py b/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py
index 89384289e..efd007337 100644
--- a/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py
+++ b/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py
@@ -89,7 +89,7 @@ class Route(RouteBase):
         | -------- | ------------------------- | --------- | -------- |
         | 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      |
+        | node2    | Waypoint((491.3, 269.4)), | 339.1     | 334      |
         | 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       |
@@ -101,7 +101,7 @@ class Route(RouteBase):
             Waypoint((485.0, 211.7)), end_rotation=15,
             left_door=Waypoint((481.4, 207.3)), right_door=Waypoint((491.0, 209.4)))
         enemy1 = Waypoint((495.3, 273.7))
-        node2 = Waypoint((482.8, 252.6))
+        node2 = Waypoint((491.3, 269.4))
         enemy2 = Waypoint((485.0, 211.7))
         item2 = Waypoint((472.6, 228.6))
         # ===== End of generated waypoints =====
@@ -111,7 +111,7 @@ class Route(RouteBase):
         self.rotation_set(0)
         self.minimap.lock_rotation(0)
         self.clear_item(
-            node2,
+            node2.set_threshold(5),
             item2,
         )
         self.clear_enemy(
diff --git a/route/rogue/Occurrence/Jarilo_CorridorofFadingEchoes_F1.py b/route/rogue/Occurrence/Jarilo_CorridorofFadingEchoes_F1.py
index 31ec7f558..ca5cd5c92 100644
--- a/route/rogue/Occurrence/Jarilo_CorridorofFadingEchoes_F1.py
+++ b/route/rogue/Occurrence/Jarilo_CorridorofFadingEchoes_F1.py
@@ -32,9 +32,13 @@ class Route(RouteBase):
         | item     | Waypoint((250.1, 970.4)),  | 157.2     | 244      |
         | event    | Waypoint((231.8, 991.0)),  | 233.9     | 230      |
         | exit_    | Waypoint((227.6, 1000.4)), | 229.9     | 228      |
+        | exit1    | Waypoint((227.6, 1007.8)), | 223.8     | 223      |
+        | exit2    | Waypoint((221.4, 999.5)),  | 223.8     | 223      |
         """
         self.map_init(plane=Jarilo_CorridorofFadingEchoes, floor="F1", position=(265.5, 963.6))
-        self.register_domain_exit(Waypoint((227.6, 1000.4)), end_rotation=228)
+        self.register_domain_exit(
+            Waypoint((227.6, 1000.4)), end_rotation=228,
+            left_door=Waypoint((227.6, 1007.8)), right_door=Waypoint((221.4, 999.5)))
         item = Waypoint((250.1, 970.4))
         event = Waypoint((231.8, 991.0))
 
diff --git a/route/rogue/Occurrence/Luofu_Cloudford_F1.py b/route/rogue/Occurrence/Luofu_Cloudford_F1.py
index 7de6f83e4..56507cd58 100644
--- a/route/rogue/Occurrence/Luofu_Cloudford_F1.py
+++ b/route/rogue/Occurrence/Luofu_Cloudford_F1.py
@@ -1,10 +1,13 @@
+from module.exception import GameStuckError
 from tasks.map.control.waypoint import Waypoint
 from tasks.map.keywords.plane import Luofu_Cloudford
+from tasks.map.route.base import locked_rotation
 from tasks.rogue.route.base import RouteBase
 
 
 class Route(RouteBase):
 
+    @locked_rotation(270)
     def Luofu_Cloudford_F1_X241Y947(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
diff --git a/route/rogue/Respite/Jarilo_SilvermaneGuardRestrictedZone_F1.py b/route/rogue/Respite/Jarilo_SilvermaneGuardRestrictedZone_F1.py
index c9cc147e2..7d0cc2eb4 100644
--- a/route/rogue/Respite/Jarilo_SilvermaneGuardRestrictedZone_F1.py
+++ b/route/rogue/Respite/Jarilo_SilvermaneGuardRestrictedZone_F1.py
@@ -1,10 +1,12 @@
 from tasks.map.control.waypoint import Waypoint
 from tasks.map.keywords.plane import Jarilo_SilvermaneGuardRestrictedZone
+from tasks.map.route.base import locked_position
 from tasks.rogue.route.base import RouteBase
 
 
 class Route(RouteBase):
 
+    @locked_position
     def Jarilo_SilvermaneGuardRestrictedZone_F1_X777Y199(self):
         """
         | Waypoint | Position                  | Direction | Rotation |