Update for set11 encounter add one round

jfd02 · Apr 6, 2024 · 5b1fe2c · 5b1fe2c
1 parent b61cf70
commit 5b1fe2c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/game.py b/game.py
@@ -116,7 +116,7 @@ def game_loop(self) -> None:
                 and perf_counter() - self.start_time > self.forfeit_time
             ):
                 game_functions.forfeit()
-                return
+                continue
 
             if self.round[0] != ran_round:
                 if self.round[0] in game_assets.PVP_ROUND:
@@ -140,7 +140,7 @@ def game_loop(self) -> None:
                     self.arena.check_health()
                     ran_round: str = self.round[0]
                 if self.round[1] == 1 and self.round[0].split("-")[1] == "1":
-                    print("[Ecnounter round setup]")
+                    print("\n[Ecnounter round setup]")
                     self.encounter_round_setup()
             sleep(0.5)
 
@@ -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"[Ecnounter round setup] Round list: {round_msg}")
+            print(f"  Round {self.round[0].split('-')[0]}-{str(index + 1)}: {round_msg} ROUND")
             if index == 0:
                 continue
             if round_msg == "carousel":
@@ -197,9 +197,9 @@ def encounter_round_setup(self) -> None:
                 game_assets.ENCOUNTER_ROUNDS.add(
                     self.round[0].split("-")[0] + "-" + str(index + 1)
                 )
-                if index+1 == 2:
+                if index+1 == 2 and int(self.round[0].split("-")[0]) <= 4:
                     game_assets.AUGMENT_ROUNDS.add(
-                        self.round[0].split("-")[0] + "-" + str(index + 1)
+                        self.round[0].split("-")[0] + "-" + str(index + 2)
                     )
 
     def second_round(self) -> None:

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(926, 49, 1191, 75))],
-    [Vec2(869, 20), Vec4(GameWindow(962, 49, 1227, 75))],
-    [Vec2(905, 20), Vec4(GameWindow(998, 49, 1263, 75))],
-    [Vec2(941, 20), Vec4(GameWindow(1034, 49, 1299, 75))],
-    [Vec2(977, 20), Vec4(GameWindow(1070, 49, 1335, 75))],
-    [Vec2(1013, 20), Vec4(GameWindow(1106, 49, 1371, 75))],
-    [Vec2(1049, 20), Vec4(GameWindow(1142, 49, 1407, 75))],
-    [Vec2(1085, 20), Vec4(GameWindow(1178, 49, 1443, 75))],
+    [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))],
 ]
 
 SHOP_POS: Vec4 = Vec4(GameWindow(481, 1039, 1476, 1070))