From b929afeeead7b55ef716e6c6777d0d2d8502d463 Mon Sep 17 00:00:00 2001
From: guoh064 <50830808+guoh064@users.noreply.github.com>
Date: Thu, 15 Jun 2023 22:08:49 +0800
Subject: [PATCH] Opt: print loading only once in interrupting_auto_search
 (#2764)

* Opt: print loading only once in interrupting_auto_search

* Fix: status of is_loading after executed
---
 module/os/map.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/os/map.py b/module/os/map.py
index 6741525c4..f1dc4503c 100644
--- a/module/os/map.py
+++ b/module/os/map.py
@@ -537,6 +537,7 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
 
     def interrupt_auto_search(self, skip_first_screenshot=True):
         logger.info('Interrupting auto search')
+        is_loading = False
         while 1:
             if skip_first_screenshot:
                 skip_first_screenshot = False
@@ -563,11 +564,18 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
                 continue
             if self.handle_map_event():
                 continue
-            if not self.is_combat_loading():
+            # Only print once when detected
+            if not is_loading:
+                if self.is_combat_loading():
+                    is_loading = True
+                    continue
                 if self.handle_battle_status():
                     continue
                 if self.handle_exp_info():
                     continue
+            elif self.is_combat_executing():
+                is_loading = False
+                continue
 
     def os_auto_search_run(self, drop=None, strategic=False):
         for _ in range(5):