Fix: Routes in Herta_SupplyZone_F2

route/rogue/Combat/Herta_StorageZone_F1.py

@@ -45,12 +45,12 @@ class Route(RouteBase):
         self.clear_item(item1.straight_run())
         self.clear_enemy(enemy1.straight_run())
         # 2
-        self.rotation_set(156)
+        self.rotation_set(135)
         self.clear_enemy(
             enemy1,
             node2.set_threshold(3),
             node3,
-            node4.straight_run(),
+            node4,
         )
         # 5
         self.clear_enemy(

route/rogue/Combat/Herta_StorageZone_F2.py

@@ -5,50 +5,6 @@ from tasks.rogue.route.base import RouteBase
 
 class Route(RouteBase):
 
-    def Herta_StorageZone_F2_X351Y164(self):
-        """
-        | Waypoint | Position                  | Direction | Rotation |
-        | -------- | ------------------------- | --------- | -------- |
-        | spawn    | Waypoint((351.4, 164.9)), | 274.2     | 274      |
-        | item     | Waypoint((342.8, 155.7)), | 274.2     | 274      |
-        | enemy    | Waypoint((304.0, 165.4)), | 261.9     | 264      |
-        | exit_    | Waypoint((300.8, 163.8)), | 2.6       | 262      |
-        | exit1    | Waypoint((293.4, 175.3)), | 282.0     | 274      |
-        | exit2    | Waypoint((293.0, 157.2)), | 282.0     | 274      |
-        """
-        self.map_init(plane=Herta_StorageZone, floor="F2", position=(351.4, 164.9))
-        self.register_domain_exit(
-            Waypoint((300.8, 163.8)), end_rotation=262,
-            left_door=Waypoint((293.4, 175.3)), right_door=Waypoint((293.0, 157.2)))
-        item = Waypoint((342.8, 155.7))
-        enemy = Waypoint((304.0, 165.4))
-        # ===== End of generated waypoints =====
-
-        self.clear_item(item)
-        self.clear_enemy(enemy)
-
-    def Herta_StorageZone_F2_X365Y167(self):
-        """
-        | Waypoint | Position                  | Direction | Rotation |
-        | -------- | ------------------------- | --------- | -------- |
-        | spawn    | Waypoint((365.1, 167.2)), | 274.2     | 274      |
-        | item     | Waypoint((330.0, 175.6)), | 271.8     | 267      |
-        | enemy    | Waypoint((300.2, 166.0)), | 284.9     | 94       |
-        | exit_    | Waypoint((304.0, 166.0)), | 271.8     | 267      |
-        | exit1    | Waypoint((293.4, 175.3)), | 282.0     | 274      |
-        | exit2    | Waypoint((293.0, 157.2)), | 282.0     | 274      |
-        """
-        self.map_init(plane=Herta_StorageZone, floor="F2", position=(365.1, 167.2))
-        self.register_domain_exit(
-            Waypoint((304.0, 166.0)), end_rotation=267,
-            left_door=Waypoint((293.4, 175.3)), right_door=Waypoint((293.0, 157.2)))
-        item = Waypoint((330.0, 175.6))
-        enemy = Waypoint((300.2, 166.0))
-        # ===== End of generated waypoints =====
-
-        self.clear_item(item)
-        self.clear_enemy(enemy)
-
     def Herta_StorageZone_F2_X515Y219(self):
         """
         | Waypoint    | Position                  | Direction | Rotation |

route/rogue/Combat/Herta_StorageZone_F2Rogue.py

@@ -0,0 +1,50 @@
+from tasks.map.control.waypoint import Waypoint
+from tasks.map.keywords.plane import Herta_StorageZone
+from tasks.rogue.route.base import RouteBase
+
+
+class Route(RouteBase):
+
+    def Herta_StorageZone_F2Rogue_X351Y165(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((351.4, 165.3)), | 274.2     | 274      |
+        | item     | Waypoint((342.4, 155.5)), | 274.2     | 274      |
+        | enemy    | Waypoint((302.2, 165.1)), | 261.9     | 264      |
+        | exit_    | Waypoint((299.2, 164.0)), | 2.6       | 262      |
+        | exit1    | Waypoint((293.3, 173.9)), | 282.0     | 274      |
+        | exit2    | Waypoint((293.2, 155.6)), | 282.0     | 274      |
+        """
+        self.map_init(plane=Herta_StorageZone, floor="F2Rogue", position=(351.4, 165.3))
+        self.register_domain_exit(
+            Waypoint((299.2, 164.0)), end_rotation=262,
+            left_door=Waypoint((293.3, 173.9)), right_door=Waypoint((293.2, 155.6)))
+        item = Waypoint((342.4, 155.5))
+        enemy = Waypoint((302.2, 165.1))
+        # ===== End of generated waypoints =====
+
+        self.clear_item(item)
+        self.clear_enemy(enemy)
+
+    def Herta_StorageZone_F2Rogue_X365Y167(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((364.8, 166.5)), | 274.2     | 274      |
+        | item     | Waypoint((330.0, 174.1)), | 271.8     | 267      |
+        | enemy    | Waypoint((300.0, 165.6)), | 284.9     | 94       |
+        | exit_    | Waypoint((303.8, 164.2)), | 271.8     | 267      |
+        | exit1    | Waypoint((293.3, 173.9)), | 282.0     | 274      |
+        | exit2    | Waypoint((293.2, 155.6)), | 282.0     | 274      |
+        """
+        self.map_init(plane=Herta_StorageZone, floor="F2Rogue", position=(364.8, 166.5))
+        self.register_domain_exit(
+            Waypoint((303.8, 164.2)), end_rotation=267,
+            left_door=Waypoint((293.3, 173.9)), right_door=Waypoint((293.2, 155.6)))
+        item = Waypoint((330.0, 174.1))
+        enemy = Waypoint((300.0, 165.6))
+        # ===== End of generated waypoints =====
+
+        self.clear_item(item)
+        self.clear_enemy(enemy)

route/rogue/Occurrence/Herta_StorageZone_F2.py

@@ -1,28 +0,0 @@
-from tasks.map.control.waypoint import Waypoint
-from tasks.map.keywords.plane import Herta_StorageZone
-from tasks.rogue.route.base import RouteBase
-
-
-class Route(RouteBase):
-
-    def Herta_StorageZone_F2_X363Y166(self):
-        """
-        | Waypoint | Position                  | Direction | Rotation |
-        | -------- | ------------------------- | --------- | -------- |
-        | spawn    | Waypoint((363.4, 166.9)), | 274.2     | 274      |
-        | item     | Waypoint((332.8, 172.0)), | 263.8     | 260      |
-        | event    | Waypoint((318.9, 155.2)), | 290.1     | 285      |
-        | exit_    | Waypoint((314.3, 164.1)), | 276.0     | 271      |
-        | exit1    | Waypoint((305.2, 169.2)), | 275.9     | 274      |
-        | exit2    | Waypoint((304.6, 160.8)), | 277.8     | 276      |
-        """
-        self.map_init(plane=Herta_StorageZone, floor="F2", position=(363.4, 166.9))
-        self.register_domain_exit(
-            Waypoint((314.3, 164.1)), end_rotation=271,
-            left_door=Waypoint((305.2, 169.2)), right_door=Waypoint((304.6, 160.8)))
-        item = Waypoint((332.8, 172.0))
-        event = Waypoint((318.9, 155.2))
-
-        self.clear_item(item)
-        self.clear_event(event)
-        # ===== End of generated waypoints =====

route/rogue/Occurrence/Herta_StorageZone_F2Rogue.py

@@ -0,0 +1,28 @@
+from tasks.map.control.waypoint import Waypoint
+from tasks.map.keywords.plane import Herta_StorageZone
+from tasks.rogue.route.base import RouteBase
+
+
+class Route(RouteBase):
+
+    def Herta_StorageZone_F2Rogue_X363Y166(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((363.4, 165.6)), | 274.2     | 274      |
+        | item     | Waypoint((331.9, 173.0)), | 263.8     | 260      |
+        | event    | Waypoint((318.6, 156.8)), | 290.1     | 285      |
+        | exit_    | Waypoint((314.1, 164.2)), | 276.0     | 271      |
+        | exit1    | Waypoint((303.2, 171.0)), | 275.9     | 274      |
+        | exit2    | Waypoint((303.2, 160.4)), | 277.8     | 276      |
+        """
+        self.map_init(plane=Herta_StorageZone, floor="F2Rogue", position=(363.4, 165.6))
+        self.register_domain_exit(
+            Waypoint((314.1, 164.2)), end_rotation=271,
+            left_door=Waypoint((303.2, 171.0)), right_door=Waypoint((303.2, 160.4)))
+        item = Waypoint((331.9, 173.0))
+        event = Waypoint((318.6, 156.8))
+
+        self.clear_item(item)
+        self.clear_event(event)
+        # ===== End of generated waypoints =====

route/rogue/route.json

@@ -54,28 +54,6 @@
     ],
     "domain": "Combat"
   },
-  {
-    "name": "Combat_Herta_StorageZone_F2_X351Y164",
-    "route": "route.rogue.Combat.Herta_StorageZone_F2:Herta_StorageZone_F2_X351Y164",
-    "plane": "Herta_StorageZone",
-    "floor": "F2",
-    "position": [
-      351.4,
-      164.9
-    ],
-    "domain": "Combat"
-  },
-  {
-    "name": "Combat_Herta_StorageZone_F2_X365Y167",
-    "route": "route.rogue.Combat.Herta_StorageZone_F2:Herta_StorageZone_F2_X365Y167",
-    "plane": "Herta_StorageZone",
-    "floor": "F2",
-    "position": [
-      365.1,
-      167.2
-    ],
-    "domain": "Combat"
-  },
   {
     "name": "Combat_Herta_StorageZone_F2_X515Y219",
     "route": "route.rogue.Combat.Herta_StorageZone_F2:Herta_StorageZone_F2_X515Y219",
@@ -87,6 +65,28 @@
     ],
     "domain": "Combat"
   },
+  {
+    "name": "Combat_Herta_StorageZone_F2Rogue_X351Y165",
+    "route": "route.rogue.Combat.Herta_StorageZone_F2Rogue:Herta_StorageZone_F2Rogue_X351Y165",
+    "plane": "Herta_StorageZone",
+    "floor": "F2Rogue",
+    "position": [
+      351.4,
+      165.3
+    ],
+    "domain": "Combat"
+  },
+  {
+    "name": "Combat_Herta_StorageZone_F2Rogue_X365Y167",
+    "route": "route.rogue.Combat.Herta_StorageZone_F2Rogue:Herta_StorageZone_F2Rogue_X365Y167",
+    "plane": "Herta_StorageZone",
+    "floor": "F2Rogue",
+    "position": [
+      364.8,
+      166.5
+    ],
+    "domain": "Combat"
+  },
   {
     "name": "Combat_Herta_SupplyZone_F2_X45Y369",
     "route": "route.rogue.Combat.Herta_SupplyZone_F2:Herta_SupplyZone_F2_X45Y369",
@@ -1397,13 +1397,13 @@
     "domain": "Occurrence"
   },
   {
-    "name": "Occurrence_Herta_StorageZone_F2_X363Y166",
+    "name": "Occurrence_Herta_StorageZone_F2Rogue_X363Y166",
-    "route": "route.rogue.Occurrence.Herta_StorageZone_F2:Herta_StorageZone_F2_X363Y166",
+    "route": "route.rogue.Occurrence.Herta_StorageZone_F2Rogue:Herta_StorageZone_F2Rogue_X363Y166",
     "plane": "Herta_StorageZone",
-    "floor": "F2",
+    "floor": "F2Rogue",
     "position": [
       363.4,
-      166.9
+      165.6
     ],
     "domain": "Occurrence"
   },

tasks/map/resource/resource.py

@@ -15,6 +15,7 @@ from tasks.map.keywords import KEYWORDS_MAP_PLANE, MapPlane
 SPECIAL_PLANES = [
     ('Herta_SupplyZone', 'F2Rogue'),
     ('Herta_SupplyZone', 'F2RogueX151Y245'),
+    ('Herta_StorageZone', 'F2Rogue'),
     ('Jarilo_GreatMine', 'F1RogueOcc'),
     ('Luofu_Cloudford', 'F1Rogue'),
     ('Luofu_StargazerNavalia', 'F2Rogue'),

tasks/rogue/route/loader.py

@@ -161,8 +161,9 @@ class RouteLoader(RogueUI, MinimapWrapper, RouteLoader_, CharacterSwitch):
         # ('Occurrence_Herta_SupplyZone_F2Rogue_X397Y223', 0.102, (393.2, 222.8)),
         # ('Occurrence_Herta_StorageZone_F2_X365Y167', 0.094, (363.0, 166.8)),
         # ('Occurrence_Herta_StorageZone_F2_X363Y166', 0.094, (363.0, 166.8))]
-        if route.name == 'Occurrence_Herta_StorageZone_F2_X363Y166' and similarity > 0.05:
+        # if route.name == 'Occurrence_Herta_StorageZone_F2_X363Y166' and similarity > 0.05:
-            return True
+        #     return True
+
         # Before Combat_Luofu_Cloudford_F1_X281Y873
         if route.name == [
             'Combat_Herta_StorageZone_F1_X273Y92',