Merge pull request #15 from renatofmmaia/develop

- fix error "'int' object is not callable"
- add log on change state
- improve scroll

Author: hiagopinacio

main.py

@@ -15,7 +15,7 @@
 from module.telegram import TelegramBot
 from module.window import get_resolution, WindowsResolutionEnum
 
-__version__ = "0.0.6"
+__version__ = "0.0.7"
 
 
 def main(config_file):

module/manager.py

@@ -63,13 +63,15 @@ def is_starting(self):
         return self.state == StateEnum.STARTING
 
     def set_fighting(self):
+        logger("💪 change state to fighting")
         self.state = StateEnum.FIGHTING
 
     @property
     def is_fighting(self):
         return self.state == StateEnum.FIGHTING
 
     def set_recharge(self):
+        logger("💤 change state to recharge")
         self.state = StateEnum.RECHARGE
 
     @property

module/mouse.py

@@ -86,6 +86,14 @@ def move_to_logical():
 
     return do_with_timeout(move_to_logical)
 
+def move_to_one_of_targets(targets: list, target_global: bool = False):
+    for target in targets:
+        if move_to(target):
+            return True
+
+def move_to_when_one_of_targets_appears(targets: list, time_beteween: float = 0.5, timeout: float = 10, target_global = False):
+    return do_with_timeout(move_to_one_of_targets, args = [targets, target_global], time_beteween=time_beteween, timeout=timeout)
+    
 def scroll_and_click_on_targets(safe_scroll_target: str, repeat: int, distance:float, duration: float, wait:float, function_between, execute_before=True):
     res = []
     if execute_before:
@@ -103,8 +111,13 @@ def scroll_and_click_on_targets(safe_scroll_target: str, repeat: int, distance:f
 
     return res
 
-def scroll(safe_scroll_target: str, distance:float, duration: float, wait:float):
-    move_to(safe_scroll_target)
+def scroll(safe_scroll_target, distance:float, duration: float, wait:float):
+
+    if type(safe_scroll_target) is list:
+        move_to_when_one_of_targets_appears(safe_scroll_target)
+    else:
+        move_to(safe_scroll_target)
+
     pyautogui.mouseDown(duration=0.1)
     pyautogui.moveRel(0, distance, duration)
     time.sleep(0.3)

module/spaceScreen.py

@@ -41,7 +41,7 @@ def check_screen():
         )
 
         if res is None:
-            raise Exception(f'Timeout waiting for screen  {spaceScreenEnum(spaceScreenEnum).name}.')
+            raise Exception(f'Timeout waiting for screen  {SpaceScreenEnum(spaceScreenEnum).name}.')
 
         return res
 
@@ -132,15 +132,20 @@ def go_to_home(manager):
 
     def go_to_fight(manager):
         current_screen = SpaceScreen.get_current_screen()
-        if current_screen != SpaceScreenEnum.FIGHT.value:
+        if current_screen == SpaceScreenEnum.FIGHT.value:
+            return
+        elif current_screen == SpaceScreenEnum.LOSE.value:
+            click_when_target_appears("button_confirm_without_time")
+        else:
             SpaceScreen.go_to_home(manager)
             click_when_target_appears("btn_fight_boss")
-            SpaceScreen.wait_for_screen(SpaceScreenEnum.FIGHT.value)
-        else:
-            Login.do_login(manager)
-            return
 
-        SpaceScreen.wait_for_screen(SpaceScreenEnum.FIGHT.value)
+        new_screen = SpaceScreen.wait_for_possible_screen([
+            SpaceScreenEnum.FIGHT,
+            SpaceScreenEnum.LOSE,
+        ])
+        if new_screen == SpaceScreenEnum.LOSE.value:
+            SpaceScreenEnum.go_to_fight(manager)
 
     def do_print_token(manager):
         logger_translated("print token", LoggerEnum.ACTION)
@@ -250,7 +255,7 @@ def click_first(btns_pos, search_img):
 
                 ship_life = 50 + (life_index * scale_factor)
 
-                logger(f"{ship_life}%", end=" ", datetime=False)
+                logger(f"↳ {ship_life}%", end=" ", datetime=False)
 
                 if ship_life >= ship_work_percent:
                     click_randomly_in_position(x,y,w,h)
@@ -259,7 +264,7 @@ def click_first(btns_pos, search_img):
                 else:
                     logger("💤;", datetime=False)
 
-                return False
+            return False
 
         logger(f"Sending ships to fight:")
 
@@ -272,12 +277,7 @@ def click_first(btns_pos, search_img):
             buttons_position = Image.get_target_positions("button_fight_on", not_target="button_fight_off", screen_image=screen_img)
 
             if not buttons_position:
-                scroll(
-                    safe_scroll_target="ship_bar_vertical",
-                    distance=Config.get('screen','scroll', 'distance'),
-                    duration=Config.get('screen','scroll', 'duration'),
-                    wait=Config.get('screen','scroll', 'wait'),
-                )
+                Ship.scroll_ships()
                 scroll_times += 1
                 continue
 
@@ -287,7 +287,7 @@ def click_first(btns_pos, search_img):
             final_x = inital_x + width_search_area
 
             search_img = screen_img[:,inital_x:final_x, :]
-            logger("↳", end=" ", datetime=False)
+           
 
             ship_work_percent = Config.get('ship_work_percent')
 
@@ -298,6 +298,11 @@ def click_first(btns_pos, search_img):
                     if time.time() - start_time > 15:
                         if not Ship.check_number_of_ships(Image.screen(), n_ships):
                             raise Exception(f"Error trying to send {n_ships} ships to fight.")
+            else:
+                Ship.scroll_ships()
+                scroll_times += 1
+                continue
+                
 
 
         if n_ships < Config.get('n_minimum_ships_to_fight'):
@@ -322,6 +327,14 @@ def click_first(btns_pos, search_img):
         manager.set_refresh_timer("refresh_ships")
         return True
 
+    def scroll_ships():
+        return scroll(
+            safe_scroll_target=["button_fight_on", "button_fight_off"],
+            distance=Config.get('screen','scroll', 'distance'),
+            duration=Config.get('screen','scroll', 'duration'),
+            wait=Config.get('screen','scroll', 'wait'),
+                )
+                
     def check_number_of_ships(screen_img, n_ships):
         # CROP SCREEN FROM TEXT 'BATTLE':
         x, y, w, h = Image.get_one_target_position("identify_n_space_shipts_in_battle_start_area", screen_image=screen_img)