More refactorings and add a priority_list - WIP images for tests need to be added.

Author: CodeWithMa

images/reward_1_2_icon.png

@@ -5,7 +5,7 @@
 
 def set_up_logging_configuration():
     logging.basicConfig(
-        level=logging.DEBUG,
+        level=logging.INFO,
         format="%(asctime)s %(message)s",
         datefmt="%Y-%m-%d %H:%M:%S",
     )

images/start_button_text5.en.png

@@ -0,0 +1,7 @@
+from attrs import define
+
+
+@define(frozen=True)
+class FindImageResult:
+    val: float
+    coords: tuple[int, int]

main.py

@@ -11,5 +11,5 @@ class GameActions(Enum):
 @define(frozen=True)
 class GameAction:
     action: GameActions = GameActions.no_action
-    position: tuple[int,int] = (0, 0)
+    position: tuple[int, int] = (0, 0)
     is_ingame: bool = False

src/find_image_result.py

@@ -4,6 +4,7 @@
 
 from src import constants
 from src import image_service
+from src.find_image_result import FindImageResult
 from src.game_action import GameAction, GameActions
 
 
@@ -25,46 +26,68 @@ def make_decision(template_images: dict[str, cv2.Mat], image_name: str) -> GameA
     img_screenshot = cv2.imread(image_name, cv2.IMREAD_COLOR)
 
     # Check if any of the image files match the screenshot
-    max_val = 0
-    max_image_file: str = ""
-    max_coords = None
+    find_image_results: list[tuple[str, FindImageResult]] = []
     for image_file, img_template in template_images.items():
         result = image_service.find_image(img_screenshot, img_template)
         if result:
-            val, coords = result
-        else:
-            # handle case where find_image returns None
-            val, coords = 0, None
-
-        # Update the maximum value and corresponding image file and coordinates if necessary
-        if val > max_val:
-            max_val = val
-            max_image_file = image_file
-            max_coords = coords
-
-    # Check if the maximum value is above a certain threshold
-    if max_val > 0.90:
-        logging.info(f"Image {max_image_file} matches with {max_val * 100}%")
-
-        if max_image_file.startswith("max_number_of_games_played_text."):
-            return GameAction(action=GameActions.exit_program)
-
-        # If ingame return is_ingame with true
-        if is_ingame(max_image_file):
-
-            # Send tap to attack
-            position_to_tap = max_coords
-            if is_screen_to_attack(max_image_file):
-                position_to_tap = constants.ATTACK_TAP_POSITION
-
-            return GameAction(
-                action=GameActions.tap_position,
-                position=position_to_tap,
-                is_ingame=True,
-            )
-        else:
-            # Send an ADB command to tap on the corresponding coordinates
-            return GameAction(action=GameActions.tap_position, position=max_coords)
-
-    logging.info(f"No image matches.")
-    return GameAction()
+            if result.val > 0.90:
+                find_image_results.append((image_file, result))
+
+    logging.debug(find_image_results)
+    return analyze_results_and_return_action_with_priority(find_image_results)
+
+
+def analyze_results_and_return_action_with_priority(
+    find_image_results: list[tuple[str, FindImageResult]]
+) -> GameAction:
+    if len(find_image_results) == 0:
+        logging.debug("No image matches.")
+        return GameAction()
+
+    priority_list = [
+        "max_number_of_games_played_text.",
+        "reward_",
+        "start_button_text",
+        # TODO: Add other images here
+    ]
+
+    for priority_file in priority_list:
+        for result in find_image_results:
+            image_file = result[0]
+            find_image_result = result[1]
+            if image_file.startswith(priority_file):
+                return analyze_results_and_return_action(image_file, find_image_result)
+
+    # Handle case where image is not in priority_list
+    # Just use the best matching image
+    max_image_file, max_result = max(find_image_results, key=lambda x: x[1].val)
+    return analyze_results_and_return_action(max_image_file, max_result)
+
+
+def analyze_results_and_return_action(
+    image_file: str, find_image_result: FindImageResult
+) -> GameAction:
+    logging.info(f"Image {image_file} matches with {find_image_result.val * 100}%")
+
+    if image_file.startswith("max_number_of_games_played_text."):
+        return GameAction(action=GameActions.exit_program)
+
+    # If ingame return is_ingame with true
+    if is_ingame(image_file):
+
+        # Send tap to attack
+        position_to_tap = find_image_result.coords
+        if is_screen_to_attack(image_file):
+            position_to_tap = constants.ATTACK_TAP_POSITION
+
+        return GameAction(
+            action=GameActions.tap_position,
+            position=position_to_tap,
+            is_ingame=True,
+        )
+    else:
+        # Send an ADB command to tap on the corresponding coordinates
+        return GameAction(
+            action=GameActions.tap_position,
+            position=find_image_result.coords,
+        )

src/game_action.py

@@ -1,5 +1,7 @@
 import cv2
 
+from src.find_image_result import FindImageResult
+
 
 def show_image(img, top_left, bottom_right):
     # Draw rectangle and Show the result
@@ -12,7 +14,7 @@ def convert_to_greyscale(img_to_convert):
     return cv2.cvtColor(img_to_convert, cv2.COLOR_BGR2GRAY)
 
 
-def find_image(img_large, img_small):
+def find_image(img_large, img_small) -> FindImageResult | None:
     if img_large is None:
         print("Image large is none")
         return
@@ -44,4 +46,4 @@ def find_image(img_large, img_small):
     # show_image(img_large, top_left, bottom_right)
 
     # Return the maximum value and the center of the matching area
-    return (max_val, (x, y))
+    return FindImageResult(max_val, (x, y))

src/image_decision_maker.py

@@ -78,9 +78,7 @@ def test_make_decision_collects_rewards1(template_images):
 
     assert result.action is not None
     assert result.action == GameActions.tap_position
-    # TODO correct position
-    assert result.position == (542, 2006)
-    assert not result.position == (542, 2006)
+    assert result.position == (285, 1780)
     assert not result.is_ingame
 
 
@@ -89,7 +87,7 @@ def test_make_decision_collects_rewards2(template_images):
 
     assert result.action is not None
     assert result.action == GameActions.tap_position
-    assert not result.position == (542, 2006)
+    assert result.position == (127, 1805)
     assert not result.is_ingame
 
 
@@ -98,7 +96,7 @@ def test_make_decision_collects_rewards3(template_images):
 
     assert result.action is not None
     assert result.action == GameActions.tap_position
-    assert not result.position == (542, 2006)
+    assert result.position == (590, 1758)
     assert not result.is_ingame