Upd: removed imwrite+ own file

Author: dragonheart107

assets/en/retire/DOCK_AMOUNT.png

@@ -6,10 +6,10 @@
 from module.handler.assets import AUTO_SEARCH_MAP_OPTION_ON
 from module.logger import logger
 from module.map.map_operation import MapOperation
-from module.statistics.campaign_bonus import CampaignBonusStatistics
+from module.statistics.autosearch_reward import *
 
 
-class AutoSearchCombat(MapOperation, Combat, CampaignStatus, CampaignBonusStatistics):
+class AutoSearchCombat(MapOperation, Combat, CampaignStatus, AutosearchReward):
     _auto_search_in_stage_timer = Timer(3, count=6)
     _auto_search_status_confirm = False
     auto_search_oil_limit_triggered = False

assets/en/retire/EMPTY_ENHANCE_SLOT_PLUS.png

@@ -6,15 +6,15 @@
 
 COMMON_SHIP_FILTER_DISABLE = Button(area={'cn': (714, 13, 757, 41), 'en': (706, 15, 758, 41), 'jp': (711, 13, 759, 42), 'tw': (712, 12, 759, 42)}, color={'cn': (127, 143, 183), 'en': (86, 99, 138), 'jp': (119, 131, 170), 'tw': (117, 132, 173)}, button={'cn': (714, 13, 757, 41), 'en': (706, 15, 758, 41), 'jp': (711, 13, 759, 42), 'tw': (712, 12, 759, 42)}, file={'cn': './assets/cn/retire/COMMON_SHIP_FILTER_DISABLE.png', 'en': './assets/en/retire/COMMON_SHIP_FILTER_DISABLE.png', 'jp': './assets/jp/retire/COMMON_SHIP_FILTER_DISABLE.png', 'tw': './assets/tw/retire/COMMON_SHIP_FILTER_DISABLE.png'})
 COMMON_SHIP_FILTER_ENABLE = Button(area={'cn': (713, 12, 758, 41), 'en': (707, 16, 758, 40), 'jp': (712, 13, 758, 42), 'tw': (712, 11, 759, 42)}, color={'cn': (214, 174, 130), 'en': (193, 149, 106), 'jp': (212, 171, 129), 'tw': (211, 170, 127)}, button={'cn': (713, 12, 758, 41), 'en': (707, 16, 758, 40), 'jp': (712, 13, 758, 42), 'tw': (712, 11, 759, 42)}, file={'cn': './assets/cn/retire/COMMON_SHIP_FILTER_ENABLE.png', 'en': './assets/en/retire/COMMON_SHIP_FILTER_ENABLE.png', 'jp': './assets/jp/retire/COMMON_SHIP_FILTER_ENABLE.png', 'tw': './assets/tw/retire/COMMON_SHIP_FILTER_ENABLE.png'})
-DOCK_AMOUNT = Button(area={'cn': (473, 17, 611, 41), 'en': (513, 15, 588, 42), 'jp': (473, 14, 584, 42), 'tw': (473, 17, 611, 41)}, color={'cn': (71, 74, 78), 'en': (44, 49, 54), 'jp': (46, 53, 61), 'tw': (71, 74, 78)}, button={'cn': (473, 17, 611, 41), 'en': (513, 15, 588, 42), 'jp': (473, 14, 584, 42), 'tw': (473, 17, 611, 41)}, file={'cn': './assets/cn/retire/DOCK_AMOUNT.png', 'en': './assets/en/retire/DOCK_AMOUNT.png', 'jp': './assets/jp/retire/DOCK_AMOUNT.png', 'tw': './assets/tw/retire/DOCK_AMOUNT.png'})
+DOCK_AMOUNT = Button(area={'cn': (473, 17, 611, 41), 'en': (476, 9, 611, 44), 'jp': (473, 14, 584, 42), 'tw': (473, 17, 611, 41)}, color={'cn': (71, 74, 78), 'en': (50, 54, 58), 'jp': (46, 53, 61), 'tw': (71, 74, 78)}, button={'cn': (473, 17, 611, 41), 'en': (476, 9, 611, 44), 'jp': (473, 14, 584, 42), 'tw': (473, 17, 611, 41)}, file={'cn': './assets/cn/retire/DOCK_AMOUNT.png', 'en': './assets/en/retire/DOCK_AMOUNT.png', 'jp': './assets/jp/retire/DOCK_AMOUNT.png', 'tw': './assets/tw/retire/DOCK_AMOUNT.png'})
 DOCK_CHECK = Button(area={'cn': (121, 14, 175, 39), 'en': (121, 17, 189, 39), 'jp': (232, 12, 308, 41), 'tw': (121, 13, 176, 39)}, color={'cn': (156, 171, 207), 'en': (112, 125, 162), 'jp': (88, 96, 128), 'tw': (149, 164, 200)}, button={'cn': (121, 14, 175, 39), 'en': (121, 17, 189, 39), 'jp': (232, 12, 308, 41), 'tw': (121, 13, 176, 39)}, file={'cn': './assets/cn/retire/DOCK_CHECK.png', 'en': './assets/en/retire/DOCK_CHECK.png', 'jp': './assets/jp/retire/DOCK_CHECK.png', 'tw': './assets/tw/retire/DOCK_CHECK.png'})
 DOCK_EMPTY = Button(area={'cn': (95, 347, 388, 378), 'en': (95, 318, 264, 339), 'jp': (96, 347, 252, 376), 'tw': (94, 347, 390, 379)}, color={'cn': (160, 154, 159), 'en': (106, 99, 106), 'jp': (159, 152, 156), 'tw': (163, 157, 162)}, button={'cn': (95, 347, 388, 378), 'en': (95, 318, 264, 339), 'jp': (96, 347, 252, 376), 'tw': (94, 347, 390, 379)}, file={'cn': './assets/cn/retire/DOCK_EMPTY.png', 'en': './assets/en/retire/DOCK_EMPTY.png', 'jp': './assets/jp/retire/DOCK_EMPTY.png', 'tw': './assets/tw/retire/DOCK_EMPTY.png'})
 DOCK_FILTER = Button(area={'cn': (1099, 5, 1193, 48), 'en': (1098, 4, 1194, 49), 'jp': (1101, 6, 1192, 46), 'tw': (1099, 6, 1193, 47)}, color={'cn': (70, 87, 127), 'en': (73, 90, 128), 'jp': (67, 84, 125), 'tw': (78, 96, 137)}, button={'cn': (1099, 5, 1193, 48), 'en': (1098, 4, 1194, 49), 'jp': (1101, 6, 1192, 46), 'tw': (1099, 6, 1193, 47)}, file={'cn': './assets/cn/retire/DOCK_FILTER.png', 'en': './assets/en/retire/DOCK_FILTER.png', 'jp': './assets/jp/retire/DOCK_FILTER.png', 'tw': './assets/tw/retire/DOCK_FILTER.png'})
 DOCK_FILTER_CONFIRM = Button(area={'cn': (714, 613, 886, 671), 'en': (718, 618, 883, 666), 'jp': (717, 618, 885, 668), 'tw': (715, 630, 884, 680)}, color={'cn': (86, 133, 192), 'en': (108, 148, 201), 'jp': (83, 128, 188), 'tw': (83, 130, 190)}, button={'cn': (714, 613, 886, 671), 'en': (718, 618, 883, 666), 'jp': (717, 618, 885, 668), 'tw': (715, 630, 884, 680)}, file={'cn': './assets/cn/retire/DOCK_FILTER_CONFIRM.png', 'en': './assets/en/retire/DOCK_FILTER_CONFIRM.png', 'jp': './assets/jp/retire/DOCK_FILTER_CONFIRM.png', 'tw': './assets/tw/retire/DOCK_FILTER_CONFIRM.png'})
 DOCK_FIRST_NPC = Button(area={'cn': (96, 111, 123, 123), 'en': (96, 111, 123, 123), 'jp': (96, 111, 123, 123), 'tw': (96, 111, 123, 123)}, color={'cn': (184, 150, 150), 'en': (184, 150, 150), 'jp': (184, 150, 150), 'tw': (184, 150, 150)}, button={'cn': (96, 111, 123, 123), 'en': (96, 111, 123, 123), 'jp': (96, 111, 123, 123), 'tw': (96, 111, 123, 123)}, file={'cn': './assets/cn/retire/DOCK_FIRST_NPC.png', 'en': './assets/cn/retire/DOCK_FIRST_NPC.png', 'jp': './assets/cn/retire/DOCK_FIRST_NPC.png', 'tw': './assets/cn/retire/DOCK_FIRST_NPC.png'})
 DOCK_SCROLL = Button(area={'cn': (1239, 76, 1248, 641), 'en': (1239, 76, 1248, 641), 'jp': (1237, 78, 1250, 628), 'tw': (1239, 76, 1248, 641)}, color={'cn': (47, 46, 37), 'en': (47, 46, 37), 'jp': (180, 156, 66), 'tw': (47, 46, 37)}, button={'cn': (1239, 76, 1248, 641), 'en': (1239, 76, 1248, 641), 'jp': (1237, 78, 1250, 628), 'tw': (1239, 76, 1248, 641)}, file={'cn': './assets/cn/retire/DOCK_SCROLL.png', 'en': './assets/en/retire/DOCK_SCROLL.png', 'jp': './assets/jp/retire/DOCK_SCROLL.png', 'tw': './assets/tw/retire/DOCK_SCROLL.png'})
 DOCK_SELECTED = Button(area={'cn': (582, 662, 647, 685), 'en': (597, 658, 655, 691), 'jp': (603, 662, 655, 685), 'tw': (582, 662, 647, 685)}, color={'cn': (75, 75, 83), 'en': (64, 62, 73), 'jp': (84, 83, 92), 'tw': (75, 75, 83)}, button={'cn': (582, 662, 647, 685), 'en': (597, 658, 655, 691), 'jp': (603, 662, 655, 685), 'tw': (582, 662, 647, 685)}, file={'cn': './assets/cn/retire/DOCK_SELECTED.png', 'en': './assets/en/retire/DOCK_SELECTED.png', 'jp': './assets/jp/retire/DOCK_SELECTED.png', 'tw': './assets/tw/retire/DOCK_SELECTED.png'})
-EMPTY_ENHANCE_SLOT_PLUS = Button(area={'cn': (737, 402, 773, 437), 'en': (747, 402, 782, 437), 'jp': (737, 402, 773, 437), 'tw': (737, 402, 773, 437)}, color={'cn': (46, 46, 46), 'en': (38, 38, 38), 'jp': (46, 46, 46), 'tw': (46, 46, 46)}, button={'cn': (737, 402, 773, 437), 'en': (747, 402, 782, 437), 'jp': (737, 402, 773, 437), 'tw': (737, 402, 773, 437)}, file={'cn': './assets/cn/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'en': './assets/en/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'jp': './assets/jp/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'tw': './assets/tw/retire/EMPTY_ENHANCE_SLOT_PLUS.png'})
+EMPTY_ENHANCE_SLOT_PLUS = Button(area={'cn': (737, 402, 773, 437), 'en': (737, 402, 773, 437), 'jp': (737, 402, 773, 437), 'tw': (737, 402, 773, 437)}, color={'cn': (46, 46, 46), 'en': (46, 46, 46), 'jp': (46, 46, 46), 'tw': (46, 46, 46)}, button={'cn': (737, 402, 773, 437), 'en': (737, 402, 773, 437), 'jp': (737, 402, 773, 437), 'tw': (737, 402, 773, 437)}, file={'cn': './assets/cn/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'en': './assets/en/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'jp': './assets/jp/retire/EMPTY_ENHANCE_SLOT_PLUS.png', 'tw': './assets/tw/retire/EMPTY_ENHANCE_SLOT_PLUS.png'})
 ENHANCE_CONFIRM = Button(area={'cn': (1126, 602, 1256, 645), 'en': (1226, 605, 1262, 641), 'jp': (1126, 601, 1257, 646), 'tw': (1215, 606, 1253, 641)}, color={'cn': (203, 149, 81), 'en': (212, 167, 100), 'jp': (189, 139, 78), 'tw': (216, 169, 99)}, button={'cn': (1126, 602, 1256, 645), 'en': (1226, 605, 1262, 641), 'jp': (1126, 601, 1257, 646), 'tw': (1215, 606, 1253, 641)}, file={'cn': './assets/cn/retire/ENHANCE_CONFIRM.png', 'en': './assets/en/retire/ENHANCE_CONFIRM.png', 'jp': './assets/jp/retire/ENHANCE_CONFIRM.png', 'tw': './assets/tw/retire/ENHANCE_CONFIRM.png'})
 ENHANCE_FILLED = Button(area={'cn': (728, 440, 781, 454), 'en': (728, 440, 781, 454), 'jp': (722, 387, 789, 400), 'tw': (728, 440, 781, 454)}, color={'cn': (156, 138, 127), 'en': (156, 138, 127), 'jp': (146, 153, 211), 'tw': (156, 138, 127)}, button={'cn': (728, 440, 781, 454), 'en': (728, 440, 781, 454), 'jp': (722, 387, 789, 400), 'tw': (728, 440, 781, 454)}, file={'cn': './assets/cn/retire/ENHANCE_FILLED.png', 'en': './assets/en/retire/ENHANCE_FILLED.png', 'jp': './assets/jp/retire/ENHANCE_FILLED.png', 'tw': './assets/tw/retire/ENHANCE_FILLED.png'})
 ENHANCE_RECOMMEND = Button(area={'cn': (959, 602, 1089, 645), 'en': (1057, 606, 1091, 640), 'jp': (965, 605, 1085, 641), 'tw': (1050, 607, 1082, 639)}, color={'cn': (87, 134, 194), 'en': (106, 151, 215), 'jp': (86, 136, 201), 'tw': (106, 151, 212)}, button={'cn': (959, 602, 1089, 645), 'en': (1057, 606, 1091, 640), 'jp': (965, 605, 1085, 641), 'tw': (1050, 607, 1082, 639)}, file={'cn': './assets/cn/retire/ENHANCE_RECOMMEND.png', 'en': './assets/en/retire/ENHANCE_RECOMMEND.png', 'jp': './assets/jp/retire/ENHANCE_RECOMMEND.png', 'tw': './assets/tw/retire/ENHANCE_RECOMMEND.png'})

module/combat/auto_search_combat.py

@@ -0,0 +1,211 @@
+import time
+import cv2
+import numpy as np
+from module.base.button import ButtonGrid
+from module.base.timer import Timer
+from module.logger import logger
+from module.base.utils import crop
+from module.handler.assets import AUTO_SEARCH_MENU_EXIT, AUTO_SEARCH_MENU_CONTINUE
+from module.statistics.item import AmountOcr
+from module.statistics.azurstats import AzurStats
+
+class AutosearchReward(ButtonGrid, Timer, AzurStats):
+    def wait_until_reward_stable(self, timeout=8.6, required_consecutive_matches=3, similarity_threshold=0.999):
+        """
+        checks if all rewards have appeared, via first doing a predicted grid, 3 types to account for the Ui
+        change due to Meta xp, then verifies via amount ocr, after that waits till the reward area has no changes
+        e.g all drops appeared
+        """
+        logger.info('wait until area stable')
+
+        try:
+            # 1. Image handling separation, ocr uses non modified, area stable check uses modified
+            self.device.screenshot()
+            original_bgr = self.device.image.copy()
+            gray_image = cv2.cvtColor(original_bgr, cv2.COLOR_BGR2GRAY)
+
+            # 2. Debugging/Reference visualization (BGR)
+            exit_btn = AUTO_SEARCH_MENU_EXIT._button
+            continue_btn = AUTO_SEARCH_MENU_CONTINUE._button
+            debug_img = original_bgr.copy()
+            cv2.rectangle(debug_img, (exit_btn[0], exit_btn[1]), (exit_btn[2], exit_btn[3]), (255,0,0), 2)
+            cv2.rectangle(debug_img, (continue_btn[0], continue_btn[1]), (continue_btn[2], continue_btn[3]), (0,0,255), 2)
+            self._save(debug_img, 'debug', 'reference_points.png')
+
+            # 3. Grid setup with single row, tested with EN, CN is fine due to same button,
+            #continue button shift less of an issue, but alot of the measures depend on exit
+            #TW might have grid too low and ocr area might miss the numbers area
+            #compared to EN/CN: exit width -42, height -9, continue width -3, height -5
+            #JP gonna have issues due to not using a default exit asset, ui moved due to meta xp sidebar
+            #compared to EN/CN: exit width -1, height -1, but further on the left by 68px
+            #continue width -1, height the same, but further on the right side by 72px
+            GRID_PARAMS = {
+                'button_shape': (64, 64),
+                'grid_shape': (7, 1),  # need to only check first row
+                'delta': (72 + 2/3, 0),
+                'name': 'REWARD_GRID'
+            }
+            exit_x, exit_y = exit_btn[0], exit_btn[1]
+            GRID_ORIGINS = [
+                (exit_x + 22, exit_y - 417),         # Grid 0 - Primary
+                (exit_x + 22 - 72, exit_y - 417),   # Grid 1 - Fallback 1 (one button left)
+                (exit_x + 22 - 129, exit_y - 417)   # Grid 2 - Fallback 2
+            ]
+
+            # 4. Enhanced grid verification logic
+            validated_grids = []
+            
+            for i, (grid_x, grid_y) in enumerate(GRID_ORIGINS):
+                grid = ButtonGrid(origin=(grid_x, grid_y), **GRID_PARAMS)
+                matched = self._verify_grid_via_ocr(grid, i, original_bgr)
+                
+                if matched:
+                    logger.info(f"Grid {i} validated")
+                    validated_grids.append((i, grid_x, grid_y))
+                    
+                    # Special case: If Grid 0 validates, also check Grid 1
+                    if i == 0 and len(GRID_ORIGINS) > 1:
+                        logger.info("Grid 0 validated, checking Grid 1 for potentially more rewards...")
+                        grid1_x, grid1_y = GRID_ORIGINS[1]
+                        grid1 = ButtonGrid(origin=(grid1_x, grid1_y), **GRID_PARAMS)
+                        grid1_matched = self._verify_grid_via_ocr(grid1, 1, original_bgr)
+                        
+                        if grid1_matched:
+                            logger.info("Grid 1 also validated - using Grid 1 for wider coverage")
+                            validated_grids.append((1, grid1_x, grid1_y))
+                        else:
+                            logger.info("Grid 1 failed validation - sticking with Grid 0")
+                    
+                    break  # Found at least one valid grid, proceed
+            
+            # 5. Select the best grid (prefer Grid 1 over Grid 0 if both validate)
+            if not validated_grids:
+                logger.warning("All grid positions failed")
+                return False
+                
+            # Choose Grid 1 if available (better coverage), otherwise use the first validated grid
+            best_grid = None
+            for grid_info in validated_grids:
+                grid_idx, grid_x, grid_y = grid_info
+                if grid_idx == 1:  # Prefer Grid 1
+                    best_grid = grid_info
+                    break
+            
+            if best_grid is None:
+                best_grid = validated_grids[0]  # Use first validated grid
+            
+            selected_idx, selected_x, selected_y = best_grid
+            logger.info(f"Using Grid {selected_idx} for monitoring (x={selected_x}, y={selected_y})")
+            
+            # 6. Set up monitoring area with selected grid
+            continue_btn = AUTO_SEARCH_MENU_CONTINUE._button
+            monitor_area = (
+                int(selected_x), 
+                int(selected_y), 
+                int(selected_x + (7 * 72.67)), 
+                int(continue_btn[1])
+            )
+            
+            logger.info(f"DEBUG - Selected Grid {selected_idx}: x={selected_x}, y={selected_y}")
+            logger.info(f"DEBUG - Monitor area: {monitor_area}")
+            
+            self.device.image = gray_image
+            return self.reward_area_stable_check(monitor_area, timeout, required_consecutive_matches, similarity_threshold)
+
+        except Exception as e:
+            logger.error(f'Stabilization failure: {str(e)}')
+            return False
+
+    def _verify_grid_via_ocr(self, grid, grid_idx, bgr_image):
+        """
+        Double checks if grid correct via the item amount on the bottom right of grid buttons
+        Enhanced with better logging for grid comparison
+        """
+        amount_ocr = AmountOcr([], threshold=96, name='Amount_ocr')
+        detected_amounts = []
+
+        for btn_idx, btn in enumerate(grid.buttons):
+            try:
+                # 1. Get button image (keep as BGR)
+                button_img = crop(bgr_image, btn.area)
+                if button_img is None or button_img.size == 0:
+                    continue
+
+                # 2. Extract amount area (bottom-right portion)
+                h, w = button_img.shape[:2]
+                amount_area = (int(w*0.6), int(h*0.8), w, h)
+                amount_img = crop(button_img, amount_area)
+
+                # 3. Ensure BGR format for OCR
+                if len(amount_img.shape) == 2:
+                    amount_img = cv2.cvtColor(amount_img, cv2.COLOR_GRAY2BGR)
+
+                # 4. OCR detection
+                amount = amount_ocr.ocr([amount_img], direct_ocr=True)[0]
+                if amount > 0:
+                    detected_amounts.append(amount)
+                    logger.info(f"Grid {grid_idx}, Button {btn_idx}: amount={amount}")
+
+            except Exception as e:
+                logger.warning(f"Grid {grid_idx}, Button {btn_idx} check failed: {str(e)}")
+                continue
+
+        # Log summary for this grid
+        total_detected = len(detected_amounts)
+        if total_detected > 0:
+            logger.info(f"Grid {grid_idx} summary: {total_detected} buttons with amounts detected")
+            return True
+        else:
+            logger.info(f"Grid {grid_idx} summary: No amounts detected")
+            return False
+
+    def reward_area_stable_check(self, monitor_area, timeout, required_matches, similarity_threshold):
+        """
+        checks if the previously assigned area has any changes
+        returns True for being stable after 3 same consecutive matches, while similarity was met or beaten
+        """
+        start_time = time.time()
+        last_check = start_time
+        stabilization_start = None
+        consecutive_matches = 0
+        check_count = 0
+
+        last_luma = crop(self.device.image, monitor_area)
+        self._save(last_luma, 'debug/dropstats', '0_initial.png')
+
+        while True:
+            current_time = time.time()
+            elapsed = current_time - start_time
+
+            if elapsed >= timeout:
+                logger.warning(f'Timeout after {elapsed:.2f}s (never stabilized)')
+                return False
+
+            if current_time - last_check >= 0.2:
+                check_count += 1
+                last_check = current_time
+
+                self.device.screenshot()
+                current_luma = cv2.cvtColor(self.device.image, cv2.COLOR_BGR2GRAY)
+                current_luma = crop(current_luma, monitor_area)
+                self._save(current_luma, 'debug/dropstats', f'{check_count}_check.png')
+
+                res = cv2.matchTemplate(last_luma, current_luma, cv2.TM_CCOEFF_NORMED)
+                similarity = cv2.minMaxLoc(res)[1]
+
+                if similarity >= similarity_threshold:
+                    consecutive_matches += 1
+                    if stabilization_start is None:
+                        stabilization_start = time.time()
+
+                    if consecutive_matches >= required_matches:
+                        stabilization_time = time.time() - stabilization_start
+                        total_time = time.time() - start_time
+                        logger.info(f'Area stabilized after {total_time:.2f}s (took {stabilization_time:.2f}s to confirm)')
+                        self._save(current_luma, 'debug/dropstats', 'final_stable.png')
+                        return True
+                else:
+                    consecutive_matches = 0
+                    stabilization_start = None
+
+                last_luma = current_luma