From 9ab86eb1c7724defb5b81f3864a30a40a5dcc8f2 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Wed, 13 Mar 2024 01:05:19 +0800
Subject: [PATCH] Upd: Rogue routes

---
 route/rogue/Combat/Luofu_Cloudford_F1.py      | 36 +++++++++++++++++++
 .../rogue/Elite/Luofu_AlchemyCommission_F2.py | 28 ++++++++++++++-
 route/rogue/route.json                        | 22 ++++++++++++
 3 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/route/rogue/Combat/Luofu_Cloudford_F1.py b/route/rogue/Combat/Luofu_Cloudford_F1.py
index a89d53f6e..a8c5fde6e 100644
--- a/route/rogue/Combat/Luofu_Cloudford_F1.py
+++ b/route/rogue/Combat/Luofu_Cloudford_F1.py
@@ -168,6 +168,7 @@ class Route(RouteBase):
         enemy2 = Waypoint((273.9, 584.9))
         # ===== End of generated waypoints =====
 
+        self.rotation_set(270)
         # 1
         self.clear_item(
             item1.straight_run(),
@@ -179,6 +180,41 @@ class Route(RouteBase):
         self.clear_item(item2)
         self.clear_enemy(enemy2)
 
+    def Luofu_Cloudford_F1_X433Y617(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((433.5, 616.8)), | 358.2     | 4        |
+        | node1    | Waypoint((431.5, 593.4)), | 2.7       | 357      |
+        | item1    | Waypoint((371.8, 592.8)), | 263.8     | 267      |
+        | enemy1   | Waypoint((341.2, 586.8)), | 274.2     | 274      |
+        | item2    | Waypoint((310.4, 582.2)), | 289.0     | 288      |
+        | enemy2   | Waypoint((273.9, 584.9)), | 274.1     | 271      |
+        | exit_    | Waypoint((273.9, 584.9)), | 274.1     | 271      |
+        """
+        self.map_init(plane=Luofu_Cloudford, floor="F1", position=(433.5, 616.8))
+        self.register_domain_exit(Waypoint((273.9, 584.9)), end_rotation=271)
+        node1 = Waypoint((431.5, 593.4))
+        item1 = Waypoint((371.8, 592.8))
+        enemy1 = Waypoint((341.2, 586.8))
+        item2 = Waypoint((310.4, 582.2))
+        enemy2 = Waypoint((273.9, 584.9))
+        # ===== End of generated waypoints =====
+
+        # Similar to Luofu_Cloudford_F1_X431Y593, but has different spawn point
+        self.rotation_set(270)
+        # 1
+        self.clear_item(
+            node1.set_threshold(3),
+            item1.straight_run(),
+        )
+        self.clear_enemy(
+            enemy1.straight_run(),
+        )
+        # 2
+        self.clear_item(item2)
+        self.clear_enemy(enemy2)
+
     def Luofu_Cloudford_F1_X435Y669(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
diff --git a/route/rogue/Elite/Luofu_AlchemyCommission_F2.py b/route/rogue/Elite/Luofu_AlchemyCommission_F2.py
index 84b0c2e61..1f3cd0cfa 100644
--- a/route/rogue/Elite/Luofu_AlchemyCommission_F2.py
+++ b/route/rogue/Elite/Luofu_AlchemyCommission_F2.py
@@ -1,6 +1,5 @@
 from tasks.map.control.waypoint import Waypoint
 from tasks.map.keywords.plane import Luofu_AlchemyCommission
-from tasks.map.route.base import locked_position
 from tasks.rogue.route.base import RouteBase
 
 
@@ -24,3 +23,30 @@ class Route(RouteBase):
         self.domain_reward(reward)
         self.domain_single_exit(exit_)
         # ===== End of generated waypoints =====
+
+    def Luofu_AlchemyCommission_F2_X664Y545(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((623.1, 590.0)), | 282.2     | 274      |
+        | enemy    | Waypoint((571.6, 589.5)), | 282.0     | 274      |
+        | reward   | Waypoint((563.5, 581.4)), | 281.9     | 274      |
+        | exit_    | Waypoint((555.5, 597.3)), | 267.8     | 264      |
+        """
+        self.map_init(plane=Luofu_AlchemyCommission, floor="F2", position=(664.2, 546.8))
+        enemy = Waypoint((571.6, 589.5))
+        reward = Waypoint((563.5, 581.4))
+        exit_ = Waypoint((555.5, 597.3))
+
+        self.clear_elite(enemy)
+        self.domain_reward(reward)
+        self.domain_single_exit(exit_)
+        # ===== End of generated waypoints =====
+
+        """
+        Notes
+        Luofu_AlchemyCommission_F2_X664Y545 is the same as Luofu_AlchemyCommission_F2_X625Y590
+        but for wrong spawn point detected
+
+        Spawn point is too far from the correct result but should be fine in Boss room
+        """
diff --git a/route/rogue/route.json b/route/rogue/route.json
index 6d3506c3e..198c9be88 100644
--- a/route/rogue/route.json
+++ b/route/rogue/route.json
@@ -868,6 +868,17 @@
     ],
     "domain": "Combat"
   },
+  {
+    "name": "Combat_Luofu_Cloudford_F1_X433Y617",
+    "route": "route.rogue.Combat.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X433Y617",
+    "plane": "Luofu_Cloudford",
+    "floor": "F1",
+    "position": [
+      433.5,
+      616.8
+    ],
+    "domain": "Combat"
+  },
   {
     "name": "Combat_Luofu_Cloudford_F1_X435Y669",
     "route": "route.rogue.Combat.Luofu_Cloudford_F1:Luofu_Cloudford_F1_X435Y669",
@@ -1330,6 +1341,17 @@
     ],
     "domain": "Elite"
   },
+  {
+    "name": "Elite_Luofu_AlchemyCommission_F2_X664Y545",
+    "route": "route.rogue.Elite.Luofu_AlchemyCommission_F2:Luofu_AlchemyCommission_F2_X664Y545",
+    "plane": "Luofu_AlchemyCommission",
+    "floor": "F2",
+    "position": [
+      664.2,
+      546.8
+    ],
+    "domain": "Elite"
+  },
   {
     "name": "Elite_Luofu_ArtisanshipCommission_F1_X385Y494",
     "route": "route.rogue.Elite.Luofu_ArtisanshipCommission_F1:Luofu_ArtisanshipCommission_F1_X385Y494",