Fix: Rogue route Luofu_StargazerNavalia_F1Rogue_X250Y498

requirements-in.txt

@@ -32,7 +32,7 @@ uvicorn[standard]==0.17.6
 aiofiles
 
 # Game resources
-srcmap==1.3.5
+srcmap==1.3.6
 
 # For dev
 # pip-tools

requirements.txt

@@ -65,7 +65,7 @@ scipy==1.10.1             # via -r requirements-in.txt
 shapely==2.0.1            # via pponnxcr
 six==1.16.0               # via pynput, uiautomator2
 sniffio==1.3.0            # via anyio
-srcmap==1.3.5             # via -r requirements-in.txt
+srcmap==1.3.6             # via -r requirements-in.txt
 starlette==0.14.2         # via -r requirements-in.txt
 sympy==1.12               # via onnxruntime
 tornado==6.3.1            # via pywebio

route/rogue/Occurrence/Luofu_StargazerNavalia_F1.py

@@ -1,32 +1,11 @@
 from tasks.map.control.waypoint import Waypoint
 from tasks.map.keywords.plane import Luofu_StargazerNavalia
-from tasks.map.route.base import locked_position, locked_rotation
+from tasks.map.route.base import locked_position
 from tasks.rogue.route.base import RouteBase
 
 
 class Route(RouteBase):
 
-    @locked_position
-    @locked_rotation(180)
-    def Luofu_StargazerNavalia_F1_X250Y498(self):
-        """
-        | Waypoint       | Position                  | Direction | Rotation |
-        | -------------- | ------------------------- | --------- | -------- |
-        | spawn          | Waypoint((249.4, 498.5)), | 190.1     | 184      |
-        | event          | Waypoint((236.9, 535.2)), | 206.2     | 200      |
-        | exit_          | Waypoint((245.3, 550.1)), | 282.9     | 181      |
-        | exit1_X255Y562 | Waypoint((255.5, 562.5)), | 180.1     | 184      |
-        | exit2_X237Y559 | Waypoint((237.4, 559.3)), | 191.8     | 184      |
-        """
-        self.map_init(plane=Luofu_StargazerNavalia, floor="F1", position=(249.4, 498.5))
-        self.register_domain_exit(
-            Waypoint((245.3, 550.1)), end_rotation=181,
-            left_door=Waypoint((255.5, 562.5)), right_door=Waypoint((237.4, 559.3)))
-        event = Waypoint((236.9, 535.2))
-
-        self.clear_event(event)
-        # ===== End of generated waypoints =====
-
     @locked_position
     def Luofu_StargazerNavalia_F1_X521Y595(self):
         """

route/rogue/Occurrence/Luofu_StargazerNavalia_F1Rogue.py

@@ -0,0 +1,27 @@
+from tasks.map.control.waypoint import Waypoint
+from tasks.map.keywords.plane import Luofu_StargazerNavalia
+from tasks.map.route.base import locked_rotation
+from tasks.rogue.route.base import RouteBase
+
+
+class Route(RouteBase):
+
+    @locked_rotation(180)
+    def Luofu_StargazerNavalia_F1Rogue_X250Y498(self):
+        """
+        | Waypoint       | Position                  | Direction | Rotation |
+        | -------------- | ------------------------- | --------- | -------- |
+        | spawn          | Waypoint((249.4, 498.5)), | 190.1     | 184      |
+        | event          | Waypoint((236.9, 535.2)), | 206.2     | 200      |
+        | exit_          | Waypoint((245.3, 550.1)), | 282.9     | 181      |
+        | exit1_X255Y562 | Waypoint((255.5, 562.5)), | 180.1     | 184      |
+        | exit2_X237Y559 | Waypoint((237.4, 559.3)), | 191.8     | 184      |
+        """
+        self.map_init(plane=Luofu_StargazerNavalia, floor="F1Rogue", position=(249.4, 498.5))
+        self.register_domain_exit(
+            Waypoint((245.3, 550.1)), end_rotation=181,
+            left_door=Waypoint((255.5, 562.5)), right_door=Waypoint((237.4, 559.3)))
+        event = Waypoint((236.9, 535.2))
+
+        self.clear_event(event)
+        # ===== End of generated waypoints =====

route/rogue/route.json

@@ -1847,17 +1847,6 @@
     ],
     "domain": "Occurrence"
   },
-  {
-    "name": "Occurrence_Luofu_StargazerNavalia_F1_X250Y498",
-    "route": "route.rogue.Occurrence.Luofu_StargazerNavalia_F1:Luofu_StargazerNavalia_F1_X250Y498",
-    "plane": "Luofu_StargazerNavalia",
-    "floor": "F1",
-    "position": [
-      249.4,
-      498.5
-    ],
-    "domain": "Occurrence"
-  },
   {
     "name": "Occurrence_Luofu_StargazerNavalia_F1_X521Y595",
     "route": "route.rogue.Occurrence.Luofu_StargazerNavalia_F1:Luofu_StargazerNavalia_F1_X521Y595",
@@ -1869,6 +1858,17 @@
     ],
     "domain": "Occurrence"
   },
+  {
+    "name": "Occurrence_Luofu_StargazerNavalia_F1Rogue_X250Y498",
+    "route": "route.rogue.Occurrence.Luofu_StargazerNavalia_F1Rogue:Luofu_StargazerNavalia_F1Rogue_X250Y498",
+    "plane": "Luofu_StargazerNavalia",
+    "floor": "F1Rogue",
+    "position": [
+      249.4,
+      498.5
+    ],
+    "domain": "Occurrence"
+  },
   {
     "name": "Occurrence_Luofu_StargazerNavalia_F2_X579Y183",
     "route": "route.rogue.Occurrence.Luofu_StargazerNavalia_F2:Luofu_StargazerNavalia_F2_X579Y183",

tasks/map/resource/resource.py

@@ -18,6 +18,7 @@ SPECIAL_PLANES = [
     ('Herta_StorageZone', 'F2Rogue'),
     ('Jarilo_GreatMine', 'F1RogueOcc'),
     ('Luofu_Cloudford', 'F1Rogue'),
+    ('Luofu_StargazerNavalia', 'F1Rogue'),
     ('Luofu_StargazerNavalia', 'F2Rogue'),
 ]