From 5fb3182b246b007959dd1d991e2365e3dab7f139 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Sun, 28 Jan 2024 18:26:34 +0800
Subject: [PATCH] Fix: Detect Huohuo by avatar (#289)

---
 assets/share/character/switch/Huohuo.png      | Bin 0 -> 6641 bytes
 .../assets/assets_character_switch.py         |  10 +++++++
 tasks/character/switch.py                     |  25 +++++++++++++-----
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 assets/share/character/switch/Huohuo.png

diff --git a/assets/share/character/switch/Huohuo.png b/assets/share/character/switch/Huohuo.png
new file mode 100644
index 0000000000000000000000000000000000000000..75757d1dafc2d49f5790ab5934fd08894d8c28b7
GIT binary patch
literal 6641
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

literal 0
HcmV?d00001

diff --git a/tasks/character/assets/assets_character_switch.py b/tasks/character/assets/assets_character_switch.py
index 0ac313f84..aa17d8c66 100644
--- a/tasks/character/assets/assets_character_switch.py
+++ b/tasks/character/assets/assets_character_switch.py
@@ -3,6 +3,16 @@ from module.base.button import Button, ButtonWrapper
 # This file was auto-generated, do not modify it manually. To generate:
 # ``` python -m dev_tools.button_extract ```
 
+Huohuo = ButtonWrapper(
+    name='Huohuo',
+    share=Button(
+        file='./assets/share/character/switch/Huohuo.png',
+        area=(1171, 162, 1189, 180),
+        search=(1151, 142, 1209, 200),
+        color=(187, 181, 173),
+        button=(1171, 162, 1189, 180),
+    ),
+)
 OCR_MAP_CHARACTERS = ButtonWrapper(
     name='OCR_MAP_CHARACTERS',
     share=Button(
diff --git a/tasks/character/switch.py b/tasks/character/switch.py
index 1cef0a69a..818ab800a 100644
--- a/tasks/character/switch.py
+++ b/tasks/character/switch.py
@@ -1,4 +1,5 @@
 import re
+import typing as t
 
 import cv2
 import numpy as np
@@ -52,13 +53,18 @@ class CharacterSwitch(UI):
                 logger.warning('Character update timeout')
                 break
 
+            # Ocr names
             ocr = OcrCharacterName(OCR_MAP_CHARACTERS)
             buttons = ocr.matched_ocr(self.device.image, keyword_classes=CharacterList)
-            if trailblazer := self._get_character_trailblazer():
-                buttons.append(trailblazer)
+            # Add avatars
+            characters = [button.matched_keyword for button in buttons]
+            for trailblazer in self._iter_character_by_avatar():
+                if trailblazer.matched_keyword not in characters:
+                    buttons.append(trailblazer)
+
+            # Set properties
             buttons = sorted(buttons, key=lambda b: area_center(b.area)[1])
             self.character_buttons = buttons
-
             self.characters = [button.matched_keyword for button in self.character_buttons]
             logger.attr('Characters', self.characters)
             self.character_current = self._convert_selected_to_character(self._update_current_character())
@@ -75,7 +81,10 @@ class CharacterSwitch(UI):
 
         return self.characters
 
-    def _get_character_trailblazer(self) -> OcrResultButton | None:
+    def _iter_character_by_avatar(self) -> t.Iterable[OcrResultButton]:
+        """
+        Detect characters that can't be found by OCR
+        """
         dict_template = {
             KEYWORD_CHARACTER_LIST.TrailblazerDestruction: [
                 TrailblazerDestructionMale,
@@ -86,17 +95,19 @@ class CharacterSwitch(UI):
                 TrailblazerPreservationFemale,
 
             ],
+            KEYWORD_CHARACTER_LIST.Huohuo: [
+                Huohuo,
+            ],
         }
         for character, templates in dict_template.items():
             for template in templates:
                 template.load_search(TRAILBLAZER_SEARCH.area)
                 if template.match_template(self.device.image):
-                    logger.info(f'Found trailblazer: {template}')
+                    logger.info(f'Found avatar {template}')
                     # Create a fake OcrResultButton object
                     box = BoxedResult(box=template.button, text_img=None, ocr_text='', score=1.0)
                     button = OcrResultButton(boxed_result=box, matched_keyword=character)
-                    return button
-        return None
+                    yield button
 
     def _update_current_character(self) -> list[int]:
         """