Fix: Lots of problems

- Fix HOMO_EDGE_HOUGHLINES_THRESHOLD not used
- Fix get stuck if kill too fast in combat_executing
- Fix wrong swipe when camera out of map
- Fix walk_out_of_step not detected
- Opt relative_record now save temp images in sub folder

module/combat/combat.py

@@ -221,7 +221,7 @@ class Combat(HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall, Comba
                     continue
 
             # End
-            if self.handle_battle_status(save_get_items=save_get_items):
+            if self.handle_battle_status(save_get_items=save_get_items) or self.handle_get_items(save_get_items=save_get_items):
                 self.device.screenshot_interval_set(0)
                 break
 

module/handler/ambush.py

@@ -106,7 +106,7 @@ class AmbushHandler(Combat):
         if not self.appear(INFO_BAR_1):
             return False
 
-        image = ambush_letter_preprocess(np.array(self.device.image.crop(MAP_WALK_OUT_OF_STEP.area)))
+        image = ambush_letter_preprocess(np.array(self.device.image.crop(INFO_BAR_DETECT.area)))
         if TEMPLATE_MAP_WALK_OUT_OF_STEP.match(image):
             logger.warning('Map walk out of step.')
             self.handle_info_bar()

module/map/camera.py

@@ -93,7 +93,7 @@ class Camera(InfoHandler):
                 string = str(e)
                 logger.warning(string)
                 x, y = string.split('=')[1].strip('() ').split(',')
-                self._map_swipe((int(x.strip()), int(y.strip())))
+                self._map_swipe((-int(x.strip()), -int(y.strip())))
             else:
                 raise e
 

module/map_detection/grid_info.py

@@ -85,7 +85,7 @@ class GridInfo:
                 return key
 
         if self.is_siren:
-            return self.enemy_genre.split('_')[1][:2].upper() if self.enemy_genre else 'SU'
+            return self.enemy_genre.split('_')[1][:2].upper() if self.enemy_genre and '_' in self.enemy_genre else 'SU'
 
         if self.is_enemy:
             return '%s%s' % (self.enemy_scale, self.enemy_genre[0].upper()) \

module/map_detection/homography.py

@@ -176,7 +176,7 @@ class Homography:
         # Detect map edges
         image_edge = cv2.bitwise_and(cv2.dilate(image_edge, kernel),
                                      cv2.inRange(image_trans, *self.config.HOMO_EDGE_COLOR_RANGE))
-        self.detect_edges(image_edge)
+        self.detect_edges(image_edge, hough_th=self.config.HOMO_EDGE_HOUGHLINES_THRESHOLD)
 
         # Log
         time_cost = round(time.time() - start_time, 3)