diff --git a/game.py b/game.py index 67ccfa9..77d3b65 100644 --- a/game.py +++ b/game.py @@ -146,27 +146,27 @@ def encounter_round_setup(self) -> None: game_assets.CAROUSEL_ROUND = { carousel_round for carousel_round in game_assets.CAROUSEL_ROUND - if not carousel_round.startswith(self.round[0].split("-")) + if not carousel_round.startswith(self.round[0].split("-")[0]) } game_assets.PVE_ROUND = { pve_round for pve_round in game_assets.PVE_ROUND - if not pve_round.startswith(self.round[0].split("-")) + if not pve_round.startswith(self.round[0].split("-")[0]) } game_assets.PVP_ROUND = { pvp_round for pvp_round in game_assets.PVP_ROUND - if not pvp_round.startswith(self.round[0].split("-")) + if not pvp_round.startswith(self.round[0].split("-")[0]) } game_assets.ANVIL_ROUNDS = { anvil_round for anvil_round in game_assets.ANVIL_ROUNDS - if not anvil_round.startswith(self.round[0].split("-")) + if not anvil_round.startswith(self.round[0].split("-")[0]) } game_assets.ITEM_PLACEMENT_ROUNDS = { item_placement_round for item_placement_round in game_assets.ITEM_PLACEMENT_ROUNDS - if not item_placement_round.startswith(self.round[0].split("-")) + if not item_placement_round.startswith(self.round[0].split("-")[0]) } for index, round_msg in enumerate(game_functions.check_encounter_round()): if index == 0: diff --git a/game_functions.py b/game_functions.py index 1e97359..f32ed40 100644 --- a/game_functions.py +++ b/game_functions.py @@ -25,7 +25,9 @@ def get_round() -> list[str, int]: round_one = screen_capture.crop(screen_coords.ROUND_POS_ONE.get_coords()) game_round: str = ocr.get_text_from_image(image=round_one, whitelist=ocr.ROUND_WHITELIST) - return [game_round, 1] + if game_round in game_assets.ROUNDS: + return [game_round, 1] + return ["999-999",0] def check_encounter_round() -> list[str]: