Update for set11 encounter add one round

jfd02 · Apr 6, 2024 · c7d9dbf · c7d9dbf
1 parent 31370dd
commit c7d9dbf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/game.py b/game.py
@@ -172,7 +172,7 @@ def encounter_round_setup(self) -> None:
             if not item_placement_round.startswith(self.round[0].split("-")[0])
         }
         for index, round_msg in enumerate(game_functions.check_encounter_round()):
-            print(f"  Round {self.round[0].split('-')[0]}-{str(index + 1)}: {round_msg} ROUND")
+            print(f"  Round {self.round[0].split('-')[0]}-{str(index + 1)}: {round_msg.upper()} ROUND")
             if index == 0:
                 continue
             if round_msg == "carousel":

diff --git a/game_functions.py b/game_functions.py
@@ -45,7 +45,7 @@ def check_encounter_round() -> list[str]:
             round_list.append("carousel")
         elif any(keyword in round_message for keyword in ["Get pulled into an Encounter"]):
             round_list.append("encounter")
-        elif any(keyword in round_message for keyword in ["Krugs", "Murk Wolves", "Raptors"]):
+        elif any(keyword in round_message for keyword in ["Krugs", "Murk Wolves", "Raptors", "Elder Dragon"]):
             round_list.append("pve")
         else:
             round_list.append("pvp")

diff --git a/screen_coords.py b/screen_coords.py
@@ -41,14 +41,14 @@
 ROUND_POS_THREE: Vec4 = Vec4(GameWindow(71, 0, 110, 24), use_screen_offset=False)
 
 ROUND_ENCOUNTER_ICON_POS: list[list[Vec2, Vec4]] = [
-    [Vec2(833, 20), Vec4(GameWindow(890, 49, 1155, 75))],
-    [Vec2(869, 20), Vec4(GameWindow(926, 49, 1191, 75))],
-    [Vec2(905, 20), Vec4(GameWindow(962, 49, 1227, 75))],
-    [Vec2(941, 20), Vec4(GameWindow(998, 49, 1263, 75))],
-    [Vec2(977, 20), Vec4(GameWindow(1034, 49, 1299, 75))],
-    [Vec2(1013, 20), Vec4(GameWindow(1070, 49, 1335, 75))],
-    [Vec2(1049, 20), Vec4(GameWindow(1106, 49, 1371, 75))],
-    [Vec2(1085, 20), Vec4(GameWindow(1142, 49, 1407, 75))],
+    [Vec2(833, 20), Vec4(GameWindow(890, 49, 1218, 75))],
+    [Vec2(869, 20), Vec4(GameWindow(926, 49, 1254, 75))],
+    [Vec2(905, 20), Vec4(GameWindow(962, 49, 1290, 75))],
+    [Vec2(941, 20), Vec4(GameWindow(998, 49, 1326, 75))],
+    [Vec2(977, 20), Vec4(GameWindow(1034, 49, 1362, 75))],
+    [Vec2(1013, 20), Vec4(GameWindow(1070, 49, 1398, 75))],
+    [Vec2(1049, 20), Vec4(GameWindow(1106, 49, 1434, 75))],
+    [Vec2(1085, 20), Vec4(GameWindow(1142, 49, 1470, 75))],
 ]
 
 SHOP_POS: Vec4 = Vec4(GameWindow(481, 1039, 1476, 1070))