Merge pull request #18 from LmeSzinc/master

Fix [EN] rank D assets, CN so those needs to be updated

module/combat/assets.py

@@ -14,7 +14,7 @@ BATTLE_PREPARATION_WITH_OVERLAY = Button(area={'cn': (1058, 622, 1226, 652), 'en
 BATTLE_STATUS_A = Button(area={'cn': (622, 266, 732, 288), 'en': (622, 266, 732, 288)}, color={'cn': (235, 227, 111), 'en': (235, 227, 111)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_A.png', 'en': './assets/en/combat/BATTLE_STATUS_A.png'})
 BATTLE_STATUS_B = Button(area={'cn': (663, 297, 709, 320), 'en': (663, 297, 709, 320)}, color={'cn': (193, 237, 255), 'en': (193, 237, 255)}, button={'cn': (999, 630, 1047, 691), 'en': (999, 630, 1047, 691)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_B.png', 'en': './assets/en/combat/BATTLE_STATUS_B.png'})
 BATTLE_STATUS_C = Button(area={'cn': (431, 257, 514, 329), 'en': (431, 257, 514, 329)}, color={'cn': (169, 161, 164), 'en': (169, 161, 164)}, button={'cn': (431, 257, 514, 329), 'en': (431, 257, 514, 329)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_C.png', 'en': './assets/en/combat/BATTLE_STATUS_C.png'})
-BATTLE_STATUS_D = Button(area={'cn': (431, 257, 514, 329), 'en': (431, 257, 514, 329)}, color={'cn': (169, 161, 164), 'en': (169, 161, 164)}, button={'cn': (431, 257, 514, 329), 'en': (431, 257, 514, 329)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_D.png', 'en': './assets/en/combat/BATTLE_STATUS_D.png'})
+BATTLE_STATUS_D = Button(area={'cn': (431, 257, 514, 329), 'en': (603, 178, 631, 321)}, color={'cn': (169, 161, 164), 'en': (201, 207, 201)}, button={'cn': (431, 257, 514, 329), 'en': (603, 178, 631, 321)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_D.png', 'en': './assets/en/combat/BATTLE_STATUS_D.png'})
 BATTLE_STATUS_S = Button(area={'cn': (633, 297, 722, 320), 'en': (629, 297, 722, 318)}, color={'cn': (233, 241, 127), 'en': (233, 241, 127)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_S.png', 'en': './assets/en/combat/BATTLE_STATUS_S.png'})
 COMBAT_AUTO = Button(area={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604)}, color={'cn': (229, 242, 255), 'en': (229, 242, 255)}, button={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604)}, file={'cn': './assets/cn/combat/COMBAT_AUTO.png', 'en': './assets/en/combat/COMBAT_AUTO.png'})
 COMBAT_AUTO_SWITCH = Button(area={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62)}, color={'cn': (179, 198, 235), 'en': (105, 137, 189)}, button={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_SWITCH.png', 'en': './assets/en/combat/COMBAT_AUTO_SWITCH.png'})
@@ -22,12 +22,14 @@ EMERGENCY_REPAIR_AVAILABLE = Button(area={'cn': (106, 533, 119, 540), 'en': (106
 EMERGENCY_REPAIR_CONFIRM = Button(area={'cn': (669, 418, 842, 475), 'en': (669, 418, 842, 475)}, color={'cn': (94, 143, 204), 'en': (94, 143, 204)}, button={'cn': (669, 418, 842, 475), 'en': (669, 418, 842, 475)}, file={'cn': './assets/cn/combat/EMERGENCY_REPAIR_CONFIRM.png', 'en': './assets/en/combat/EMERGENCY_REPAIR_CONFIRM.png'})
 EXP_INFO_A = Button(area={'cn': (389, 100, 444, 116), 'en': (389, 100, 444, 116)}, color={'cn': (236, 231, 116), 'en': (236, 231, 116)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691)}, file={'cn': './assets/cn/combat/EXP_INFO_A.png', 'en': './assets/en/combat/EXP_INFO_A.png'})
 EXP_INFO_B = Button(area={'cn': (400, 122, 447, 137), 'en': (400, 122, 447, 137)}, color={'cn': (194, 237, 255), 'en': (194, 237, 255)}, button={'cn': (999, 630, 1047, 691), 'en': (999, 630, 1047, 691)}, file={'cn': './assets/cn/combat/EXP_INFO_B.png', 'en': './assets/en/combat/EXP_INFO_B.png'})
+EXP_INFO_D = Button(area={'cn': (377, 42, 393, 137), 'en': (377, 42, 393, 137)}, color={'cn': (198, 206, 198), 'en': (198, 206, 198)}, button={'cn': (1000, 631, 1055, 689), 'en': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/EXP_INFO_D.png', 'en': './assets/en/combat/EXP_INFO_D.png'})
 EXP_INFO_S = Button(area={'cn': (396, 122, 457, 137), 'en': (396, 122, 457, 137)}, color={'cn': (233, 241, 127), 'en': (233, 241, 127)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691)}, file={'cn': './assets/cn/combat/EXP_INFO_S.png', 'en': './assets/en/combat/EXP_INFO_S.png'})
 GET_ITEMS_1 = Button(area={'cn': (538, 217, 741, 253), 'en': (550, 215, 739, 246)}, color={'cn': (160, 192, 248), 'en': (157, 187, 233)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691)}, file={'cn': './assets/cn/combat/GET_ITEMS_1.png', 'en': './assets/en/combat/GET_ITEMS_1.png'})
 GET_ITEMS_2 = Button(area={'cn': (538, 146, 742, 182), 'en': (549, 140, 740, 176)}, color={'cn': (160, 192, 248), 'en': (152, 185, 236)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691)}, file={'cn': './assets/cn/combat/GET_ITEMS_2.png', 'en': './assets/en/combat/GET_ITEMS_2.png'})
 GET_SHIP = Button(area={'cn': (1104, 610, 1110, 630), 'en': (1104, 610, 1110, 630)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691)}, file={'cn': './assets/cn/combat/GET_SHIP.png', 'en': './assets/en/combat/GET_SHIP.png'})
 LOADING_BAR = Button(area={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680)}, color={'cn': (172, 205, 232), 'en': (172, 205, 232)}, button={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680)}, file={'cn': './assets/cn/combat/LOADING_BAR.png', 'en': './assets/en/combat/LOADING_BAR.png'})
 MOVE_DOWN = Button(area={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669)}, color={'cn': (21, 28, 57), 'en': (21, 28, 57)}, button={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669)}, file={'cn': './assets/cn/combat/MOVE_DOWN.png', 'en': './assets/en/combat/MOVE_DOWN.png'})
+OPTS_INFO_D = Button(area={'cn': (565, 143, 692, 179), 'en': (565, 143, 692, 179)}, color={'cn': (171, 116, 110), 'en': (171, 116, 110)}, button={'cn': (590, 587, 627, 647), 'en': (590, 587, 627, 647)}, file={'cn': './assets/cn/combat/OPTS_INFO_D.png', 'en': './assets/en/combat/OPTS_INFO_D.png'})
 PAUSE = Button(area={'cn': (1236, 37, 1244, 59), 'en': (1236, 37, 1244, 59)}, color={'cn': (247, 243, 247), 'en': (247, 243, 247)}, button={'cn': (1162, 34, 1246, 61), 'en': (1151, 34, 1247, 61)}, file={'cn': './assets/cn/combat/PAUSE.png', 'en': './assets/en/combat/PAUSE.png'})
 PAUSE_DOUBLE_CHECK = Button(area={'cn': (1231, 35, 1236, 60), 'en': (1231, 35, 1236, 60)}, color={'cn': (96, 104, 136), 'en': (96, 104, 136)}, button={'cn': (1231, 35, 1236, 60), 'en': (1231, 35, 1236, 60)}, file={'cn': './assets/cn/combat/PAUSE_DOUBLE_CHECK.png', 'en': './assets/en/combat/PAUSE_DOUBLE_CHECK.png'})
 READY_AIR_RAID = Button(area={'cn': (887, 618, 907, 628), 'en': (887, 618, 907, 628)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255)}, button={'cn': (887, 618, 907, 628), 'en': (887, 618, 907, 628)}, file={'cn': './assets/cn/combat/READY_AIR_RAID.png', 'en': './assets/en/combat/READY_AIR_RAID.png'})

module/exercise/combat.py

@@ -40,15 +40,25 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment):
         while 1:
             self.device.screenshot()
 
-            # Finish
+            # Finish - S or D rank
             if self.appear_then_click(BATTLE_STATUS_S):
                 success = True
                 end = True
                 continue
+            if self.appear_then_click(BATTLE_STATUS_D):
+                success = True
+                end = True
+                logger.info("Exercise LOST")
+                continue
             if self.appear_then_click(GET_ITEMS_1):
                 continue
             if self.appear_then_click(EXP_INFO_S):
                 continue
+            if self.appear_then_click(EXP_INFO_D):
+                continue
+            # Last D rank screen
+            if self.appear_then_click(OPTS_INFO_D, offset=(30,30)):
+                continue
 
             # Quit
             if not end: