Merge pull request #138 from KoiKomei/main

Some fixes and more replicard logic
steve1316 · Aug 26, 2022 · 6407a59 · 6407a59
2 parents 135f3e0 + 1c13149
commit 6407a59
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 1 deletion.
diff --git a/src-tauri/backend/bot/game_modes/arcarum_sandbox.py b/src-tauri/backend/bot/game_modes/arcarum_sandbox.py
@@ -69,6 +69,11 @@ class ArcarumSandbox:
             "x": 285,
             "y": 295
         },
+        "Eletion Glider": {
+            "section": 2,
+            "x": 70,
+            "y": 260
+        },
 
         ##########
         # Zone Faym
@@ -117,6 +122,11 @@ class ArcarumSandbox:
             "x": 60,
             "y": 215
         },
+        "Faymian Gun": {
+            "section": 2,
+            "x": 200,
+            "y": 285
+        },
 
         ##########
         # Zone Goliath
@@ -165,6 +175,11 @@ class ArcarumSandbox:
             "x": 250,
             "y": 260
         },
+        "Goliath Triune": {
+            "section": 2,
+            "x": 50,
+            "y": 300
+        },
 
         ##########
         # Zone Harbinger
@@ -198,6 +213,11 @@ class ArcarumSandbox:
             "x": 275,
             "y": 250
         },
+        "Harbinger Stormer": {
+            "section": 1,
+            "x": 180,
+            "y": 150
+        },
         "Harbinger Tyrant": {
             "section": 2,
             "x": 370,
@@ -248,13 +268,18 @@ class ArcarumSandbox:
             "x": 170,
             "y": 220
         },
+        "Athena Militis": {
+            "section": 1,
+            "x": 185,
+            "y": 350
+        },
 
         ##########
         # Zone Joculator
         "Glacial Hellbeast": {
             "section": 0,
             "x": 50,
-            "y": 90
+            "y": 180
         },
         "Giant Sea Plant": {
             "section": 0,
@@ -281,6 +306,11 @@ class ArcarumSandbox:
             "x": 240,
             "y": 140
         },
+        "Grani Militis": {
+            "section": 1,
+            "x": 200,
+            "y": 230
+        },
 
         ##########
         # Zone Kalendae
@@ -314,6 +344,11 @@ class ArcarumSandbox:
             "x": 125,
             "y": 345
         },
+        "Baal Militis": {
+            "section": 0,
+            "x": 220,
+            "y": 245
+        },
 
         ##########
         # Zone Liber
@@ -347,6 +382,11 @@ class ArcarumSandbox:
             "x": 220,
             "y": 335
         },
+        "Garuda Militis": {
+            "section": 1,
+            "x": 50,
+            "y": 225
+        },
     }
 
     @staticmethod
@@ -500,6 +540,20 @@ def _refill_aap():
             MessageLog.print_message(f"[ARCARUM.SANDBOX] AAP is now refilled.")
 
         return None
+
+    @staticmethod
+    def _play_zone_boss():
+        """Clicks on Play if you are fighting a zone boss.
+
+        Returns:
+            None
+        """
+        play_button = ImageUtils.find_button("play")
+        if play_button:
+            MessageLog.print_message(f"\n[ARCARUM.SANDBOX] Now fighting zone boss...")
+            MouseUtils.move_and_click_point(play_button[0], play_button[1], "play")
+
+        return None
 
     @staticmethod
     def start():
@@ -532,6 +586,7 @@ def start():
                 ArcarumSandbox._navigate_to_mission(skip_to_action = True)
 
         # Refill AAP if needed.
+        ArcarumSandbox._play_zone_boss()
         ArcarumSandbox._refill_aap()
 
         Game.wait(3.0)

diff --git a/src/data/data.json b/src/data/data.json
@@ -1195,6 +1195,38 @@
         "Simpering Beast": {
             "map": "Zone Liber",
             "items": ["Sephira Stone", "Lightborne Astra", "Star Idean", "Repeated Runs"]
+        },
+        "Eletion Glider": {
+            "map": "Zone Eletio",
+            "items": ["Repeated Runs"]
+        },
+        "Faymian Gun": {
+            "map": "Zone Faym",
+            "items": ["Repeated Runs"]
+        },
+        "Goliath Triune": {
+            "map": "Zone Goliath",
+            "items": ["Repeated Runs"]
+        },
+        "Harbinger Stormer": {
+            "map": "Zone Harbinger",
+            "items": ["Repeated Runs"]
+        },
+        "Athena Militis": {
+            "map": "Zone Invidia",
+            "items": ["Repeated Runs"]
+        },
+        "Grani Militis": {
+            "map": "Zone Joculator",
+            "items": ["Repeated Runs"]
+        },
+        "Baal Militis": {
+            "map": "Zone Kalendae",
+            "items": ["Repeated Runs"]
+        },
+        "Garuda Militis": {
+            "map": "Zone Liber",
+            "items": ["Repeated Runs"]
         }
     },
     "Generic": {