Fix: Abyssal combat with handle_map_event (LmeSzinc#5328)

Author: LmeSzinc

module/os/fleet.py

@@ -283,6 +283,13 @@ def wait_until_walk_stable(self, confirm_timer=None, skip_first_screenshot=False
         clicked_story = False
         stuck_timer = Timer(20, count=5).start()
         confirm_timer.reset()
+
+        def abyssal_expected_end():
+            # add handle_map_event() because OSCombat.combat_status() removes get_items
+            if self.handle_map_event(drop=drop):
+                return False
+            return self.is_in_map()
+
         for _ in self.loop(skip_first=skip_first_screenshot):
             # Map event
             event = self.handle_map_event(drop=drop)
@@ -347,7 +354,7 @@ def wait_until_walk_stable(self, confirm_timer=None, skip_first_screenshot=False
             if self.combat_appear():
                 # Use ui_back() for testing, because there are too few abyssal loggers every month.
                 # self.ui_back(check_button=self.is_in_map)
-                self.combat(expected_end=self.is_in_map, fleet_index=self.fleet_show_index, save_get_items=drop)
+                self.combat(expected_end=abyssal_expected_end, fleet_index=self.fleet_show_index, save_get_items=drop)
                 confirm_timer.reset()
                 stuck_timer.reset()
                 result.add('event')
@@ -700,6 +707,7 @@ def boss_leave(self):
         logger.hr('BOSS leave')
         # Update local view
         self.update_os()
+        self.predict()
 
         click_timer = Timer(3)
         pause_interval = Timer(0.5, count=1)