fix: Open map briefing to detect map before entering round

fixes #34

Author: cetteup

BF2AutoSpectator/common/constants.py

@@ -26,6 +26,7 @@
             'disconnect-prompt-yes-button': (706, 394),
             'disconnect-button': (1210, 725),
             'game-message-close-button': (806, 412),
+            'map-briefing-eor-item': (750, 85),
             'join-game-button': (1210, 725),
             'spawnpoint-deselect': (250, 50),
             'suicide-button': (469, 459)
@@ -82,6 +83,7 @@
             'disconnect-prompt-yes-button': (885, 487),
             'disconnect-button': (1468, 906),
             'game-message-close-button': (1002, 501),
+            'map-briefing-eor-item': (938, 97),
             'join-game-button': (1468, 906),
             'spawnpoint-deselect': (250, 50),
             'suicide-button': (497, 455)

BF2AutoSpectator/game/instance_manager.py

@@ -345,6 +345,29 @@ def is_map_briefing_visible(self) -> bool:
             image_ops=[(ImageOperation.invert, None)]
         )
 
+    def open_map_briefing(self) -> bool:
+        # Don't block any OCR regions
+        mouse_reset(self.game_window)
+
+        if self.is_map_briefing_visible():
+            return True
+
+        # Cannot open map briefing unless join game button is visible
+        if not self.is_join_game_button_visible():
+            return False
+
+        # Move cursor onto map briefing header and click
+        mouse_move_to_game_window_coord(self.game_window, self.resolution, 'map-briefing-eor-item')
+        time.sleep(.2)
+        mouse_click_in_game_window(self.game_window, legacy=True)
+
+        time.sleep(.5)
+
+        # Move cursor back to default position
+        mouse_reset(self.game_window)
+
+        return self.is_map_briefing_visible()
+
     def is_spawn_menu_visible(self) -> bool:
         histogram = histogram_screenshot_region(
             self.game_window,

BF2AutoSpectator/spectate.py

@@ -584,6 +584,21 @@ def run():
                 cc.update_game_phase(GamePhase.betweenRounds)
                 gis.round_end_reset()
                 continue
+
+            """
+            When server "rotates" on the same map, we enter the loading state and reset the map details.
+            However, the map briefing is not opened automatically. So unless we open it manually, we never see the
+            map briefing and thus cannot detect the map.
+            """
+            if gim.is_join_game_button_visible():
+                logger.info('Join game button is visible but map briefing is not, opening map briefing')
+                if not gim.open_map_briefing():
+                    logger.error('Failed to open map briefing, attempting to join game and queuing reconnect')
+                    # We need to join the game, else the ESC press to open the menu will join the game instead of
+                    # opening the menu
+                    gim.join_game()
+                    gis.set_spectator_on_server(False)
+                continue
             time.sleep(3)
         elif default_camera_view_visible and gis.round_spawned() and \
                 iterations_on_default_camera_view == 0: