Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

campaign/campaign_main/campaign_15_base.py

@@ -22,6 +22,10 @@ class Config:
         'prominence': 10,
         'distance': 35,
     }
+<<<<<<< HEAD
+=======
+    HOMO_CANNY_THRESHOLD = (50, 100)
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     MAP_SWIPE_MULTIPLY = (0.993, 1.011)
     MAP_SWIPE_MULTIPLY_MINITOUCH = (0.960, 0.978)
     MAP_SWIPE_MULTIPLY_MAATOUCH = (0.932, 0.949)
@@ -57,8 +61,12 @@ class CampaignBase(CampaignBase_):
             sub_view=sub_view,
             sub_hunt=sub_hunt,
         )
+<<<<<<< HEAD
         self.map_has_mob_move = (self.strategy_get_mob_move_remain() > 0)
         logger.attr("Map has mob move", self.map_has_mob_move)
+=======
+        logger.attr("Map has mob move", self.strategy_has_mob_move())
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 
     def _map_swipe(self, vector, box=(239, 159, 1175, 628)):
         # Left border to 239, avoid swiping on support fleet
@@ -183,6 +191,10 @@ class CampaignBase(CampaignBase_):
         self.map[target].is_boss = self.map[location].is_boss
         self.map[location].is_boss = False
         self.map[target].is_enemy = True
+<<<<<<< HEAD
+=======
+        self.map[target].may_enemy = True
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
         self.map[location].is_enemy = False
 
     def mob_move(self, location, target):
@@ -204,8 +216,12 @@ class CampaignBase(CampaignBase_):
             return False
 
         self.strategy_open()
+<<<<<<< HEAD
         remain = self.strategy_get_mob_move_remain()
         if remain == 0:
+=======
+        if not self.strategy_has_mob_move():
+>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
             logger.warning(f'No remain mob move trials, will abandon moving')
             self.strategy_close()
             return False