From c3a3f43b556241a00aadfae62105e27a3fdc3f18 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Tue, 24 Oct 2023 00:22:28 +0800
Subject: [PATCH] Upd: Rogue routes

---
 route/rogue/Combat/Luofu_Cloudford_F1.py           |  6 ++++--
 .../rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py  |  9 ++++++---
 .../Occurrence/Luofu_ScalegorgeWaterscape_F1.py    | 14 +++++++-------
 tasks/rogue/bleesing/blessing.py                   |  3 ++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/route/rogue/Combat/Luofu_Cloudford_F1.py b/route/rogue/Combat/Luofu_Cloudford_F1.py
index 6af706c97..17208da30 100644
--- a/route/rogue/Combat/Luofu_Cloudford_F1.py
+++ b/route/rogue/Combat/Luofu_Cloudford_F1.py
@@ -179,9 +179,11 @@ class Route(RouteBase):
         self.clear_item(item1)
         self.clear_enemy(enemy1)
         # Go through bridges
+        self.rotation_set(270)
+        self.minimap.lock_rotation(270)
         self.clear_enemy(
-            node2.straight_run().set_threshold(3),
-            node3.straight_run().set_threshold(3),
+            node2.straight_run(),
+            node3.straight_run(),
             enemy3.straight_run(),
         )
         self.clear_item(item4)
diff --git a/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py b/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py
index ea5591a54..b8c320844 100644
--- a/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py
+++ b/route/rogue/Combat/Luofu_ScalegorgeWaterscape_F1.py
@@ -84,13 +84,16 @@ class Route(RouteBase):
         item2 = Waypoint((472.6, 228.6))
         # ===== End of generated waypoints =====
 
+        self.minimap.lock_rotation(270)
         self.clear_enemy(enemy1)
+        self.rotation_set(0)
+        self.minimap.lock_rotation(0)
         self.clear_item(
-            node2.straight_run(),
-            item2.straight_run(),
+            node2,
+            item2,
         )
         self.clear_enemy(
-            enemy2.straight_run(),
+            enemy2,
         )
 
     def Luofu_ScalegorgeWaterscape_F1_X617Y99(self):
diff --git a/route/rogue/Occurrence/Luofu_ScalegorgeWaterscape_F1.py b/route/rogue/Occurrence/Luofu_ScalegorgeWaterscape_F1.py
index 6d7919fc8..7f7e811a0 100644
--- a/route/rogue/Occurrence/Luofu_ScalegorgeWaterscape_F1.py
+++ b/route/rogue/Occurrence/Luofu_ScalegorgeWaterscape_F1.py
@@ -8,17 +8,17 @@ class Route(RouteBase):
 
     def Luofu_ScalegorgeWaterscape_F1_X499Y135(self):
         """
-        | Waypoint | Position                  | Direction | Rotation |
-        | -------- | ------------------------- | --------- | -------- |
-        | spawn    | Waypoint((499.5, 135.3)), | 190.1     | 184      |
-        | event    | Waypoint((942.8, 291.1)), | 193.0     | 186      |
-        | exit     | Waypoint((499.2, 169.4)), | 187.1     | 179      |
+        | Waypoint       | Position                  | Direction | Rotation |
+        | -------------- | ------------------------- | --------- | -------- |
+        | spawn          | Waypoint((499.5, 135.3)), | 190.1     | 184      |
+        | event_X500Y169 | Waypoint((500.8, 169.1)), | 193.0     | 186      |
+        | exit           | Waypoint((499.2, 169.4)), | 187.1     | 179      |
         """
         self.map_init(plane=Luofu_ScalegorgeWaterscape, floor="F1", position=(499.5, 135.3))
         self.register_domain_exit(Waypoint((499.2, 169.4)), end_rotation=179)
-        event = Waypoint((942.8, 291.1))
+        event_X500Y169 = Waypoint((500.8, 169.1))
 
-        self.clear_event(event)
+        self.clear_event(event_X500Y169)
         # ===== End of generated waypoints =====
 
     @locked_rotation(180)
diff --git a/tasks/rogue/bleesing/blessing.py b/tasks/rogue/bleesing/blessing.py
index eac928606..ac3e37197 100644
--- a/tasks/rogue/bleesing/blessing.py
+++ b/tasks/rogue/bleesing/blessing.py
@@ -69,7 +69,7 @@ class RogueBuffOcr(Ocr):
                 "天[培梧]步危": "天棓步危",
                 "云[摘销锅]?逐步离": "云镝逐步离",
                 "制桑": "制穹桑",
-                "乌号[綦基]*箭?": "乌号綦箭",
+                "乌号[綦基纂]*箭?": "乌号綦箭",
                 "流岚追摩?物": "流岚追孽物",
                 "特月": "狩月",
                 "彤弓素.*": "彤弓素矰",
@@ -86,6 +86,7 @@ class RogueBuffOcr(Ocr):
                 "厌离邪[移]?苦": "厌离邪秽苦",
                 r".*繁.*": "葳蕤繁祉，延彼遐龄",
                 "回馈底护": "回馈庇护",
+                "[范茫]+白夜": "茫茫白夜",
             }
         elif self.lang == 'en':
             replace_pattern_dict = {