File tree Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -146,27 +146,27 @@ def encounter_round_setup(self) -> None:
146
146
game_assets .CAROUSEL_ROUND = {
147
147
carousel_round
148
148
for carousel_round in game_assets .CAROUSEL_ROUND
149
- if not carousel_round .startswith (self .round [0 ].split ("-" ))
149
+ if not carousel_round .startswith (self .round [0 ].split ("-" )[ 0 ] )
150
150
}
151
151
game_assets .PVE_ROUND = {
152
152
pve_round
153
153
for pve_round in game_assets .PVE_ROUND
154
- if not pve_round .startswith (self .round [0 ].split ("-" ))
154
+ if not pve_round .startswith (self .round [0 ].split ("-" )[ 0 ] )
155
155
}
156
156
game_assets .PVP_ROUND = {
157
157
pvp_round
158
158
for pvp_round in game_assets .PVP_ROUND
159
- if not pvp_round .startswith (self .round [0 ].split ("-" ))
159
+ if not pvp_round .startswith (self .round [0 ].split ("-" )[ 0 ] )
160
160
}
161
161
game_assets .ANVIL_ROUNDS = {
162
162
anvil_round
163
163
for anvil_round in game_assets .ANVIL_ROUNDS
164
- if not anvil_round .startswith (self .round [0 ].split ("-" ))
164
+ if not anvil_round .startswith (self .round [0 ].split ("-" )[ 0 ] )
165
165
}
166
166
game_assets .ITEM_PLACEMENT_ROUNDS = {
167
167
item_placement_round
168
168
for item_placement_round in game_assets .ITEM_PLACEMENT_ROUNDS
169
- if not item_placement_round .startswith (self .round [0 ].split ("-" ))
169
+ if not item_placement_round .startswith (self .round [0 ].split ("-" )[ 0 ] )
170
170
}
171
171
for index , round_msg in enumerate (game_functions .check_encounter_round ()):
172
172
if index == 0 :
Original file line number Diff line number Diff line change @@ -25,7 +25,9 @@ def get_round() -> list[str, int]:
25
25
26
26
round_one = screen_capture .crop (screen_coords .ROUND_POS_ONE .get_coords ())
27
27
game_round : str = ocr .get_text_from_image (image = round_one , whitelist = ocr .ROUND_WHITELIST )
28
- return [game_round , 1 ]
28
+ if game_round in game_assets .ROUNDS :
29
+ return [game_round , 1 ]
30
+ return ["999-999" ,0 ]
29
31
30
32
31
33
def check_encounter_round () -> list [str ]:
You can’t perform that action at this time.
0 commit comments